@effindomv2/fui-rs 0.1.23 → 0.1.24

package/Cargo.toml

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

package/README.md

@@ -186,6 +186,18 @@ calls.
 Retained controls are cheap clone handles. Cloning a control gives another Rust
 handle to the same retained UI object.
 
+FUI-RS maps retained inheritance to capability traits. `Node` supplies the
+universal retained/event surface; FlexBox-derived visuals additionally expose
+`LayoutSurface`, `BoxStyleSurface`, `FlexLayoutSurface`, and
+`ChildContainerSurface`. `TextSurface` covers `Text` and `RichText`, while
+`TextEditorSurface` covers `TextInput` and `TextArea`.
+
+Use `on_pointer_click(...)` for raw routed pointer input. Use
+`on_pointer_double_click(...)` and `on_pointer_triple_click(...)` for exact raw
+multi-click gestures. `Button`, `Checkbox`, `RadioButton`, and `Switch` expose
+count-free `on_click(...)` semantic activation for supported pointer and
+keyboard input.
+
 ## License
 
 AGPL-3.0-only, or commercial license. See [COMMERCIAL.md](COMMERCIAL.md).

package/package.json

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

package/src/controls/anti_selection_area.rs

@@ -11,24 +11,6 @@ impl AntiSelectionArea {
         root.selection_area_barrier(true);
         Self { root }
     }
