Simplify AccessibilityNode creation.

bevyengine · Nov 4, 2024 · 3bad1ec · 3bad1ec
1 parent f8f330e
commit 3bad1ec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/crates/bevy_a11y/src/lib.rs b/crates/bevy_a11y/src/lib.rs
@@ -86,6 +86,13 @@ impl ManageAccessibilityUpdates {
 #[derive(Component, Clone, Deref, DerefMut)]
 pub struct AccessibilityNode(pub Node);
 
+impl AccessibilityNode {
+    /// Creates a new `AccessibilityNode` with the given role.
+    pub fn new(role: accesskit::Role) -> Self {
+        Self(Node::new(role))
+    }
+}
+
 impl From<Node> for AccessibilityNode {
     fn from(node: Node) -> Self {
         Self(node)

diff --git a/examples/ui/scroll.rs b/examples/ui/scroll.rs
@@ -1,10 +1,7 @@
 //! This example illustrates scrolling in Bevy UI.
 
 use bevy::{
-    a11y::{
-        accesskit::{Node as Accessible, Role},
-        AccessibilityNode,
-    },
+    a11y::{accesskit::Role, AccessibilityNode},
     input::mouse::{MouseScrollUnit, MouseWheel},
     picking::focus::HoverMap,
     prelude::*,
@@ -79,7 +76,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                             ..default()
                                         },
                                     Label,
-                                    AccessibilityNode(Accessible::new(Role::ListItem)),
+                                    AccessibilityNode::new(Role::ListItem),
                                 ))
                                 .insert(Node {
                                     min_width: Val::Px(200.),
@@ -167,9 +164,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                                             ..default()
                                                         },
                                                         Label,
-                                                        AccessibilityNode(Accessible::new(
-                                                            Role::ListItem,
-                                                        )),
+                                                        AccessibilityNode::new(Role::ListItem),
                                                     ))
                                                     .insert(PickingBehavior {
                                                         should_block_lower: false,
@@ -234,9 +229,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                                                 ..default()
                                                             },
                                                             Label,
-                                                            AccessibilityNode(Accessible::new(
-                                                                Role::ListItem,
-                                                            )),
+                                                            AccessibilityNode::new(Role::ListItem),
                                                         ))
                                                         .insert(PickingBehavior {
                                                             should_block_lower: false,
@@ -310,9 +303,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                                                 ..default()
                                                             },
                                                             Label,
-                                                            AccessibilityNode(Accessible::new(
-                                                                Role::ListItem,
-                                                            )),
+                                                            AccessibilityNode::new(Role::ListItem),
                                                         ))
                                                         .insert(PickingBehavior {
                                                             should_block_lower: false,

diff --git a/examples/ui/ui.rs b/examples/ui/ui.rs
@@ -3,10 +3,7 @@
 use std::f32::consts::PI;
 
 use bevy::{
-    a11y::{
-        accesskit::{Node as Accessible, Role},
-        AccessibilityNode,
-    },
+    a11y::{accesskit::Role, AccessibilityNode},
     color::palettes::{basic::LIME, css::DARK_GRAY},
     input::mouse::{MouseScrollUnit, MouseWheel},
     picking::focus::HoverMap,
@@ -149,7 +146,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                             ..default()
                                         },
                                         Label,
-                                        AccessibilityNode(Accessible::new(Role::ListItem)),
+                                        AccessibilityNode::new(Role::ListItem),
                                     ))
                                     .insert(PickingBehavior {
                                         should_block_lower: false,