collect running callback triggers directly from render tree

atk4 · Jul 24, 2021 · 077d40e · 077d40e
1 parent baa3bdc
commit 077d40e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/Callback.php b/src/Callback.php
@@ -49,8 +49,6 @@ protected function init(): void
     public function setUrlTrigger(string $trigger = null)
     {
         $this->urlTrigger = $trigger ?: $this->name;
-
-        $this->getOwner()->stickyGet(self::URL_QUERY_TRIGGER_PREFIX . $this->urlTrigger);
     }
 
     public function getUrlTrigger(): string

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(false, $page), $this->_getStickyArgs()));
     }
 
     /**
@@ -613,7 +613,29 @@ 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(false, $page), $this->_getStickyArgs()));
+    }
+
+    protected function getRunningCallbackArgs(bool $isTerminated, $page): array
+    {
+        $args = [];
+        foreach ($this->elements as $v) {
+            if ($v instanceof Callback && $v->isTriggered() && $v->canTrigger()) {
+                if (($page[Callback::URL_QUERY_TARGET] ?? null) === $v->getUrlTrigger()) {
+                    $isTerminated = true;
+                }
+
+                if ($isTerminated) {
+                    $args[Callback::URL_QUERY_TRIGGER_PREFIX . $v->getUrlTrigger()] = $v->getTriggeredValue();
+                }
+            }
+        }
+
+        if ($this->issetOwner() && $this->getOwner() instanceof self) {
+            $args = array_merge($this->getOwner()->getRunningCallbackArgs($isTerminated, $page), $args);
+        }
+
+        return $args;
     }
 
     /**