@effindomv2/fui-rs 0.1.19 → 0.1.21

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fui-rs"
-version = "0.1.19"
+version = "0.1.21"
 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.21",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 Rust frontend framework SDK and host generators",
@@ -33,11 +33,12 @@
     "generate:host": "npm run generate:host-services && npm run generate:host-events:home && npm run generate:host-events:workbench && npm run generate:host-events:stage4 && npm run generate:host-events:stage5 && npm run generate:host-events:immediate-drawing && npm run generate:worker-host-services && npm run generate:framework-host-services",
     "guard:runtime-dependency": "bash scripts/check-runtime-dependency.sh",
     "lint": "cd ../.. && npm run lint:v2",
+    "lint:rust": "bash -lc 'source \"$HOME/.cargo/env\" && cargo clippy --manifest-path Cargo.toml --all-targets -- -D warnings'",
     "build": "npm run guard:runtime-dependency && npm run check:abi && bash scripts/build.sh",
     "test:unit": "npm run guard:runtime-dependency && npm run check:abi && npm run generate:host && bash -lc 'source \"$HOME/.cargo/env\" && cargo test --manifest-path Cargo.toml'",
     "test:integration": "npm --prefix ../.. run build:v2:browser-bridge && npm run build && playwright test -c playwright.config.ts",
     "typecheck": "npm run guard:runtime-dependency && npm run check:abi && tsc -p tsconfig.json --noEmit",
