@effindomv2/fui-rs 0.1.9 → 0.1.11

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fui-rs"
-version = "0.1.9"
+version = "0.1.11"
 edition = "2021"
 license = "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effindomv2/fui-rs",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 Rust frontend framework SDK and host generators",

package/src/controls/nav_link.rs

@@ -59,7 +59,6 @@ impl NavLink {
         label_node
             .font_family(theme.fonts.body_family.clone())
             .font_size(15.0)
-            .text_color(theme.colors.accent)
             .cursor(CursorStyle::Pointer);
         root.justify_content(JustifyContent::Start)
             .align_items(AlignItems::Center)
@@ -272,6 +271,19 @@ impl NavLink {
         self
     }
 
+    pub fn bind_theme(&self, handler: impl Fn(&NavLink, crate::theme::Theme) + 'static) -> &Self {
+        let target = self.event_target();
+        let guard = subscribe(move |theme| {
+            if let Some(link) = target.upgrade() {
+                handler(&link, theme);
+            }
+        });
+        self.root
+            .retained_node_ref()
+            .retain_attachment(Rc::new(guard));
+        self
+    }
+
     pub fn on_navigate(&self, handler: impl Fn(NavigateEventArgs) + 'static) -> &Self {
         *self.navigate.borrow_mut() = Some(Rc::new(handler));
         self
@@ -293,6 +305,7 @@ impl Node for NavLink {
 
     fn build_self(&self) {
         self.root.build_self();
+        self.sync_visual_state();
     }
 }
 
@@ -334,6 +347,24 @@ struct NavLinkEventTarget {
 }
 
 impl NavLinkEventTarget {
+    fn upgrade(&self) -> Option<NavLink> {
+        Some(NavLink {
+            root: self.weak_root.upgrade()?,
+            label: self.label.clone(),
+            href: self.href.clone(),
+            open_in_new_tab: self.open_in_new_tab.clone(),
+            navigate: self.navigate.clone(),
+            hovered: self.hovered.clone(),
+            focused: self.focused.clone(),
+            pointer_pressed: self.pointer_pressed.clone(),
+            pointer_pressed_open_in_new_tab: self.pointer_pressed_open_in_new_tab.clone(),
+            enter_pressed: self.enter_pressed.clone(),
+            enter_pressed_open_in_new_tab: self.enter_pressed_open_in_new_tab.clone(),
+            preview_pinned_for_context_menu: self.preview_pinned_for_context_menu.clone(),
+            text_color_override: self.text_color_override.clone(),
+        })
+    }
+
     fn is_enabled(&self) -> bool {
         self.weak_root
             .upgrade()
@@ -407,13 +438,15 @@ impl NavLinkEventTarget {
     }
 
     fn sync_visual_state(&self) {
-        let color = self.text_color_override.get().unwrap_or_else(|| {
-            if self.hovered.get() {
-                current_theme().colors.accent_hovered
-            } else {
-                current_theme().colors.accent
-            }
-        });
+        let theme = current_theme();
+        let color = if self.hovered.get() {
+            theme.colors.accent_hovered
+        } else {
+            self.text_color_override
+                .get()
+                .or_else(|| self.label.configured_text_color())
+                .unwrap_or(theme.colors.accent)
+        };
         if self.label.handle() != NodeHandle::INVALID {
             ui::set_text_color(self.label.handle().raw(), color);
         }

package/src/controls/tests.rs

@@ -1151,6 +1151,40 @@ fn retained_button_and_nav_link_keep_theme_subscriptions_after_wrappers_drop() {
     use_system_theme();
 }
 
+#[test]
+fn nav_link_bind_theme_preserves_concrete_control_dx_and_retained_lifetime() {
+    ffi::test::reset();
+    let previous_theme = current_theme();
+    let parent = column();
+    let link = NavLink::with_label("/docs", "Docs");
+    link.bind_theme(|link, theme| {
+        link.bg_color(theme.colors.surface)
+            .text_color(theme.colors.text_muted);
+    });
+    parent.child(&link);
+    Application::mount(parent);
+    let link_handle = link.handle().raw();
+    let label_handle = link.label_node().handle().raw();
+    drop(link);
+    ffi::test::take_calls();
+
+    let changed = generate_theme(false, 0x2468ACFF);
+    use_custom_theme(changed.clone());
+    let calls = ffi::test::take_calls();
+    assert!(calls.iter().any(|call| matches!(
+        call,
+        Call::SetBgColor { handle, color }
+            if *handle == link_handle && *color == changed.colors.surface
+    )));
+    assert!(calls.iter().any(|call| matches!(
+        call,
+        Call::SetTextColor { handle, color }
+            if *handle == label_handle && *color == changed.colors.text_muted
+    )));
+
+    use_custom_theme(previous_theme);
+}
+
 #[test]
 fn retained_pressable_and_slider_keep_theme_subscriptions_after_wrappers_drop() {
     ffi::test::reset();

package/src/node/core.rs

@@ -1791,6 +1791,9 @@ pub trait Node: Clone {
         Self: Sized,
     {
         let node_ref = self.node_ref();
+        if enabled {
+            node_ref.require_interactive();
+        }
         let mut core = node_ref.inner.borrow_mut();
         core.behavior.focusable = Some((enabled, tab_index));
         let interactive = core.behavior.enabled && core.behavior.inherited_enabled;

package/src/node/flex_box.rs

@@ -476,6 +476,9 @@ impl FlexBox {
     }
 
     pub fn focusable(&self, enabled: bool, tab_index: i32) -> &Self {
+        if enabled {
+            self.retained_node_ref().require_interactive();
+        }
         let mut core = self.core.borrow_mut();
         core.behavior.focusable = Some((enabled, tab_index));
         let interactive = core.behavior.enabled && core.behavior.inherited_enabled;

package/src/node/scroll_view.rs

@@ -249,6 +249,9 @@ impl ScrollView {
     }
 
     pub fn focusable(&self, enabled: bool, tab_index: i32) -> &Self {
+        if enabled {
+            self.retained_node_ref().require_interactive();
+        }
         let mut core = self.core.borrow_mut();
         core.behavior.focusable = Some((enabled, tab_index));
         let interactive = core.behavior.enabled && core.behavior.inherited_enabled;

package/src/node/text_node.rs

@@ -177,6 +177,10 @@ impl TextNode {
         self
     }
 
+    pub(crate) fn configured_text_color(&self) -> Option<u32> {
+        self.props.borrow().text_color
+    }
+
     pub fn style_runs(&self, words: Vec<u32>) -> &Self {
         {
             let mut props = self.props.borrow_mut();
@@ -418,6 +422,9 @@ impl TextNode {
     }
 
     pub fn focusable(&self, enabled: bool, tab_index: i32) -> &Self {
+        if enabled {
+            self.retained_node_ref().require_interactive();
+        }
         let mut core = self.core.borrow_mut();
         core.behavior.focusable = Some((enabled, tab_index));
         let interactive = core.behavior.enabled && core.behavior.inherited_enabled;