@effindomv2/fui-rs 0.1.22 → 0.1.23

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fui-rs"
-version = "0.1.22"
+version = "0.1.23"
 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.22",
+  "version": "0.1.23",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 Rust frontend framework SDK and host generators",

package/src/node/core.rs

@@ -1808,6 +1808,17 @@ pub trait Node: Clone {
         self
     }
 
+    fn focus_now(&self) -> &Self
+    where
+        Self: Sized,
+    {
+        let handle = self.node_ref().handle();
+        if handle != NodeHandle::INVALID {
+            ui::request_focus(handle.raw());
+        }
+        self
+    }
+
     fn on_key_down(&self, handler: impl Fn(&mut KeyEventArgs) + 'static) -> &Self
     where
         Self: Sized,

package/src/node/custom_drawable.rs

@@ -121,6 +121,8 @@ impl ThemeBindable for CustomDrawable {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::app::Application;
+    use crate::ffi::{self, Call};
 
     fn assert_flex_box_surface<T: FlexBoxSurface>() {}
     fn assert_theme_bindable<T: ThemeBindable>() {}
@@ -145,4 +147,22 @@ mod tests {
         drop(drawable);
         invalidator.mark_dirty();
     }
+
+    #[test]
+    fn custom_drawable_requests_focus_through_node_trait() {
+        ffi::test::reset();
+        let drawable = CustomDrawable::new(|_| {});
+        drawable.focusable(true, 0);
+        Application::mount(drawable.clone());
+        let handle = drawable.handle().raw();
+        ffi::test::take_calls();
+
+        drawable.focus_now();
+
+        let calls = ffi::test::take_calls();
+        assert!(calls.iter().any(
+            |call| matches!(call, Call::RequestFocus { handle: requested } if *requested == handle)
+        ));
+        Application::unmount();
+    }
 }