-    "prepublishOnly": "npm run check:abi && npm run lint && npm run typecheck"
+    "prepublishOnly": "npm run check:abi && npm run lint && npm run lint:rust && npm run typecheck"
   },
   "dependencies": {
     "@effindomv2/runtime": "0.1.26"

package/src/color.rs

@@ -106,7 +106,10 @@ mod tests {
     #[test]
     fn color_helpers_mask_channels_and_interpolate() {
         assert_eq!(rgba(0x112, 0x134, 0x156, 0x178), 0x12345678);
-        assert_eq!(mix_color(rgb(0, 0, 0), rgb(255, 255, 255), 0.5), rgba(128, 128, 128, 255));
+        assert_eq!(
+            mix_color(rgb(0, 0, 0), rgb(255, 255, 255), 0.5),
+            rgba(128, 128, 128, 255)
+        );
         assert_eq!(hsl_to_color(0.0, 1.0, 0.5), rgb(255, 0, 0));
     }
 }

package/src/controls/context_menu.rs

@@ -1,6 +1,6 @@
 use super::ContextMenuAppearance;
 use crate::bindings::ui;
-use crate::event::{self, PointerEventArgs, PointerType};
+use crate::event::{self, PointerButton, PointerEventArgs, PointerType};
 use crate::ffi::{
     BorderStyle, CursorStyle, HandleValue, KeyEventType, SemanticRole, TextAlign, TextOverflow,
     Unit,
@@ -29,7 +29,7 @@ thread_local! {
 }
 
 fn is_primary_activation_pointer(event: &PointerEventArgs) -> bool {
-    event.button == 0
+    event.button == PointerButton::Primary
         || event.pointer_type == PointerType::Touch
         || event.pointer_type == PointerType::Pen
 }

package/src/controls/nav_link.rs

@@ -1,6 +1,6 @@
 use super::*;
 use crate::bindings::ui;
-use crate::event::PointerType;
+use crate::event::{PointerButton, PointerType};
 use crate::ffi::{CursorStyle, HandleValue, SemanticRole};
 use crate::navigation;
 use crate::node::{text, NodeHandle, NodeRef, WeakFlexBox};
@@ -14,8 +14,13 @@ thread_local! {
     static ACTIVE_PREVIEW_OWNER: Cell<u64> = const { Cell::new(HandleValue::Invalid as u64) };
 }
 
-fn is_primary_activation_pointer(event: &PointerEventArgs) -> bool {
-    event.button == 0
+fn is_middle_mouse_button(event: &PointerEventArgs) -> bool {
+    event.pointer_type == PointerType::Mouse && event.button == PointerButton::Auxiliary
+}
+
+fn is_activation_pointer(event: &PointerEventArgs) -> bool {
+    event.button == PointerButton::Primary
+        || is_middle_mouse_button(event)
         || event.pointer_type == PointerType::Touch
         || event.pointer_type == PointerType::Pen
 }
@@ -59,6 +64,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)
@@ -124,21 +131,22 @@ impl NavLink {
         });
         let target = self.event_target();
         self.root.on_pointer_down(move |event| {
-            if !is_primary_activation_pointer(event) {
+            if !is_activation_pointer(event) {
                 target.pointer_pressed.set(false);
                 target.pointer_pressed_open_in_new_tab.set(false);
                 return;
             }
             target.pointer_pressed.set(true);
-            target
-                .pointer_pressed_open_in_new_tab
-                .set(target.should_open_in_new_tab(event.modifiers));
+            target.pointer_pressed_open_in_new_tab.set(
+                is_middle_mouse_button(event) || target.should_open_in_new_tab(event.modifiers),
+            );
             event.handled = true;
         });
         let target = self.event_target();
         self.root.on_pointer_up(move |event| {
-            if target.pointer_pressed.replace(false) && is_primary_activation_pointer(event) {
+            if target.pointer_pressed.replace(false) && is_activation_pointer(event) {
                 let open_in_new_tab = target.pointer_pressed_open_in_new_tab.get()
+                    || is_middle_mouse_button(event)
                     || target.should_open_in_new_tab(event.modifiers);
                 target.activate(open_in_new_tab);
                 event.handled = true;
@@ -442,7 +450,6 @@ impl NavLinkEventTarget {
         } else {
             self.text_color_override
                 .get()
-                .or_else(|| self.label.configured_text_color())
                 .unwrap_or(theme.colors.accent)
         };
         if self.label.handle() != NodeHandle::INVALID {

package/src/controls/slider.rs

@@ -528,7 +528,7 @@ impl SliderEventTarget {
     }
 
     fn handle_pointer_move(&self, event: &mut PointerEventArgs) {
-        if !self.is_enabled() || !self.dragging_state.get() || event.buttons == 0 {
+        if !self.is_enabled() || !self.dragging_state.get() || event.buttons.is_empty() {
             return;
         }
         self.update_value_from_pointer(event.scene_x, event.scene_y, true, true);

package/src/event.rs

@@ -43,6 +43,58 @@ impl PointerType {
     }
 }
 
+#[repr(i32)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum PointerButton {
+    None = -1,
+    Primary = 0,
+    Auxiliary = 1,
+    Secondary = 2,
+    Back = 3,
+    Forward = 4,
+}
+
+impl PointerButton {
+    pub fn from_raw(value: i32) -> Self {
+        match value {
+            0 => Self::Primary,
+            1 => Self::Auxiliary,
+            2 => Self::Secondary,
+            3 => Self::Back,
+            4 => Self::Forward,
+            _ => Self::None,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub struct PointerButtons(u32);
+
+impl PointerButtons {
+    pub const NONE: Self = Self(0);
+    pub const PRIMARY: Self = Self(1 << 0);
+    pub const SECONDARY: Self = Self(1 << 1);
+    pub const AUXILIARY: Self = Self(1 << 2);
+    pub const BACK: Self = Self(1 << 3);
+    pub const FORWARD: Self = Self(1 << 4);
+
+    pub const fn from_raw(value: u32) -> Self {
+        Self(value)
+    }
+
+    pub const fn bits(self) -> u32 {
+        self.0
+    }
+
+    pub const fn is_empty(self) -> bool {
+        self.0 == 0
+    }
+
+    pub const fn contains(self, buttons: Self) -> bool {
+        self.0 & buttons.0 == buttons.0
+    }
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum GestureIntent {
     None = 0,
@@ -109,8 +161,8 @@ pub struct PointerEventArgs {
     pub modifiers: u32,
     pub pointer_id: i32,
     pub pointer_type: PointerType,
-    pub button: i32,
-    pub buttons: u32,
+    pub button: PointerButton,
+    pub buttons: PointerButtons,
     pub pressure: f32,
     pub width: f32,
     pub height: f32,
@@ -145,8 +197,8 @@ impl PointerEventArgs {
             modifiers,
             pointer_id,
             pointer_type,
-            button,
-            buttons,
+            button: PointerButton::from_raw(button),
+            buttons: PointerButtons::from_raw(buttons),
             pressure,
             width,
             height,

package/src/lib.rs

@@ -4,9 +4,9 @@ pub mod assets;
 #[doc(hidden)]
 pub mod bindings;
 pub mod bitmap;
-pub mod color;
 #[doc(hidden)]
 pub mod bridge_callbacks;
+pub mod color;
 pub(crate) mod context_menu_manager;
 pub mod controls;
 pub mod debug;
@@ -456,8 +456,9 @@ pub mod prelude {
     pub use crate::drawing::{DrawContext, Paint, Path};
     pub use crate::event::{
         FocusChangedEventArgs, GestureEventArgs, GestureEventKind, GestureEventPhase,
-        GestureIntent, KeyEventArgs, LongPressEventArgs, PointerEventArgs, PointerType,
-        SelectionChangedEventArgs, TextChangedEventArgs, WheelEventArgs,
+        GestureIntent, KeyEventArgs, LongPressEventArgs, PointerButton, PointerButtons,
+        PointerEventArgs, PointerType, SelectionChangedEventArgs, TextChangedEventArgs,
+        WheelEventArgs,
     };
     pub use crate::external_drop::{
         ExternalDropEventArgs, ExternalDropItemInfo, ExternalDropItemKind,
@@ -488,10 +489,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;
@@ -581,8 +582,8 @@ pub use drag_drop::{
 pub use drawing::{DrawContext, Paint, Path};
 pub use event::{
     FocusChangedEventArgs, GestureEventArgs, GestureEventKind, GestureEventPhase, GestureIntent,
-    KeyEventArgs, LongPressEventArgs, PointerEventArgs, PointerType, SelectionChangedEventArgs,
-    TextChangedEventArgs, WheelEventArgs,
+    KeyEventArgs, LongPressEventArgs, PointerButton, PointerButtons, PointerEventArgs, PointerType,
+    SelectionChangedEventArgs, TextChangedEventArgs, WheelEventArgs,
 };
 pub use external_drop::{ExternalDropEventArgs, ExternalDropItemInfo, ExternalDropItemKind};
 pub use fetch::{Fetch, FetchErrorEventArgs, FetchRequest, FetchResponse};
@@ -609,9 +610,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/core.rs

@@ -3,7 +3,7 @@ use crate::drag_drop::{
     DragCompletedEventArgs, DragDataObject, DragDropEffects, DragEventArgs, DropProposal,
 };
 use crate::drag_gesture::{DragCompletedEvent, DragGesture, DragStartedEvent};
-use crate::event::{SelectionChangedEventArgs, TextChangedEventArgs};
+use crate::event::{PointerButton, SelectionChangedEventArgs, TextChangedEventArgs};
 use crate::external_drop::ExternalDropEventArgs;
 use crate::persisted::PersistedStateAdapter;
 use crate::tool_tip::ToolTip;
@@ -31,7 +31,7 @@ pub(crate) type ExternalDragEventCallback = Rc<dyn Fn(ExternalDropEventArgs)>;
 pub(crate) type EffectiveEnabledChangedCallback = Rc<dyn Fn(bool)>;
 
 pub(crate) fn is_primary_activation_pointer(event: &PointerEventArgs) -> bool {
-    event.button == 0
+    event.button == PointerButton::Primary
         || event.pointer_type == PointerType::Touch
         || event.pointer_type == PointerType::Pen
 }
@@ -513,11 +513,7 @@ impl NodeRef {
         self.inner.borrow().handle
     }
 
-    pub(crate) fn set_semantic_checked(
-        &self,
-        state: SemanticCheckedState,
-        announce: bool,
-    ) {
+    pub(crate) fn set_semantic_checked(&self, state: SemanticCheckedState, announce: bool) {
         let handle = {
             let mut core = self.inner.borrow_mut();
             core.behavior.semantic_checked = Some(state);

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()

package/src/theme.rs

@@ -1,7 +1,7 @@
-use crate::generated::framework_host_services;
 use crate::color::{
     color_alpha, color_blue, color_green, color_red, mix_color, rgb, rgba, with_alpha,
 };
+use crate::generated::framework_host_services;
 use crate::signal::{Callback, Signal, SubscriptionGuard};
 use crate::typography::{FontFamily, FontStack};
 use std::cell::RefCell;