collect running callback triggers directly from render tree

atk4 · Jul 24, 2021 · de1780f · de1780f
1 parent baa3bdc
commit de1780f
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/src/View.php b/src/View.php
@@ -599,7 +599,7 @@ public function removeAttr($property)
      */
     public function jsUrl($page = [])
     {
-        return $this->getApp()->jsUrl($page, false, $this->_getStickyArgs());
+        return $this->getApp()->jsUrl($page, false, array_merge($this->getRunningCallbackArgs(), $this->_getStickyArgs()));
     }
 
     /**
@@ -613,7 +613,24 @@ public function jsUrl($page = [])
      */
     public function url($page = [])
     {
-        return $this->getApp()->url($page, false, $this->_getStickyArgs());
+        return $this->getApp()->url($page, false, array_merge($this->getRunningCallbackArgs(), $this->_getStickyArgs()));
+    }
+
+    protected function getRunningCallbackArgs(): array
+    {
+        if ($this->issetOwner() && $this->getOwner() instanceof self) {
+            $args = $this->getOwner()->getRunningCallbackArgs();
+        } else {
+            $args = [];
+        }
+
+        foreach ($this->elements as $v) {
+            if ($v instanceof Callback && $v->isTriggered() && $v->canTrigger()) {
+                $args[Callback::URL_QUERY_TRIGGER_PREFIX . $v->getUrlTrigger()] = $v->getTriggeredValue();
+            }
+        }
+
+        return $args;
     }
 
     /**