feat: Expose tabs in consumer and atspi-common

Author: DataTriny

consumer/src/node.rs

@@ -407,6 +407,8 @@ impl<'a> Node<'a> {
         self.data().orientation().or_else(|| {
             if self.role() == Role::ListBox {
                 Some(Orientation::Vertical)
+            } else if self.role() == Role::TabList {
+                Some(Orientation::Horizontal)
             } else {
                 None
             }
@@ -691,6 +693,16 @@ impl<'a> Node<'a> {
         )
     }
 
+    pub fn controls(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = Node<'a>> + FusedIterator<Item = Node<'a>> + 'a {
+        let state = self.tree_state;
+        let data = &self.state.data;
+        data.controls()
+            .iter()
+            .map(move |id| state.node_by_id(*id).unwrap())
+    }
+
     pub fn raw_text_selection(&self) -> Option<&TextSelection> {
         self.data().text_selection()
     }

platforms/atspi-common/src/lib.rs

@@ -17,7 +17,7 @@ pub mod simplified;
 mod util;
 
 pub use atspi_common::{
-    CoordType, Granularity, InterfaceSet, Layer, Role, ScrollType, State, StateSet,
+    CoordType, Granularity, InterfaceSet, Layer, RelationType, Role, ScrollType, State, StateSet,
 };
 
 pub use action::*;

platforms/atspi-common/src/node.rs

@@ -14,8 +14,8 @@ use accesskit::{
 };
 use accesskit_consumer::{FilterResult, Node, TreeState};
 use atspi_common::{
-    CoordType, Granularity, Interface, InterfaceSet, Layer, Politeness, Role as AtspiRole,
-    ScrollType, State, StateSet,
+    CoordType, Granularity, Interface, InterfaceSet, Layer, Politeness, RelationType,
+    Role as AtspiRole, ScrollType, State, StateSet,
 };
 use std::{
     collections::HashMap,
@@ -829,6 +829,25 @@ impl PlatformNode {
         })
     }
 
+    pub fn relation_set<T>(
+        &self,
+        f: impl Fn(NodeId) -> T,
+    ) -> Result<HashMap<RelationType, Vec<T>>> {
+        self.resolve(|node| {
+            let mut relations = HashMap::new();
+            let controls: Vec<_> = node
+                .controls()
+                .filter(|controlled| filter(controlled) == FilterResult::Include)
+                .map(|controlled| controlled.id())
+                .map(f)
+                .collect();
+            if !controls.is_empty() {
+                relations.insert(RelationType::ControllerFor, controls);
+            }
+            Ok(relations)
+        })
+    }
+
     pub fn role(&self) -> Result<AtspiRole> {
         self.resolve(|node| {
             let wrapper = NodeWrapper(&node);

platforms/atspi-common/src/simplified.rs

@@ -14,7 +14,9 @@ use crate::{
     WindowEvent,
 };
 
-pub use crate::{CoordType, Error, Granularity, Layer, Rect, Result, Role, ScrollType, StateSet};
+pub use crate::{
+    CoordType, Error, Granularity, Layer, Rect, RelationType, Result, Role, ScrollType, StateSet,
+};
 
 #[derive(Clone, Hash, PartialEq)]
 pub enum Accessible {
@@ -117,6 +119,13 @@ impl Accessible {
         }
     }
 
+    pub fn relation_set(&self) -> Result<HashMap<RelationType, Vec<Self>>> {
+        match self {
+            Self::Node(node) => node.relation_set(|id| Self::Node(node.relative(id))),
+            Self::Root(_) => Ok(HashMap::new()),
+        }
+    }
+
     pub fn application(&self) -> Result<Self> {
         match self {
             Self::Node(node) => node.root().map(Self::Root),

platforms/macos/src/node.rs

@@ -324,6 +324,9 @@ impl NodeWrapper<'_> {
         if let Some(toggled) = self.0.toggled() {
             return Some(Value::Bool(toggled != Toggled::False));
         }
+        if self.0.role() == Role::Tab {
+            return Some(Value::Bool(self.0.is_selected().unwrap_or(false)));
+        }
         if let Some(value) = self.0.value() {
             return Some(Value::String(value));
         }