fix :bind rebuilding its child when upstream bind change

Tensegritics · Dec 11, 2024 · 5c3749f · 5c3749f
1 parent f37a729
commit 5c3749f
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/clj/src/cljd/flutter.cljd b/clj/src/cljd/flutter.cljd
@@ -544,17 +544,19 @@
                       .aspect ~(into [] (map (fn [[sym [type-or-kw]]] type-or-kw)) inherited-bindings)))])))))))
 
 (defn ^:macro-support expand-bind [env bindings-map forms]
-  `(-widget-cont ~env
-     :context ctx#
-     :let [bindings# ~bindings-map
-           elt# (#/(.getElementForInheritedWidgetOfExactType InheritedBindings) ctx#)
-           prev-bindings# (some-> elt# ^InheritedBindings (.-widget) .-bindings)
-           non-shadowed-keys#
-           (remove (fn [k#] (contains? bindings# k#)) (keys prev-bindings#))
-           _ (when (seq non-shadowed-keys#)
-               (.dependOnInheritedElement ctx# elt# .aspect non-shadowed-keys#))]
-     (cljd.flutter/InheritedBindings. (merge prev-bindings# bindings#)
-       (-widget-cont ~(assoc env :key nil :closest-ctx false) ~@forms))))
+  `(let  [child# (f/widget ~@forms)]
+     (reify :extends (widgets/StatelessWidget .key ~(:key env))
+       :name-hint "bind"
+       :no-meta true
+       (~'build [_# ctx#]
+        (let [bindings# ~bindings-map
+              elt# (#/(.getElementForInheritedWidgetOfExactType InheritedBindings) ctx#)
+              prev-bindings# (some-> elt# ^InheritedBindings (.-widget) .-bindings)
+              non-shadowed-keys#
+              (remove (fn [k#] (contains? bindings# k#)) (keys prev-bindings#))]
+          (when (seq non-shadowed-keys#)
+            (.dependOnInheritedElement ctx# elt# .aspect non-shadowed-keys#))
+          (cljd.flutter/InheritedBindings. (merge prev-bindings# bindings#) child#))))))
 
 (defn ^:macro-support expand-vsync [env name forms]
   `(reify :extends (widgets/StatefulWidget .key ~(:key env))