From 9cba92f57f5686f5295cb3430a3787aa3694a1fc Mon Sep 17 00:00:00 2001
From: Andrew Baldwin <andrew@boldfriend.org>
Date: Mon, 17 Feb 2025 11:15:36 -0800
Subject: Add `is_focused` function that produces an `Operation` to get the
 focused state of a `focusable` by ID. Add `is_focused` function that produces
 a `Task` to get the focused state of a `text_input` by ID.

---
 core/src/widget/operation/focusable.rs | 45 ++++++++++++++++++++++++++++++++++
 widget/src/text_input.rs               |  5 ++++
 2 files changed, 50 insertions(+)

diff --git a/core/src/widget/operation/focusable.rs b/core/src/widget/operation/focusable.rs
index 1ee41244..49c574c4 100644
--- a/core/src/widget/operation/focusable.rs
+++ b/core/src/widget/operation/focusable.rs
@@ -257,3 +257,48 @@ pub fn find_focused() -> impl Operation<Id> {
 
     FindFocused { focused: None }
 }
+
+/// Produces an [`Operation`] that searches for the focusable widget
+/// and stores whether it is focused or not. This ignores widgets that
+/// do not have an ID.
+pub fn is_focused(target: Id) -> impl Operation<bool> {
+    struct IsFocused {
+        target: Id,
+        is_focused: Option<bool>,
+    }
+
+    impl Operation<bool> for IsFocused {
+        fn focusable(
+            &mut self,
+            id: Option<&Id>,
+            _bounds: Rectangle,
+            state: &mut dyn Focusable,
+        ) {
+            if id.is_some_and(|id| *id == self.target) {
+                self.is_focused = Some(state.is_focused());
+            }
+        }
+
+        fn container(
+            &mut self,
+            _id: Option<&Id>,
+            _bounds: Rectangle,
+            operate_on_children: &mut dyn FnMut(&mut dyn Operation<bool>),
+        ) {
+            operate_on_children(self);
+        }
+
+        fn finish(&self) -> Outcome<bool> {
+            if let Some(is_focused) = &self.is_focused {
+                Outcome::Some(*is_focused)
+            } else {
+                Outcome::None
+            }
+        }
+    }
+
+    IsFocused {
+        target,
+        is_focused: None,
+    }
+}
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index 697d0d64..a90afd90 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -1481,6 +1481,11 @@ impl From<String> for Id {
     }
 }
 
+/// Produces a [`Task`] that returns whether the [`TextInput`] with the given [`Id`] is focused or not.
+pub fn is_focused(id: impl Into<Id>) -> Task<bool> {
+    task::widget(operation::focusable::is_focused(id.into().into()))
+}
+
 /// Produces a [`Task`] that focuses the [`TextInput`] with the given [`Id`].
 pub fn focus<T>(id: impl Into<Id>) -> Task<T> {
     task::effect(Action::widget(operation::focusable::focus(id.into().0)))
-- 
cgit 


From 7916a9c2272a3d6d89e7545b33e2991657ad5990 Mon Sep 17 00:00:00 2001
From: Andrew Baldwin <andrew@boldfriend.org>
Date: Fri, 21 Feb 2025 20:39:59 -0800
Subject: Nit fixes.

---
 core/src/widget/operation/focusable.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/widget/operation/focusable.rs b/core/src/widget/operation/focusable.rs
index 49c574c4..44c9d647 100644
--- a/core/src/widget/operation/focusable.rs
+++ b/core/src/widget/operation/focusable.rs
@@ -285,15 +285,15 @@ pub fn is_focused(target: Id) -> impl Operation<bool> {
             _bounds: Rectangle,
             operate_on_children: &mut dyn FnMut(&mut dyn Operation<bool>),
         ) {
+            if self.is_focused.is_some() {
+                return;
+            }
+
             operate_on_children(self);
         }
 
         fn finish(&self) -> Outcome<bool> {
-            if let Some(is_focused) = &self.is_focused {
-                Outcome::Some(*is_focused)
-            } else {
-                Outcome::None
-            }
+            self.is_focused.map_or(Outcome::None, Outcome::Some)
         }
     }
 
-- 
cgit