fix: Use collateral event to check if event is allowed (#890)

* fix: Consder pointer and mouse up for pressed nodes

* fixes

* fixes

crates/components/src/button.rs

@@ -228,14 +228,22 @@ mod test {
 
         assert_eq!(label.get(0).text(), Some("true"));
 
+        utils.push_event(PlatformEvent::Touch {
+            name: EventName::TouchStart,
+            location: (15.0, 15.0).into(),
+            finger_id: 1,
+            phase: TouchPhase::Started,
+            force: None,
+        });
+        utils.wait_for_update().await;
+
         utils.push_event(PlatformEvent::Touch {
             name: EventName::TouchEnd,
             location: (15.0, 15.0).into(),
             finger_id: 1,
             phase: TouchPhase::Ended,
             force: None,
         });
-
         utils.wait_for_update().await;
 
         assert_eq!(label.get(0).text(), Some("false"));

crates/components/src/native_router.rs

@@ -119,7 +119,7 @@ mod test {
         assert_eq!(utils.root().get(0).get(1).get(0).text(), Some("B"));
 
         utils.push_event(PlatformEvent::Mouse {
-            name: EventName::PointerUp,
+            name: EventName::MouseUp,
             cursor: (5.0, 5.0).into(),
             button: Some(MouseButton::Back),
         });
@@ -128,7 +128,7 @@ mod test {
         assert_eq!(utils.root().get(0).get(1).get(0).text(), Some("A"));
 
         utils.push_event(PlatformEvent::Mouse {
-            name: EventName::PointerUp,
+            name: EventName::MouseUp,
             cursor: (5.0, 5.0).into(),
             button: Some(MouseButton::Forward),
         });

crates/core/src/events/events_measurer.rs

@@ -252,7 +252,7 @@ fn measure_dom_events(
                         true
                     };
 
-                    let allowed_event = nodes_state.is_event_allowed(event, node_id);
+                    let allowed_event = nodes_state.is_event_allowed(collateral_event, node_id);
 
                     if valid_node && allowed_event {
                         let mut valid_event = event.clone();

crates/core/src/events/nodes_state.rs

@@ -15,7 +15,7 @@ use crate::{
     },
 };
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 struct NodeMetadata {
     layer: Option<i16>,
 }
@@ -30,8 +30,8 @@ pub struct NodesState {
 impl NodesState {
     /// Given the current state, event, and NodeID check if it is allowed to be emitted
     /// For example, it will not make sense to emit a Click event on an element that was not pressed before.
-    pub fn is_event_allowed(&self, event: &PlatformEvent, node_id: &NodeId) -> bool {
-        if event.get_name().is_click() {
+    pub fn is_event_allowed(&self, event_name: EventName, node_id: &NodeId) -> bool {
+        if event_name.is_pressed() {
             self.pressed_nodes.contains_key(node_id)
         } else {
             true
@@ -116,9 +116,9 @@ impl NodesState {
                 layer,
             } in events
             {
-                match event {
+                match event.get_name() {
                     // Update hovered nodes state
-                    PlatformEvent::Mouse { name, .. } if name.can_change_hover_state() => {
+                    name if name.can_change_hover_state() => {
                         let is_hovered = hovered_nodes.contains_key(node_id);
 
                         // Mark the Node as hovered if it wasn't already
@@ -139,7 +139,7 @@ impl NodesState {
                     }
 
                     // Update pressed nodes state
-                    PlatformEvent::Mouse { name, .. } if name.can_change_press_state() => {
+                    name if name.can_change_press_state() => {
                         let is_pressed = pressed_nodes.contains_key(node_id);
 
                         // Mark the Node as pressed if it wasn't already

crates/native-core/src/events.rs

@@ -240,19 +240,25 @@ impl EventName {
 
     /// Check if this event can change the press state of a Node.
     pub fn can_change_press_state(&self) -> bool {
-        matches!(self, Self::MouseDown | Self::PointerDown)
+        matches!(self, Self::MouseDown | Self::TouchStart | Self::PointerDown)
     }
 
     /// Check if the event means the cursor started or released a click
     pub fn was_cursor_pressed_or_released(&self) -> bool {
         matches!(
             &self,
-            Self::MouseDown | Self::PointerDown | Self::MouseUp | Self::Click | Self::PointerUp
+            Self::MouseDown
+                | Self::PointerDown
+                | Self::MouseUp
+                | Self::Click
+                | Self::PointerUp
+                | Self::TouchStart
+                | Self::TouchEnd
         )
     }
 
-    /// Check if the event was a click
-    pub fn is_click(&self) -> bool {
+    /// Check if the event was pressed
+    pub fn is_pressed(&self) -> bool {
         matches!(&self, Self::Click)
     }
 }