@effindomv2/fui-rs 0.1.19 → 0.1.20

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fui-rs"
-version = "0.1.19"
+version = "0.1.20"
 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.19",
+  "version": "0.1.20",
   "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,6 +59,8 @@ impl NavLink {
         label_node
             .font_family(theme.fonts.body_family.clone())
             .font_size(15.0)
+            .text_color(theme.colors.accent)
+            .selectable(false)
             .cursor(CursorStyle::Pointer);
         root.justify_content(JustifyContent::Start)
             .align_items(AlignItems::Center)
@@ -440,10 +442,7 @@ impl NavLinkEventTarget {
         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)
+            self.text_color_override.get().unwrap_or(theme.colors.accent)
         };
         if self.label.handle() != NodeHandle::INVALID {
             ui::set_text_color(self.label.handle().raw(), color);

package/src/lib.rs

@@ -488,10 +488,10 @@ pub mod prelude {
         auto, column, custom_drawable, fill, flex_box, grid, image, pct, portal, px, row,
         scroll_box, scroll_view, svg, text, viewport_height, viewport_width, virtual_list, Border,
         Child, ContextMenuEventArgs, Corners, CustomDrawable, DrawableInvalidator, EdgeInsets,
-        FlexBox, FlexBoxSurface, GradientStop, Grid, GridTrack, HasFlexBoxRoot, Image, ImageNode,
-        Length, Node, PresenterHostStyle, ScrollBar, ScrollBarStyle, ScrollBarVisibility,
-        ScrollBox, ScrollState, ScrollView, Shadow, Svg, SvgNode, Text, TextCore, TextNode,
-        ThemeBindable, VirtualList,
+        FlexBox, FlexBoxSurface, GradientStop, Grid, GridTrack, HasFlexBoxRoot, HasTextNode, Image,
+        ImageNode, Length, Node, PresenterHostStyle, ScrollBar, ScrollBarStyle,
+        ScrollBarVisibility, ScrollBox, ScrollState, ScrollView, Shadow, Svg, SvgNode, Text,
+        TextCore, TextLayoutSurface, TextNode, ThemeBindable, VirtualList,
     };
     pub use crate::persisted;
     pub use crate::platform;
@@ -609,9 +609,10 @@ pub use node::{
     auto, column, custom_drawable, fill, flex_box, grid, image, pct, portal, px, row, scroll_box,
     scroll_view, svg, text, viewport_height, viewport_width, virtual_list, Border, Child,
     ContextMenuEventArgs, Corners, CustomDrawable, DrawableInvalidator, EdgeInsets, FlexBox,
-    FlexBoxSurface, GradientStop, Grid, GridTrack, HasFlexBoxRoot, Image, ImageNode, Length, Node,
-    PresenterHostStyle, ScrollBar, ScrollBarStyle, ScrollBarVisibility, ScrollBox, ScrollState,
-    ScrollView, Shadow, Svg, SvgNode, Text, TextCore, TextNode, ThemeBindable, VirtualList,
+    FlexBoxSurface, GradientStop, Grid, GridTrack, HasFlexBoxRoot, HasTextNode, Image, ImageNode,
+    Length, Node, PresenterHostStyle, ScrollBar, ScrollBarStyle, ScrollBarVisibility, ScrollBox,
+    ScrollState, ScrollView, Shadow, Svg, SvgNode, Text, TextCore, TextLayoutSurface, TextNode,
+    ThemeBindable, VirtualList,
 };
 pub use persisted::*;
 pub use platform::*;

package/src/node/mod.rs

@@ -100,6 +100,85 @@ impl ThemeBindable for FlexBox {
     }
 }
 
+pub trait HasTextNode {
+    fn text_node(&self) -> &TextNode;
+}
+
+pub trait TextLayoutSurface: HasTextNode {
+    fn width(&self, width: f32, unit: Unit) -> &Self {
+        self.text_node().width(width, unit);
+        self
+    }
+
+    fn height(&self, height: f32, unit: Unit) -> &Self {
+        self.text_node().height(height, unit);
+        self
+    }
+
+    fn fill_width(&self) -> &Self {
+        self.text_node().fill_width();
+        self
+    }
+
+    fn fill_height(&self) -> &Self {
+        self.text_node().fill_height();
+        self
+    }
+
+    fn fill_size(&self) -> &Self {
+        self.text_node().fill_size();
+        self
+    }
+
+    fn line_height(&self, line_height: f32) -> &Self {
+        self.text_node().line_height(line_height);
+        self
+    }
+
+    fn text_align(&self, align: TextAlign) -> &Self {
+        self.text_node().text_align(align);
+        self
+    }
+
+    fn text_vertical_align(&self, align: TextVerticalAlign) -> &Self {
+        self.text_node().text_vertical_align(align);
+        self
+    }
+
+    fn text_limits(&self, max_chars: i32, max_lines: i32) -> &Self {
+        self.text_node().text_limits(max_chars, max_lines);
+        self
+    }
+
+    fn max_lines(&self, max_lines: i32) -> &Self {
+        self.text_node().max_lines(max_lines);
+        self
+    }
+
+    fn wrapping(&self, wrap: bool) -> &Self {
+        self.text_node().wrapping(wrap);
+        self
+    }
+
+    fn text_overflow(&self, overflow: TextOverflow) -> &Self {
+        self.text_node().text_overflow(overflow);
+        self
+    }
+
+    fn text_overflow_fade(&self, horizontal: bool, vertical: bool) -> &Self {
+        self.text_node().text_overflow_fade(horizontal, vertical);
+        self
+    }
+}
+
+impl<T: HasTextNode> TextLayoutSurface for T {}
+
+impl HasTextNode for TextNode {
+    fn text_node(&self) -> &TextNode {
+        self
+    }
+}
+
 pub trait FlexBoxSurface: HasFlexBoxRoot {
     fn width(&self, width: f32, unit: Unit) -> &Self {
         self.flex_box_root().width(width, unit);

package/src/node/text_node.rs

@@ -164,10 +164,6 @@ 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();

package/src/text.rs

@@ -3,7 +3,7 @@ use crate::bindings::ui;
 use crate::ffi::{TextAlign, TextOverflow, TextVerticalAlign, Unit};
 use crate::frame_scheduler::on_loaded;
 use crate::logger::error;
-use crate::node::{Node, TextNode};
+use crate::node::{HasTextNode, Node, TextNode, ThemeBindable};
 use crate::theme;
 use crate::typography::{FontFamily, FontStack, FontStyle, FontWeight};
 use std::cell::RefCell;
@@ -247,6 +247,29 @@ impl Deref for RichText {
     }
 }
 
+impl HasTextNode for RichText {
+    fn text_node(&self) -> &TextNode {
+        &self.node
+    }
+}
+
+impl ThemeBindable for RichText {
+    fn theme_binding_node(&self) -> crate::node::NodeRef {
+        self.node.retained_node_ref()
+    }
+
+    fn weak_theme_target(&self) -> Box<dyn Fn() -> Option<Self>> {
+        let weak_node = self.node.weak_theme_target();
+        let weak_state = Rc::downgrade(&self.state);
+        Box::new(move || {
+            Some(Self {
+                node: weak_node()?,
+                state: weak_state.upgrade()?,
+            })
+        })
+    }
+}
+
 impl Node for RichText {
     fn retained_node_ref(&self) -> crate::node::NodeRef {
         self.node.retained_node_ref()