-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Connect the hot-reloading crate * Apply template updates from the hot-reload CLI * Run cargo fmt * Make hot-reload a non-default feature * Fix panic on root node and clean up * Import accesskit * Pipe accesskit events to View * Build example accesskit tree * Add Document::visit method and build initial accesskit tree from View * Create mapping from accesskit id to node id * Send basic tree updates on dom change * Clean up and map ids to node ids * Rebuild tree until observability is figured out * Clean up * Fix tree hierarchy * Create AccessibilityState struct and refactor * Handle more accesskit roles * Move accessibility to new module * Rename accesskit feature flag to accessibility * Set element node name instead of html tag * Add labelled_by relationship for text nodes and elements
- Loading branch information
Showing
8 changed files
with
267 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| use dioxus::prelude::*; | ||
|
|
||
| fn main() { | ||
| dioxus_blitz::launch(app); | ||
| } | ||
|
|
||
| fn app() -> Element { | ||
| rsx! { | ||
| body { | ||
| App {} | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[component] | ||
| fn App() -> Element { | ||
| rsx! { | ||
| div { "Dioxus for all" } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| use crate::waker::UserEvent; | ||
| use accesskit::{NodeBuilder, NodeId, Role, Tree, TreeUpdate}; | ||
| use blitz_dom::{local_name, Document, Node}; | ||
| use winit::{event_loop::EventLoopProxy, window::Window}; | ||
|
|
||
| /// State of the accessibility node tree and platform adapter. | ||
| pub struct AccessibilityState { | ||
| /// Adapter to connect to the [`EventLoop`](`winit::event_loop::EventLoop`). | ||
| adapter: accesskit_winit::Adapter, | ||
|
|
||
| /// Next ID to assign an an [`accesskit::Node`]. | ||
| next_id: u64, | ||
| } | ||
|
|
||
| impl AccessibilityState { | ||
| pub fn new(window: &Window, proxy: EventLoopProxy<UserEvent>) -> Self { | ||
| Self { | ||
| adapter: accesskit_winit::Adapter::with_event_loop_proxy(window, proxy.clone()), | ||
| next_id: 1, | ||
| } | ||
| } | ||
| pub fn build_tree(&mut self, doc: &Document) { | ||
| let mut nodes = std::collections::HashMap::new(); | ||
| let mut window = NodeBuilder::new(Role::Window); | ||
|
|
||
| doc.visit(|node_id, node| { | ||
| let parent = node | ||
| .parent | ||
| .and_then(|parent_id| nodes.get_mut(&parent_id)) | ||
| .map(|(_, parent)| parent) | ||
| .unwrap_or(&mut window); | ||
| let (id, node_builder) = self.build_node(node, parent); | ||
|
|
||
| nodes.insert(node_id, (id, node_builder)); | ||
| }); | ||
|
|
||
| let mut nodes: Vec<_> = nodes | ||
| .into_iter() | ||
| .map(|(_, (id, node))| (id, node.build())) | ||
| .collect(); | ||
| nodes.push((NodeId(0), window.build())); | ||
|
|
||
| let tree = Tree::new(NodeId(0)); | ||
| let tree_update = TreeUpdate { | ||
| nodes, | ||
| tree: Some(tree), | ||
| focus: NodeId(0), | ||
| }; | ||
|
|
||
| self.adapter.update_if_active(|| tree_update) | ||
| } | ||
|
|
||
| fn build_node(&mut self, node: &Node, parent: &mut NodeBuilder) -> (NodeId, NodeBuilder) { | ||
| let mut node_builder = NodeBuilder::default(); | ||
|
|
||
| let id = NodeId(self.next_id); | ||
| self.next_id += 1; | ||
|
|
||
| if let Some(element_data) = node.element_data() { | ||
| let name = element_data.name.local.to_string(); | ||
|
|
||
| // TODO match more roles | ||
| let role = match &*name { | ||
| "button" => Role::Button, | ||
| "div" => Role::GenericContainer, | ||
| "header" => Role::Header, | ||
| "h1" | "h2" | "h3" | "h4" | "h5" | "h6" => Role::Heading, | ||
| "p" => Role::Paragraph, | ||
| "section" => Role::Section, | ||
| "input" => { | ||
| let ty = element_data.attr(local_name!("type")).unwrap_or("text"); | ||
| match ty { | ||
| "number" => Role::NumberInput, | ||
| _ => Role::TextInput, | ||
| } | ||
| } | ||
| _ => Role::Unknown, | ||
| }; | ||
|
|
||
| node_builder.set_role(role); | ||
| node_builder.set_html_tag(name); | ||
| } else if node.is_text_node() { | ||
| node_builder.set_role(Role::StaticText); | ||
| node_builder.set_name(node.text_content()); | ||
| parent.push_labelled_by(id) | ||
| } | ||
|
|
||
| parent.push_child(id); | ||
|
|
||
| (id, node_builder) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.