-
-    pub fn child<T: Node>(&self, node: &T) -> &Self {
-        self.root.child(node);
-        self
-    }
-
-    pub fn children<I, C>(&self, nodes: I) -> &Self
-    where
-        I: IntoIterator<Item = C>,
-        C: Into<Child>,
-    {
-        for node in nodes {
-            self.root
-                .retained_node_ref()
-                .append_child_ref(&node.into().node_ref);
-        }
-        self
-    }
 }
 
 impl Default for AntiSelectionArea {

package/src/controls/button.rs

@@ -3,7 +3,7 @@ use super::internal::button_presenter::{
 };
 use super::*;
 use crate::ffi::CursorStyle;
-use crate::node::{TextCore, WeakFlexBox};
+use crate::node::{TextNode, WeakFlexBox};
 use crate::theme::subscribe;
 use crate::{focus_adorner, focus_visibility};
 use std::rc::Rc;
@@ -12,12 +12,10 @@ use std::rc::Rc;
 pub struct Button {
     root: FlexBox,
     presenter: Rc<RefCell<Rc<dyn ButtonPresenter>>>,
-    label: Rc<RefCell<TextCore>>,
+    label: Rc<RefCell<TextNode>>,
     template: Rc<RefCell<Option<Rc<dyn ButtonTemplate>>>>,
     label_value: Rc<RefCell<String>>,
     click: Rc<RefCell<Option<ClickCallback>>>,
-    double_click: Rc<RefCell<Option<ClickCallback>>>,
-    triple_click: Rc<RefCell<Option<ClickCallback>>>,
     hovered_state: Rc<Cell<bool>>,
     pressed_state: Rc<Cell<bool>>,
     focused_state: Rc<Cell<bool>>,
@@ -49,8 +47,6 @@ impl Button {
             template: Rc::new(RefCell::new(None)),
             label_value: Rc::new(RefCell::new(label.clone())),
             click: Rc::new(RefCell::new(None)),
-            double_click: Rc::new(RefCell::new(None)),
-            triple_click: Rc::new(RefCell::new(None)),
             hovered_state: Rc::new(Cell::new(false)),
             pressed_state: Rc::new(Cell::new(false)),
             focused_state: Rc::new(Cell::new(false)),
@@ -94,13 +90,8 @@ impl Button {
         });
 
         let event_target = self.event_target();
-        self.root.on_click(move |event| {
-            fire_click_callbacks(
-                &event_target.click,
-                &event_target.double_click,
-                &event_target.triple_click,
-                event.click_count.max(1),
-            );
+        self.root.on_pointer_click(move |event| {
+            fire_click_callback(&event_target.click);
             event.handled = true;
         });
         let event_target = self.event_target();
@@ -126,12 +117,7 @@ impl Button {
             if armed.as_deref() == Some(event.key.as_str()) {
                 *event_target.keyboard_armed_key.borrow_mut() = None;
                 event_target.end_press();
-                fire_click_callbacks(
-                    &event_target.click,
-                    &event_target.double_click,
-                    &event_target.triple_click,
-                    1,
-                );
+                fire_click_callback(&event_target.click);
                 event.handled = true;
             }
         });
@@ -185,21 +171,6 @@ impl Button {
         self
     }
 
-    pub fn on_click(&self, handler: impl Fn(ClickEventArgs) + 'static) -> &Self {
-        *self.click.borrow_mut() = Some(Rc::new(handler));
-        self
-    }
-
-    pub fn on_double_click(&self, handler: impl Fn(ClickEventArgs) + 'static) -> &Self {
-        *self.double_click.borrow_mut() = Some(Rc::new(handler));
-        self
-    }
-
-    pub fn on_triple_click(&self, handler: impl Fn(ClickEventArgs) + 'static) -> &Self {
-        *self.triple_click.borrow_mut() = Some(Rc::new(handler));
-        self
-    }
-
     pub fn enabled(&self, enabled: bool) -> &Self {
         self.root.enabled(enabled);
         if !enabled {
@@ -255,8 +226,6 @@ impl Button {
             template: self.template.clone(),
             label_value: self.label_value.clone(),
             click: self.click.clone(),
-            double_click: self.double_click.clone(),
-            triple_click: self.triple_click.clone(),
             hovered_state: self.hovered_state.clone(),
             pressed_state: self.pressed_state.clone(),
             focused_state: self.focused_state.clone(),
@@ -283,7 +252,7 @@ impl Button {
         self.sync_visual_state();
         self.sync_focus_chrome();
         if activate {
-            fire_click_callbacks(&self.click, &self.double_click, &self.triple_click, 1);
+            fire_click_callback(&self.click);
         }
     }
 
@@ -331,6 +300,13 @@ impl Button {
     }
 }
 
+impl Clickable for Button {
+    fn on_click(&self, handler: impl Fn(ClickEventArgs) + 'static) -> &Self {
+        *self.click.borrow_mut() = Some(Rc::new(handler));
+        self
+    }
+}
+
 impl Node for Button {
     fn retained_node_ref(&self) -> NodeRef {
         self.root.retained_node_ref()
@@ -450,12 +426,10 @@ fn create_button_presenter(template: Option<Rc<dyn ButtonTemplate>>) -> Rc<dyn B
 struct ButtonEventTarget {
     weak_root: WeakFlexBox,
     presenter: Rc<RefCell<Rc<dyn ButtonPresenter>>>,
-    label: Rc<RefCell<TextCore>>,
+    label: Rc<RefCell<TextNode>>,
     template: Rc<RefCell<Option<Rc<dyn ButtonTemplate>>>>,
     label_value: Rc<RefCell<String>>,
     click: Rc<RefCell<Option<ClickCallback>>>,
-    double_click: Rc<RefCell<Option<ClickCallback>>>,
-    triple_click: Rc<RefCell<Option<ClickCallback>>>,
     hovered_state: Rc<Cell<bool>>,
     pressed_state: Rc<Cell<bool>>,
     focused_state: Rc<Cell<bool>>,
@@ -475,8 +449,6 @@ impl ButtonEventTarget {
             template: self.template.clone(),
             label_value: self.label_value.clone(),
             click: self.click.clone(),
-            double_click: self.double_click.clone(),
-            triple_click: self.triple_click.clone(),
             hovered_state: self.hovered_state.clone(),
             pressed_state: self.pressed_state.clone(),
             focused_state: self.focused_state.clone(),

package/src/controls/checkbox.rs

@@ -289,6 +289,13 @@ impl Checkbox {
     }
 }
 
+impl Clickable for Checkbox {
+    fn on_click(&self, handler: impl Fn(ClickEventArgs) + 'static) -> &Self {
+        self.base.on_click(handler);
+        self
+    }
+}
+
 impl LabeledControlTextStyle for Checkbox {
     fn set_label_font_family(&self, family: crate::FontFamily) {
         self.base.font_family(family);

package/src/controls/combobox.rs

@@ -10,7 +10,7 @@ use super::internal::selectable_popup_list::{
 use super::internal::text_input_presenter::{
     TextInputPresenter, TextInputTemplate, TextInputVisualState,
 };
-use super::{DropdownColors, DropdownSizing, TextInput, TextInputColors};
+use super::{DropdownColors, DropdownSizing, TextEditorSurface, TextInput, TextInputColors};
 use crate::bindings::ui;
 use crate::event::{self, TextChangedEventArgs};
 use crate::ffi::{
@@ -20,7 +20,8 @@ use crate::focus_adorner;
 use crate::focus_visibility;
 use crate::logger;
 use crate::node::{
-    row, FlexBox, FlexBoxSurface, HasFlexBoxRoot, Node, NodeRef, TextCore, WeakFlexBox,
+    row, BoxStyleSurface, FlexBox, HasFlexBoxRoot, LayoutSurface, Node, NodeRef, TextNode,
+    WeakFlexBox,
 };
 use crate::signal::SubscriptionGuard;
 use crate::theme::{current_theme, subscribe, Theme};
@@ -88,12 +89,12 @@ fn resolve_text_input_colors(
 
 #[derive(Clone, Default)]
 struct ComboBoxEditorPresenter {
-    editor_host: RefCell<Option<TextCore>>,
+    editor_host: RefCell<Option<TextNode>>,
     placeholder_host: RefCell<Option<FlexBox>>,
 }
 
 impl TextInputPresenter for ComboBoxEditorPresenter {
-    fn bind(&self, editor_host: TextCore, placeholder_host: FlexBox) {
+    fn bind(&self, editor_host: TextNode, placeholder_host: FlexBox) {
         *self.editor_host.borrow_mut() = Some(editor_host);
         *self.placeholder_host.borrow_mut() = Some(placeholder_host);
     }
@@ -401,7 +402,7 @@ impl ComboBox {
         root.retained_node_ref().retain_attachment(shared.clone());
         shared.rebuild_filtered_indices();
 
-        popup_list.popup_presenter.overlay_node().on_click({
+        popup_list.popup_presenter.overlay_node().on_pointer_click({
             let weak_shared = Rc::downgrade(&shared);
             move |_event| {
                 if let Some(shared) = weak_shared.upgrade() {
@@ -589,7 +590,7 @@ impl ComboBox {
         self.shared.editor.editor_node().editor_command_keys(true);
 
         let weak_shared = Rc::downgrade(&self.shared);
-        self.shared.chevron_host.on_click(move |event| {
+        self.shared.chevron_host.on_pointer_click(move |event| {
             let Some(shared) = weak_shared.upgrade() else {
                 return;
             };

package/src/controls/context_menu.rs

@@ -8,8 +8,8 @@ use crate::ffi::{
 use crate::logger::warn;
 use crate::navigation;
 use crate::node::{
-    column, flex_box, grid, portal, Border, FlexBox, Grid, GridTrack, Node, NodeRef, TextNode,
-    WeakFlexBox,
+    column, flex_box, grid, portal, Border, BoxStyleSurface, FlexBox, Grid, GridTrack,
+    LayoutSurface, Node, NodeRef, TextNode, ThemeBindable, WeakFlexBox,
 };
 use crate::popup_presenter::{PopupPresenter, PopupPresenterEventTarget};
 use crate::theme::{current_theme, subscribe, Theme};
@@ -816,8 +816,8 @@ impl ContextMenuEventTarget {
             return;
         };
         let state = self.state.borrow();
+        Grid::shared_size_scope(&panel, true);
         panel
-            .shared_size_scope(true)
             .width(state.menu_width, Unit::Pixel)
             .bg_color(state.panel_background_color)
             .background_blur(state.panel_background_blur_sigma)
@@ -968,9 +968,9 @@ impl ContextMenu {
         let theme = current_theme();
         let root = portal();
         let panel = column();
+        panel.position_type(crate::ffi::PositionType::Absolute);
+        Grid::shared_size_scope(&panel, true);
         panel
-            .position_type(crate::ffi::PositionType::Absolute)
-            .shared_size_scope(true)
             .width(MENU_WIDTH, Unit::Pixel)
             .padding(4.0, 4.0, 4.0, 4.0)
             .border(1.0, theme.context_menu.panel_border_color);
@@ -1265,3 +1265,36 @@ impl crate::node::HasFlexBoxRoot for ContextMenu {
         &self.root
     }
 }
+
+impl ThemeBindable for ContextMenu {
+    fn theme_binding_node(&self) -> NodeRef {
+        self.root.retained_node_ref()
+    }
+
+    fn weak_theme_target(&self) -> Box<dyn Fn() -> Option<Self>> {
+        let root = self.root.downgrade();
+        let panel = self.panel.downgrade();
+        let popup_presenter = self.popup_presenter.downgrade();
+        let items = Rc::downgrade(&self.items);
+        let entries = self.entries.clone();
+        let separators = self.separators.clone();
+        let current_items = Rc::downgrade(&self.current_items);
+        let current_item_tops = Rc::downgrade(&self.current_item_tops);
+        let current_item_heights = Rc::downgrade(&self.current_item_heights);
+        let state = Rc::downgrade(&self.state);
+        Box::new(move || {
+            Some(Self {
+                root: root.upgrade()?,
+                panel: panel.upgrade()?,
+                popup_presenter: popup_presenter.upgrade()?,
+                items: items.upgrade()?,
+                entries: entries.clone(),
+                separators: separators.clone(),
+                current_items: current_items.upgrade()?,
+                current_item_tops: current_item_tops.upgrade()?,
+                current_item_heights: current_item_heights.upgrade()?,
+                state: state.upgrade()?,
+            })
+        })
+    }
+}

package/src/controls/dialog.rs

@@ -1,11 +1,14 @@
 use super::DialogAppearance;
-use super::{Button, Form};
+use super::{Button, Clickable, Form};
 use crate::app;
 use crate::bindings::ui;
 use crate::ffi::{
     AlignItems, BorderStyle, FlexDirection, JustifyContent, PositionType, SemanticRole, Unit,
 };
-use crate::node::{flex_box, portal, Border, FlexBox, Node, NodeRef, TextNode, WeakFlexBox};
+use crate::node::{
+    flex_box, portal, Border, ChildContainerSurface, FlexBox, Node, NodeRef, TextNode,
+    ThemeBindable, WeakFlexBox,
+};
 use crate::theme::{current_theme, subscribe, Theme};
 use std::cell::RefCell;
 use std::rc::Rc;
@@ -363,7 +366,7 @@ impl Dialog {
         });
 
         let event_target = self.event_target();
-        self.overlay.on_click(move |event| {
+        self.overlay.on_pointer_click(move |event| {
             event_target.handle_backdrop_click(event);
         });
 
@@ -434,6 +437,41 @@ impl crate::node::HasFlexBoxRoot for Dialog {
     }
 }
 
+impl ThemeBindable for Dialog {
+    fn theme_binding_node(&self) -> NodeRef {
+        self.root.retained_node_ref()
+    }
+
+    fn weak_theme_target(&self) -> Box<dyn Fn() -> Option<Self>> {
+        let root = self.root.downgrade();
+        let title_node = self.title_node.clone();
+        let body_node = self.body_node.clone();
+        let content_host = self.content_host.clone();
+        let accept_button = self.accept_button.clone();
+        let cancel_button = self.cancel_button.clone();
+        let buttons_row = self._buttons_row.clone();
+        let form = self.form.clone();
+        let card = self.card.clone();
+        let overlay = self.overlay.clone();
+        let state = self.state.clone();
+        Box::new(move || {
+            Some(Self {
+                root: root.upgrade()?,
+                title_node: title_node.clone(),
+                body_node: body_node.clone(),
+                content_host: content_host.clone(),
+                accept_button: accept_button.clone(),
+                cancel_button: cancel_button.clone(),
+                _buttons_row: buttons_row.clone(),
+                form: form.clone(),
+                card: card.clone(),
+                overlay: overlay.clone(),
+                state: state.clone(),
+            })
+        })
+    }
+}
+
 impl DialogEventTarget {
     fn hide(&self) {
         let Some(root) = self.root.upgrade() else {

package/src/controls/dropdown.rs

@@ -18,7 +18,7 @@ use crate::ffi::{AlignItems, CursorStyle, FlexDirection, KeyEventType, NodeType,
 use crate::focus_adorner;
 use crate::focus_visibility;
 use crate::logger;
-use crate::node::{row, FlexBox, FlexBoxSurface, HasFlexBoxRoot, Node, NodeRef, WeakFlexBox};
+use crate::node::{row, BoxStyleSurface, FlexBox, HasFlexBoxRoot, Node, NodeRef, WeakFlexBox};
 use crate::persisted::{persisted_value_adapter, PersistedInt32Codec};
 use crate::signal::SubscriptionGuard;
 use crate::theme::{current_theme, subscribe};
@@ -243,7 +243,7 @@ impl Dropdown {
         *shared_slot.borrow_mut() = Some(Rc::downgrade(&shared));
         root.retained_node_ref().retain_attachment(shared.clone());
 
-        popup_list.popup_presenter.overlay_node().on_click({
+        popup_list.popup_presenter.overlay_node().on_pointer_click({
             let weak_shared = Rc::downgrade(&shared);
             move |_event| {
                 if let Some(shared) = weak_shared.upgrade() {

package/src/controls/form.rs

@@ -1,7 +1,7 @@
 use super::Button;
 use crate::event;
 use crate::ffi::{FlexDirection, KeyEventType, SemanticRole};
-use crate::node::{flex_box, Child, FlexBox, Node, NodeRef};
+use crate::node::{flex_box, FlexBox, Node, NodeRef, ThemeBindable};
 use std::any::Any;
 use std::cell::{Cell, RefCell};
 use std::rc::Rc;
@@ -61,25 +61,6 @@ impl Form {
         self
     }
 
-    pub fn child<T: Node>(&self, node: &T) -> &Self {
-        self.shared.root.child(node);
-        self
-    }
-
-    pub fn children<I, C>(&self, nodes: I) -> &Self
-    where
-        I: IntoIterator<Item = C>,
-        C: Into<Child>,
-    {
-        for node in nodes {
-            self.shared
-                .root
-                .retained_node_ref()
-                .append_child_ref(&node.into().node_ref);
-        }
-        self
-    }
-
     pub fn activate(&self) {
         if self.shared.key_filter_token.get() != 0
             || (self.shared.default_button.borrow().is_none()
@@ -233,3 +214,18 @@ impl crate::node::HasFlexBoxRoot for Form {
         &self.shared.root
     }
 }
+
+impl ThemeBindable for Form {
+    fn theme_binding_node(&self) -> NodeRef {
+        self.shared.root.retained_node_ref()
+    }
+
+    fn weak_theme_target(&self) -> Box<dyn Fn() -> Option<Self>> {
+        let shared = Rc::downgrade(&self.shared);
+        Box::new(move || {
+            Some(Self {
+                shared: shared.upgrade()?,
+            })
+        })
+    }
+}

package/src/controls/internal/button_presenter.rs

@@ -1,7 +1,7 @@
 use crate::controls::ButtonColors;
 use crate::ffi::{AlignItems, FlexDirection, JustifyContent};
 use crate::node::{
-    flex_box, Border, Corners, EdgeInsets, FlexBox, PresenterHostStyle, Shadow, TextCore,
+    flex_box, Border, Corners, EdgeInsets, FlexBox, PresenterHostStyle, Shadow, TextNode,
 };
 use crate::theme::Theme;
 use crate::{FontStyle, FontWeight};
@@ -17,7 +17,7 @@ pub struct ButtonVisualState {
 
 pub trait ButtonPresenter {
     fn content_root(&self) -> FlexBox;
-    fn label_node(&self) -> TextCore;
+    fn label_node(&self) -> TextNode;
     fn present(
         &self,
         theme: Theme,
@@ -33,12 +33,12 @@ pub trait ButtonTemplate {
 #[derive(Clone)]
 pub struct DefaultButtonPresenter {
     content_root: FlexBox,
-    label_node: TextCore,
+    label_node: TextNode,
 }
 
 impl DefaultButtonPresenter {
     pub fn new() -> Self {
-        let label_node = TextCore::new("");
+        let label_node = TextNode::new_core("");
         let content_root = flex_box();
         content_root
             .flex_direction(FlexDirection::Row)
@@ -57,7 +57,7 @@ impl ButtonPresenter for DefaultButtonPresenter {
         self.content_root.clone()
     }
 
-    fn label_node(&self) -> TextCore {
+    fn label_node(&self) -> TextNode {
         self.label_node.clone()
     }
 

package/src/controls/internal/checkbox_indicator_presenter.rs

@@ -3,7 +3,7 @@ use super::pressable_indicator_presenter::{
 };
 use crate::controls::{LabeledControlColors, LabeledControlSizing};
 use crate::ffi::{AlignItems, JustifyContent, SemanticCheckedState, Unit};
-use crate::node::{flex_box, svg, FlexBox, SvgNode};
+use crate::node::{flex_box, svg, BoxStyleSurface, FlexBox, SvgNode};
 use crate::theme::Theme;
 use std::rc::Rc;
 

package/src/controls/internal/pressable_labeled_control.rs

@@ -1,9 +1,9 @@
-use crate::controls::LabeledControlColors;
+use crate::controls::{ClickCallback, ClickEventArgs, LabeledControlColors};
 use crate::event::{FocusChangedEventArgs, KeyEventArgs, PointerEventArgs};
 use crate::ffi::{
     AlignItems, CursorStyle, FlexDirection, KeyEventType, PointerEventType, SemanticRole, Unit,
 };
-use crate::node::{flex_box, FlexBox, Node, TextCore, WeakFlexBox};
+use crate::node::{flex_box, FlexBox, Node, TextNode, WeakFlexBox};
 use crate::theme::{current_theme, subscribe};
 use crate::{focus_adorner, focus_visibility};
 use std::cell::{Cell, RefCell};
@@ -27,7 +27,7 @@ pub(crate) struct PressableLabeledControlState {
 pub(crate) struct PressableLabeledControl {
     root: FlexBox,
     indicator_root: Rc<RefCell<FlexBox>>,
-    label_node: TextCore,
+    label_node: TextNode,
     gap_node: FlexBox,
     label_host: FlexBox,
     hovered_state: Rc<Cell<bool>>,
@@ -41,6 +41,7 @@ pub(crate) struct PressableLabeledControl {
     label_text_color_override: Rc<Cell<Option<u32>>>,
     colors_value: Rc<Cell<Option<LabeledControlColors>>>,
     activation: Rc<RefCell<Option<ActivationCallback>>>,
+    click: Rc<RefCell<Option<ClickCallback>>>,
     state_changed: Rc<RefCell<Option<StateCallback>>>,
     key_handler: Rc<RefCell<Option<KeyCallback>>>,
 }
@@ -49,7 +50,7 @@ impl PressableLabeledControl {
     pub fn new(role: SemanticRole, label: impl Into<String>, indicator_root: FlexBox) -> Self {
         let label = label.into();
         let root = flex_box();
-        let label_node = TextCore::new(&label);
+        let label_node = TextNode::new_core(&label);
         let gap_node = flex_box();
         let label_host = flex_box();
         label_host.child(&label_node);
@@ -82,6 +83,7 @@ impl PressableLabeledControl {
             label_text_color_override: Rc::new(Cell::new(None)),
             colors_value: Rc::new(Cell::new(None)),
             activation: Rc::new(RefCell::new(None)),
+            click: Rc::new(RefCell::new(None)),
             state_changed: Rc::new(RefCell::new(None)),
             key_handler: Rc::new(RefCell::new(None)),
         };
@@ -114,6 +116,7 @@ impl PressableLabeledControl {
             label_text_color_override: self.label_text_color_override.clone(),
             colors_value: self.colors_value.clone(),
             activation: self.activation.clone(),
+            click: self.click.clone(),
             state_changed: self.state_changed.clone(),
             key_handler: self.key_handler.clone(),
         }
@@ -133,6 +136,10 @@ impl PressableLabeledControl {
         *self.activation.borrow_mut() = Some(Rc::new(callback));
     }
 
+    pub(crate) fn on_click(&self, callback: impl Fn(ClickEventArgs) + 'static) {
+        *self.click.borrow_mut() = Some(Rc::new(callback));
+    }
+
     pub(crate) fn set_state_changed(
         &self,
         callback: impl Fn(PressableLabeledControlState) + 'static,
@@ -298,6 +305,7 @@ impl PressableLabeledControl {
             label_text_color_override: self.label_text_color_override.clone(),
             colors_value: self.colors_value.clone(),
             activation: self.activation.clone(),
+            click: self.click.clone(),
             state_changed: self.state_changed.clone(),
             key_handler: self.key_handler.clone(),
         }
@@ -329,7 +337,7 @@ impl PressableLabeledControl {
 pub(crate) struct WeakPressableLabeledControl {
     root: WeakFlexBox,
     indicator_root: Rc<RefCell<FlexBox>>,
-    label_node: TextCore,
+    label_node: TextNode,
     gap_node: FlexBox,
     label_host: FlexBox,
     hovered_state: Rc<Cell<bool>>,
@@ -343,6 +351,7 @@ pub(crate) struct WeakPressableLabeledControl {
     label_text_color_override: Rc<Cell<Option<u32>>>,
     colors_value: Rc<Cell<Option<LabeledControlColors>>>,
     activation: Rc<RefCell<Option<ActivationCallback>>>,
+    click: Rc<RefCell<Option<ClickCallback>>>,
     state_changed: Rc<RefCell<Option<StateCallback>>>,
     key_handler: Rc<RefCell<Option<KeyCallback>>>,
 }
@@ -366,6 +375,7 @@ impl WeakPressableLabeledControl {
             label_text_color_override: self.label_text_color_override.clone(),
             colors_value: self.colors_value.clone(),
             activation: self.activation.clone(),
+            click: self.click.clone(),
             state_changed: self.state_changed.clone(),
             key_handler: self.key_handler.clone(),
         })
@@ -375,7 +385,7 @@ impl WeakPressableLabeledControl {
 #[allow(clippy::too_many_arguments)]
 fn sync_base_theme_parts(
     root: &FlexBox,
-    label_node: &TextCore,
+    label_node: &TextNode,
     gap_node: &FlexBox,
     label_font_size_override: f32,
     label_font_family_override: Option<crate::FontFamily>,
@@ -435,7 +445,7 @@ fn is_space_key(event: &KeyEventArgs) -> bool {
 #[derive(Clone)]
 struct PressableLabeledControlEventTarget {
     weak_root: WeakFlexBox,
-    label_node: TextCore,
+    label_node: TextNode,
     gap_node: FlexBox,
     hovered_state: Rc<Cell<bool>>,
     pressed_state: Rc<Cell<bool>>,
@@ -448,6 +458,7 @@ struct PressableLabeledControlEventTarget {
     label_text_color_override: Rc<Cell<Option<u32>>>,
     colors_value: Rc<Cell<Option<LabeledControlColors>>>,
     activation: Rc<RefCell<Option<ActivationCallback>>>,
+    click: Rc<RefCell<Option<ClickCallback>>>,
     state_changed: Rc<RefCell<Option<StateCallback>>>,
     key_handler: Rc<RefCell<Option<KeyCallback>>>,
 }
@@ -489,6 +500,9 @@ impl PressableLabeledControlEventTarget {
         if let Some(callback) = self.activation.borrow().clone() {
             callback(self.snapshot_state());
         }
+        if let Some(callback) = self.click.borrow().clone() {
+            callback(ClickEventArgs);
+        }
     }
 
     fn clear_pointer_state(&self) {

package/src/controls/internal/selectable_popup_list.rs

@@ -7,8 +7,8 @@ use crate::controls::{DropdownColors, DropdownSizing};
 use crate::ffi::{CursorStyle, FlexDirection, HandleValue, PositionType, SemanticRole, Unit};
 use crate::logger;
 use crate::node::{
-    flex_box, portal, scroll_box, FlexBox, FlexBoxSurface, Node, NodeHandle, ScrollBarVisibility,
-    ScrollBox,
+    flex_box, portal, scroll_box, ChildContainerSurface, FlexBox, LayoutSurface, Node, NodeHandle,
+    ScrollBarVisibility, ScrollBox,
 };
 use crate::popup_presenter::PopupPresenter;
 use crate::theme::current_theme;