fix: Node::is_focusable always returns true if the node is focused (#…

…451)
AccessKit · Sep 14, 2024 · d286883 · d286883
1 parent 7143b2b
commit d286883
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/consumer/src/node.rs b/consumer/src/node.rs
@@ -47,8 +47,12 @@ impl<'a> Node<'a> {
         self.tree_state.focus_id() == Some(self.id())
     }
 
+    pub fn is_focused_in_tree(&self) -> bool {
+        self.tree_state.focus == self.id()
+    }
+
     pub fn is_focusable(&self) -> bool {
-        self.supports_action(Action::Focus)
+        self.supports_action(Action::Focus) || self.is_focused_in_tree()
     }
 
     pub fn is_root(&self) -> bool {

diff --git a/consumer/src/tree.rs b/consumer/src/tree.rs
@@ -16,7 +16,7 @@ use crate::node::{Node, NodeState, ParentAndIndex};
 pub struct State {
     pub(crate) nodes: ChunkMap<NodeId, NodeState>,
     pub(crate) data: TreeData,
-    focus: NodeId,
+    pub(crate) focus: NodeId,
     is_host_focused: bool,
 }