@effindomv2/fui-rs 0.1.12 → 0.1.13

package/src/node/scroll_box.rs

@@ -512,3 +512,18 @@ impl HasFlexBoxRoot for ScrollBox {
         &self.inner.root
     }
 }
+
+impl ThemeBindable for ScrollBox {
+    fn theme_binding_node(&self) -> NodeRef {
+        self.inner.root.retained_node_ref()
+    }
+
+    fn weak_theme_target(&self) -> Box<dyn Fn() -> Option<Self>> {
+        let weak = Rc::downgrade(&self.inner);
+        Box::new(move || {
+            Some(ScrollBox {
+                inner: weak.upgrade()?,
+            })
+        })
+    }
+}

package/src/node/text_node.rs

@@ -81,19 +81,6 @@ impl TextNode {
         self
     }
 
-    pub fn bind_theme(&self, handler: impl Fn(&TextNode, crate::theme::Theme) + 'static) -> &Self {
-        let weak_core = Rc::downgrade(&self.core);
-        let weak_props = Rc::downgrade(&self.props);
-        let guard = crate::theme::subscribe(move |theme| {
-            let (Some(core), Some(props)) = (weak_core.upgrade(), weak_props.upgrade()) else {
-                return;
-            };
-            handler(&TextNode { core, props }, theme);
-        });
-        self.retained_node_ref().retain_attachment(Rc::new(guard));
-        self
-    }
-
     pub fn width(&self, width: f32, unit: Unit) -> &Self {
         self.props.borrow_mut().width = Some((width, unit));
         {
@@ -670,6 +657,23 @@ impl Node for TextNode {
     }
 }
 
+impl super::ThemeBindable for TextNode {
+    fn theme_binding_node(&self) -> NodeRef {
+        self.retained_node_ref()
+    }
+
+    fn weak_theme_target(&self) -> Box<dyn Fn() -> Option<Self>> {
+        let weak_core = Rc::downgrade(&self.core);
+        let weak_props = Rc::downgrade(&self.props);
+        Box::new(move || {
+            Some(TextNode {
+                core: weak_core.upgrade()?,
+                props: weak_props.upgrade()?,
+            })
+        })
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

package/src/node/virtual_list.rs

@@ -513,6 +513,21 @@ impl HasFlexBoxRoot for VirtualList {
     }
 }
 
+impl ThemeBindable for VirtualList {
+    fn theme_binding_node(&self) -> NodeRef {
+        self.inner.root.retained_node_ref()
+    }
+
+    fn weak_theme_target(&self) -> Box<dyn Fn() -> Option<Self>> {
+        let weak = Rc::downgrade(&self.inner);
+        Box::new(move || {
+            Some(VirtualList {
+                inner: weak.upgrade()?,
+            })
+        })
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;