Implement keydown, keyup, keypress, and input events

DioxusLabs · Oct 7, 2024 · af149a9 · af149a9
1 parent 537b7b2
commit af149a9
Show file tree

Hide file tree

Showing 8 changed files with 816 additions and 86 deletions.
diff --git a/packages/blitz-dom/src/document.rs b/packages/blitz-dom/src/document.rs
@@ -63,9 +63,8 @@ pub trait DocumentLike: AsRef<Document> + AsMut<Document> + Into<Document> + 'st
         false
     }
 
-    fn handle_event(&mut self, _event: RendererEvent) -> bool {
+    fn handle_event(&mut self, _event: RendererEvent) {
         // Default implementation does nothing
-        false
     }
 
     fn as_any_mut(&mut self) -> &mut dyn Any {
@@ -125,8 +124,10 @@ pub struct Document {
 }
 
 impl DocumentLike for Document {
-    fn handle_event(&mut self, event: RendererEvent) -> bool {
-        // let node_id = event.target;
+    fn handle_event(&mut self, event: RendererEvent) {
+        let target_node_id = event.target;
+
+        let event = dbg!(event);
 
         match event.data {
             EventData::Click { x, y, mods } => {
@@ -140,12 +141,12 @@ impl DocumentLike for Document {
                         y: node.final_layout.padding.top + node.final_layout.border.top,
                     };
                     let Some(el) = node.raw_dom_data.downcast_element_mut() else {
-                        return true;
+                        return;
                     };
 
                     let disabled = el.attr(local_name!("disabled")).is_some();
                     if disabled {
-                        return true;
+                        return;
                     }
 
                     if let NodeSpecificData::TextInput(ref mut text_input_data) =
@@ -185,6 +186,10 @@ impl DocumentLike for Document {
             }
             EventData::KeyPress { event, mods } => {
                 if let Some(node_id) = self.focus_node_id {
+                    if target_node_id != node_id {
+                        return;
+                    }
+
                     let node = &mut self.nodes[node_id];
                     let text_input_data = node
                         .raw_dom_data
@@ -213,8 +218,6 @@ impl DocumentLike for Document {
             }
             EventData::Hover => {}
         }
-
-        true
     }
 }
 

diff --git a/packages/blitz-dom/src/events.rs b/packages/blitz-dom/src/events.rs
@@ -4,7 +4,7 @@ pub struct EventListener {
     pub name: String,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct RendererEvent {
     pub target: usize,
     pub data: EventData,
@@ -17,7 +17,7 @@ impl RendererEvent {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum EventData {
     Click { x: f32, y: f32, mods: Modifiers },
     KeyPress { event: KeyEvent, mods: Modifiers },

diff --git a/packages/blitz-dom/src/html_document.rs b/packages/blitz-dom/src/html_document.rs
@@ -27,8 +27,8 @@ impl From<HtmlDocument> for Document {
     }
 }
 impl DocumentLike for HtmlDocument {
-    fn handle_event(&mut self, event: RendererEvent) -> bool {
-        self.inner.as_mut().handle_event(event)
+    fn handle_event(&mut self, event: RendererEvent) {
+        self.inner.as_mut().handle_event(event);
     }
 }
 

diff --git a/packages/dioxus-blitz/Cargo.toml b/packages/dioxus-blitz/Cargo.toml
@@ -31,6 +31,7 @@ tracing = { workspace = true, optional = true }
 url = { version = "2.5.0", features = ["serde"] }
 ureq = "2.9"
 rustc-hash = "1.1.0"
+keyboard-types = "0.7"
 
 [target.'cfg(target_os = "android")'.dependencies]
 android-activity = { version = "0.6.0", features = ["native-activity"] }