@effindomv2/fui-rs 0.1.22 → 0.1.24

package/src/controls/text_editor_surface.rs

@@ -0,0 +1,167 @@
+use super::internal::text_input_presenter::TextInputTemplate;
+use super::TextInputColors;
+use crate::event::{SelectionChangedEventArgs, TextChangedEventArgs};
+use crate::FontFamily;
+use std::rc::Rc;
+
+/// Shared editable-text behavior implemented by [`TextInput`](super::TextInput)
+/// and [`TextArea`](super::TextArea).
+///
+/// Selection and caret positions use Unicode scalar-value indices. The
+/// explicitly named byte-offset getters expose the corresponding UTF-8 runtime
+/// offsets for diagnostics and low-level interop only.
+pub trait TextEditorSurface: Sized {
+    fn text(&self, value: impl Into<String>) -> &Self;
+    fn value(&self) -> String;
+    fn selection_start(&self) -> u32;
+    fn selection_end(&self) -> u32;
+    fn selection_start_byte_offset(&self) -> u32;
+    fn selection_end_byte_offset(&self) -> u32;
+    fn placeholder(&self, value: impl Into<String>) -> &Self;
+    fn max_chars(&self, limit: i32) -> &Self;
+    fn read_only(&self, flag: bool) -> &Self;
+    fn accepts_tab(&self, flag: bool) -> &Self;
+    fn selection_range(&self, start: u32, end: u32) -> &Self;
+    fn caret(&self, position: u32) -> &Self;
+    fn caret_to_end(&self) -> &Self;
+    fn colors(&self, colors: TextInputColors) -> &Self;
+    fn clear_colors(&self) -> &Self;
+    fn template(&self, template: Rc<dyn TextInputTemplate>) -> &Self;
+    fn clear_template(&self) -> &Self;
+    fn line_height(&self, value: f32) -> &Self;
+    fn font_family(&self, family: FontFamily) -> &Self;
+    fn font_size(&self, size: f32) -> &Self;
+    fn on_changed(&self, handler: impl Fn(TextChangedEventArgs) + 'static) -> &Self;
+    fn on_text_changed(&self, handler: impl Fn(TextChangedEventArgs) + 'static) -> &Self;
+    fn on_selection_changed(&self, handler: impl Fn(SelectionChangedEventArgs) + 'static) -> &Self;
+}
+
+macro_rules! impl_text_editor_surface {
+    ($control:ty) => {
+        impl crate::controls::TextEditorSurface for $control {
+            fn text(&self, value: impl Into<String>) -> &Self {
+                self.core.text(value);
+                self
+            }
+
+            fn value(&self) -> String {
+                self.core.value()
+            }
+
+            fn selection_start(&self) -> u32 {
+                self.core.selection_start()
+            }
+
+            fn selection_end(&self) -> u32 {
+                self.core.selection_end()
+            }
+
+            fn selection_start_byte_offset(&self) -> u32 {
+                self.core.selection_start_byte_offset()
+            }
+
+            fn selection_end_byte_offset(&self) -> u32 {
+                self.core.selection_end_byte_offset()
+            }
+
+            fn placeholder(&self, value: impl Into<String>) -> &Self {
+                self.core.placeholder(value);
+                self
+            }
+
+            fn max_chars(&self, limit: i32) -> &Self {
+                self.core.max_chars(limit);
+                self
+            }
+
+            fn read_only(&self, flag: bool) -> &Self {
+                self.core.read_only(flag);
+                self
+            }
+
+            fn accepts_tab(&self, flag: bool) -> &Self {
+                self.core.accepts_tab(flag);
+                self
+            }
+
+            fn selection_range(&self, start: u32, end: u32) -> &Self {
+                self.core.selection_range(start, end);
+                self
+            }
+
+            fn caret(&self, position: u32) -> &Self {
+                self.core.caret(position);
+                self
+            }
+
+            fn caret_to_end(&self) -> &Self {
+                self.core.caret_to_end();
+                self
+            }
+
+            fn colors(&self, colors: crate::controls::TextInputColors) -> &Self {
+                self.core.colors(colors);
+                self
+            }
+
+            fn clear_colors(&self) -> &Self {
+                self.core.clear_colors();
+                self
+            }
+
+            fn template(
+                &self,
+                template: std::rc::Rc<dyn crate::controls::TextInputTemplate>,
+            ) -> &Self {
+                self.core.template(template);
+                self
+            }
+
+            fn clear_template(&self) -> &Self {
+                self.core.clear_template();
+                self
+            }
+
+            fn line_height(&self, value: f32) -> &Self {
+                self.core.line_height(value);
+                self
+            }
+
+            fn font_family(&self, family: crate::FontFamily) -> &Self {
+                self.core.font_family(family);
+                self
+            }
+
+            fn font_size(&self, size: f32) -> &Self {
+                self.core.font_size(size);
+                self
+            }
+
+            fn on_changed(
+                &self,
+                handler: impl Fn(crate::event::TextChangedEventArgs) + 'static,
+            ) -> &Self {
+                self.core.on_changed(handler);
+                self
+            }
+
+            fn on_text_changed(
+                &self,
+                handler: impl Fn(crate::event::TextChangedEventArgs) + 'static,
+            ) -> &Self {
+                self.core.on_text_changed(handler);
+                self
+            }
+
+            fn on_selection_changed(
+                &self,
+                handler: impl Fn(crate::event::SelectionChangedEventArgs) + 'static,
+            ) -> &Self {
+                self.core.on_selection_changed(handler);
+                self
+            }
+        }
+    };
+}
+
+pub(crate) use impl_text_editor_surface;

package/src/controls/text_input.rs

@@ -1,9 +1,7 @@
 use super::internal::text_input_core::TextInputCore;
-use super::internal::text_input_presenter::TextInputTemplate;
-use super::TextInputColors;
-use crate::event::{FocusChangedEventArgs, SelectionChangedEventArgs, TextChangedEventArgs};
-use crate::node::{FlexBox, HasFlexBoxRoot, Node, NodeRef, TextCore};
-use crate::FontFamily;
+use super::text_editor_surface::impl_text_editor_surface;
+use crate::event::FocusChangedEventArgs;
+use crate::node::{FlexBox, HasFlexBoxRoot, Node, NodeRef, TextNode};
 use std::any::Any;
 use std::rc::Rc;
 
@@ -25,51 +23,6 @@ impl TextInput {
         Self { core }
     }
 
-    pub fn text(&self, value: impl Into<String>) -> &Self {
-        self.core.text(value);
-        self
-    }
-
-    pub fn value(&self) -> String {
-        self.core.value()
-    }
-
-    pub fn selection_start(&self) -> u32 {
-        self.core.selection_start()
-    }
-
-    pub fn selection_end(&self) -> u32 {
-        self.core.selection_end()
-    }
-
-    pub fn selection_start_byte_offset(&self) -> u32 {
-        self.core.selection_start_byte_offset()
-    }
-
-    pub fn selection_end_byte_offset(&self) -> u32 {
-        self.core.selection_end_byte_offset()
-    }
-
-    pub fn placeholder(&self, value: impl Into<String>) -> &Self {
-        self.core.placeholder(value);
-        self
-    }
-
-    pub fn max_chars(&self, limit: i32) -> &Self {
-        self.core.max_chars(limit);
-        self
-    }
-
-    pub fn read_only(&self, flag: bool) -> &Self {
-        self.core.read_only(flag);
-        self
-    }
-
-    pub fn accepts_tab(&self, flag: bool) -> &Self {
-        self.core.accepts_tab(flag);
-        self
-    }
-
     pub fn password(&self, flag: bool) -> &Self {
         self.core.password(flag);
         self
@@ -85,104 +38,13 @@ impl TextInput {
         self
     }
 
-    pub fn selection_range(&self, start: u32, end: u32) -> &Self {
-        self.core.selection_range(start, end);
-        self
-    }
-
-    pub fn caret(&self, position: u32) -> &Self {
-        self.core.caret(position);
-        self
-    }
-
-    pub fn caret_to_end(&self) -> &Self {
-        self.core.caret_to_end();
-        self
-    }
-
-    pub fn colors(&self, colors: TextInputColors) -> &Self {
-        self.core.colors(colors);
-        self
-    }
-
-    pub fn clear_colors(&self) -> &Self {
-        self.core.clear_colors();
-        self
-    }
-
-    pub fn template(&self, template: Rc<dyn TextInputTemplate>) -> &Self {
-        self.core.template(template);
-        self
-    }
-
-    pub fn clear_template(&self) -> &Self {
-        self.core.clear_template();
-        self
-    }
-
-    pub fn enabled(&self, enabled: bool) -> &Self {
-        self.core.enabled(enabled);
-        self
-    }
-
-    pub fn focusable(&self, enabled: bool, tab_index: i32) -> &Self {
-        self.core.focusable(enabled, tab_index);
-        self
-    }
-
-    pub fn node_id(&self, id: impl Into<String>) -> &Self {
-        self.core.node_id(id);
-        self
-    }
-
-    pub fn line_height(&self, value: f32) -> &Self {
-        self.core.line_height(value);
-        self
-    }
-
-    pub fn font_family(&self, family: FontFamily) -> &Self {
-        self.core.font_family(family);
-        self
-    }
-
-    pub fn font_size(&self, size: f32) -> &Self {
-        self.core.font_size(size);
-        self
-    }
-
-    pub fn on_changed(&self, handler: impl Fn(TextChangedEventArgs) + 'static) -> &Self {
-        self.core.on_changed(handler);
-        self
-    }
-
-    pub fn on_text_changed(&self, handler: impl Fn(TextChangedEventArgs) + 'static) -> &Self {
-        self.core.on_text_changed(handler);
-        self
-    }
-
-    pub fn on_selection_changed(
-        &self,
-        handler: impl Fn(SelectionChangedEventArgs) + 'static,
-    ) -> &Self {
-        self.core.on_selection_changed(handler);
-        self
-    }
-
-    pub fn on_focus_changed(&self, handler: impl Fn(FocusChangedEventArgs) + 'static) -> &Self {
-        self.core.on_focus_changed(handler);
-        self
-    }
-
-    pub fn focus_now(&self) -> &Self {
-        self.core.focus_now();
-        self
-    }
-
-    pub(crate) fn editor_node(&self) -> TextCore {
+    pub(crate) fn editor_node(&self) -> TextNode {
         self.core.editor_node()
     }
 }
 
+impl_text_editor_surface!(TextInput);
+
 impl HasFlexBoxRoot for TextInput {
     fn flex_box_root(&self) -> &FlexBox {
         self.core.flex_box_root()
@@ -205,6 +67,30 @@ impl crate::ThemeBindable for TextInput {
 }
 
 impl Node for TextInput {
+    fn apply_node_id(&self, node_id: String) {
+        self.core.node_id(node_id);
+    }
+
+    fn apply_semantic_label(&self, label: String) {
+        self.core.semantic_label(label);
+    }
+
+    fn apply_focusable(&self, enabled: bool, tab_index: i32) {
+        self.core.focusable(enabled, tab_index);
+    }
+
+    fn apply_focus_now(&self) {
+        self.core.focus_now();
+    }
+
+    fn apply_enabled(&self, enabled: bool) {
+        self.core.enabled(enabled);
+    }
+
+    fn apply_focus_changed_handler(&self, handler: Rc<dyn Fn(FocusChangedEventArgs)>) {
+        self.core.set_focus_changed_callback(handler);
+    }
+
     fn retained_node_ref(&self) -> NodeRef {
         let core = self.core.clone();
         self.core

package/src/lib.rs

@@ -43,6 +43,7 @@ pub(crate) mod selection_handle_adorner;
 #[doc(hidden)]
 pub mod signal;
 pub mod text;
+mod text_indices;
 pub mod theme;
 pub mod timers;
 pub mod tool_tip;
@@ -460,7 +461,7 @@ pub mod prelude {
         text_area, text_input, use_control_templates, AntiSelectionArea, Button, ButtonColors,
         ButtonPresenter, ButtonTemplate, ButtonVisualState, CheckState, Checkbox,
         CheckboxChangedEventArgs, CheckboxIndicatorPresenter, CheckboxIndicatorTemplate,
-        CheckboxIndicatorVisualState, ClickEventArgs, ComboBox, ComboBoxChangedEventArgs,
+        CheckboxIndicatorVisualState, Clickable, ClickEventArgs, ComboBox, ComboBoxChangedEventArgs,
         ComboBoxCommitMode, ComboBoxFilterMode, ComboBoxItem, ContextMenu, ContextMenuAction,
         ContextMenuAppearance, ContextMenuItemAppearance, ContextMenuVisibilityChangedEventArgs,
         ControlTemplateSet, DefaultButtonTemplate, DefaultCheckboxIndicatorTemplate,
@@ -481,8 +482,8 @@ pub mod prelude {
         Slider, SliderChangedEventArgs, SliderColors, SliderPresenter, SliderPresenterMetrics,
         SliderSizing, SliderTemplate, SliderVisualState, SurfaceAppearance, Switch,
         SwitchChangedEventArgs, SwitchIndicatorPresenter, SwitchIndicatorTemplate,
-        SwitchIndicatorVisualState, TextArea, TextInput, TextInputColors, TextInputPresenter,
-        TextInputTemplate, TextInputVisualState, DEFAULT_BUTTON_TEMPLATE,
+        SwitchIndicatorVisualState, TextArea, TextEditorSurface, TextInput, TextInputColors,
+        TextInputPresenter, TextInputTemplate, TextInputVisualState, DEFAULT_BUTTON_TEMPLATE,
         DEFAULT_CHECKBOX_INDICATOR_TEMPLATE, DEFAULT_DROPDOWN_CHEVRON_TEMPLATE,
         DEFAULT_DROPDOWN_FIELD_TEMPLATE, DEFAULT_DROPDOWN_OPTION_ROW_TEMPLATE,
         DEFAULT_RADIO_INDICATOR_TEMPLATE, DEFAULT_SLIDER_TEMPLATE,
@@ -527,11 +528,14 @@ pub mod prelude {
     pub use crate::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, HasTextNode, Image,
-        ImageNode, Length, Node, PresenterHostStyle, ScrollBar, ScrollBarStyle,
-        ScrollBarVisibility, ScrollBox, ScrollState, ScrollView, Shadow, Svg, SvgNode, Text,
-        TextCore, TextLayoutSurface, TextNode, ThemeBindable, VirtualList,
+        BoxStyleSurface, Child, ChildContainerSurface, ContextMenuEventArgs, Corners,
+        CustomDrawable, DrawableInvalidator, EdgeInsets, FlexBox, FlexBoxSurface,
+        FlexLayoutSurface, GradientStop, Grid, GridTrack, HasFlexBoxRoot, HasTextNode, Image,
+        ImageNode, LayoutSurface, Length, Node, Portal, PresenterHostStyle, ScrollBar,
+        ScrollBarStyle, ScrollBarVisibility, ScrollBox, ScrollState, ScrollView, Shadow, Svg,
+        SvgNode, Text, TextContentSurface, TextEditingSurface, TextEventSurface, TextLayoutSurface,
+        TextNode, TextSelectionSurface, TextSurface, TextTypographySurface, ThemeBindable,
+        VirtualList,
     };
     pub use crate::persisted;
     pub use crate::platform;
@@ -606,12 +610,12 @@ pub use controls::{
     RadioIndicatorVisualState, SelectionArea, Slider, SliderChangedEventArgs, SliderColors,
     SliderPresenter, SliderPresenterMetrics, SliderSizing, SliderTemplate, SliderVisualState,
     SurfaceAppearance, Switch, SwitchChangedEventArgs, SwitchIndicatorPresenter,
-    SwitchIndicatorTemplate, SwitchIndicatorVisualState, TextArea, TextInput, TextInputColors,
-    TextInputPresenter, TextInputTemplate, TextInputVisualState, DEFAULT_BUTTON_TEMPLATE,
-    DEFAULT_CHECKBOX_INDICATOR_TEMPLATE, DEFAULT_DROPDOWN_CHEVRON_TEMPLATE,
-    DEFAULT_DROPDOWN_FIELD_TEMPLATE, DEFAULT_DROPDOWN_OPTION_ROW_TEMPLATE,
-    DEFAULT_RADIO_INDICATOR_TEMPLATE, DEFAULT_SLIDER_TEMPLATE, DEFAULT_SWITCH_INDICATOR_TEMPLATE,
-    DEFAULT_TEXT_INPUT_TEMPLATE,
+    SwitchIndicatorTemplate, SwitchIndicatorVisualState, TextArea, TextEditorSurface, TextInput,
+    TextInputColors, TextInputPresenter, TextInputTemplate, TextInputVisualState,
+    DEFAULT_BUTTON_TEMPLATE, DEFAULT_CHECKBOX_INDICATOR_TEMPLATE,
+    DEFAULT_DROPDOWN_CHEVRON_TEMPLATE, DEFAULT_DROPDOWN_FIELD_TEMPLATE,
+    DEFAULT_DROPDOWN_OPTION_ROW_TEMPLATE, DEFAULT_RADIO_INDICATOR_TEMPLATE,
+    DEFAULT_SLIDER_TEMPLATE, DEFAULT_SWITCH_INDICATOR_TEMPLATE, DEFAULT_TEXT_INPUT_TEMPLATE,
 };
 pub use debug::*;
 pub use drag_drop::{
@@ -647,12 +651,14 @@ pub use logger::*;
 pub use navigation::*;
 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, HasTextNode, Image, ImageNode,
-    Length, Node, PresenterHostStyle, ScrollBar, ScrollBarStyle, ScrollBarVisibility, ScrollBox,
-    ScrollState, ScrollView, Shadow, Svg, SvgNode, Text, TextCore, TextLayoutSurface, TextNode,
-    ThemeBindable, VirtualList,
+    scroll_view, svg, text, viewport_height, viewport_width, virtual_list, Border, BoxStyleSurface,
+    Child, ChildContainerSurface, ContextMenuEventArgs, Corners, CustomDrawable,
+    DrawableInvalidator, EdgeInsets, FlexBox, FlexBoxSurface, FlexLayoutSurface, GradientStop,
+    Grid, GridTrack, HasFlexBoxRoot, HasTextNode, Image, ImageNode, LayoutSurface, Length, Node,
+    Portal, PresenterHostStyle, ScrollBar, ScrollBarStyle, ScrollBarVisibility, ScrollBox,
+    ScrollState, ScrollView, Shadow, Svg, SvgNode, Text, TextContentSurface, TextEditingSurface,
+    TextEventSurface, TextLayoutSurface, TextNode, TextSelectionSurface, TextSurface,
+    TextTypographySurface, ThemeBindable, VirtualList,
 };
 pub use persisted::*;
 pub use platform::*;

package/src/mobile_text_selection_toolbar.rs

@@ -4,10 +4,10 @@ use crate::ffi::{
     AlignItems, FlexDirection, JustifyContent, PositionType, SemanticRole, TextOverflow, Unit,
     Visibility,
 };
-use crate::node::FlexBoxSurface;
 use crate::node::{
     flex_box, portal, text, FlexBox, Node, NodeHandle, NodeRef, ScrollBox, TextNode,
 };
+use crate::node::{ChildContainerSurface, LayoutSurface};
 use crate::theme::current_theme;
 use std::cell::RefCell;
 
@@ -121,7 +121,7 @@ impl ToolbarButton {
                 activate_toolbar_slot(slot);
                 event.handled = true;
             })
-            .on_click(move |_| activate_toolbar_slot(slot));
+            .on_pointer_click(move |_| activate_toolbar_slot(slot));
         append_child_ref(&root, &child_node);
         Self {
             root,