feat: propagate implementation of cancel event

Author: d-corler

packages/core-types/src/bubbles.rs

@@ -10,6 +10,7 @@
 /// in their definition, which gets passed as part of the mutations.
 pub fn event_bubbles(evt: &str) -> bool {
     match evt {
+        "cancel" => false,
         "copy" => true,
         "cut" => true,
         "paste" => true,

packages/depinfo/src/lib.rs

@@ -342,6 +342,7 @@ mod tests {
             "/dioxus/packages/html/src/attribute_groups.rs",
             "/dioxus/packages/html/src/elements.rs",
             "/dioxus/packages/html/src/events/animation.rs",
+            "/dioxus/packages/html/src/events/cancel.rs",
             "/dioxus/packages/html/src/events/clipboard.rs",
             "/dioxus/packages/html/src/events/composition.rs",
             "/dioxus/packages/html/src/events/drag.rs",

packages/desktop/src/events.rs

@@ -17,6 +17,14 @@ impl HtmlEventConverter for SerializedHtmlEventConverter {
             .into()
     }
 
+    fn convert_cancel_data(&self, event: &PlatformEventData) -> CancelData {
+        event
+            .downcast::<SerializedCancelData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
     fn convert_clipboard_data(&self, event: &PlatformEventData) -> ClipboardData {
         event
             .downcast::<SerializedClipboardData>()

packages/html/src/events/cancel.rs

@@ -83,6 +83,6 @@ pub trait HasCancelData: std::any::Any {
 impl_event! {
     CancelData;
 
-    /// onCancel
+    /// oncancel
     oncancel
 }

packages/html/src/transit.rs

@@ -65,6 +65,9 @@ fn deserialize_raw(name: &str, data: &serde_json::Value) -> Result<EventData, se
     }
 
     let data = match name {
+        // Cancel
+        "cancel" => Cancel(de(data)?),
+
         // Mouse
         "click" | "contextmenu" | "dblclick" | "doubleclick" | "mousedown" | "mouseenter"
         | "mouseleave" | "mousemove" | "mouseout" | "mouseover" | "mouseup" => Mouse(de(data)?),
@@ -154,6 +157,7 @@ impl HtmlEvent {
 #[serde(untagged)]
 #[non_exhaustive]
 pub enum EventData {
+    Cancel(SerializedCancelData),
     Mouse(SerializedMouseData),
     Clipboard(SerializedClipboardData),
     Composition(SerializedCompositionData),
@@ -179,6 +183,9 @@ pub enum EventData {
 impl EventData {
     pub fn into_any(self) -> Rc<dyn Any> {
         match self {
+            EventData::Cancel(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
             EventData::Mouse(data) => {
                 Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
             }
@@ -291,6 +298,14 @@ impl HtmlEventConverter for SerializedHtmlEventConverter {
             .into()
     }
 
+    fn convert_cancel_data(&self, event: &PlatformEventData) -> CancelData {
+        event
+            .downcast::<SerializedCancelData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
     fn convert_clipboard_data(&self, event: &PlatformEventData) -> ClipboardData {
         event
             .downcast::<SerializedClipboardData>()

packages/liveview/src/events.rs

@@ -15,6 +15,14 @@ impl HtmlEventConverter for SerializedHtmlEventConverter {
             .into()
     }
 
+    fn convert_cancel_data(&self, event: &PlatformEventData) -> CancelData {
+        event
+            .downcast::<SerializedCancelData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
     fn convert_clipboard_data(&self, event: &PlatformEventData) -> ClipboardData {
         event
             .downcast::<SerializedClipboardData>()

packages/native-dom/src/events.rs

@@ -5,11 +5,11 @@ use dioxus_html::{
     point_interaction::{
         InteractionElementOffset, InteractionLocation, ModifiersInteraction, PointerInteraction,
     },
-    AnimationData, ClipboardData, CompositionData, DragData, FocusData, FormData, FormValue,
-    HasFileData, HasFocusData, HasFormData, HasKeyboardData, HasMouseData, HtmlEventConverter,
-    ImageData, KeyboardData, MediaData, MountedData, MouseData, PlatformEventData, PointerData,
-    ResizeData, ScrollData, SelectionData, ToggleData, TouchData, TransitionData, VisibleData,
-    WheelData,
+    AnimationData, CancelData, ClipboardData, CompositionData, DragData, FocusData, FormData,
+    FormValue, HasFileData, HasFocusData, HasFormData, HasKeyboardData, HasMouseData,
+    HtmlEventConverter, ImageData, KeyboardData, MediaData, MountedData, MouseData,
+    PlatformEventData, PointerData, ResizeData, ScrollData, SelectionData, ToggleData, TouchData,
+    TransitionData, VisibleData, WheelData,
 };
 use keyboard_types::{Code, Key, Location, Modifiers};
 use std::any::Any;
@@ -18,6 +18,10 @@ use std::collections::HashMap;
 pub struct NativeConverter {}
 
 impl HtmlEventConverter for NativeConverter {
+    fn convert_cancel_data(&self, _event: &PlatformEventData) -> CancelData {
+        todo!("todo: convert_cancel_data in dioxus-native. requires support in blitz")
+    }
+
     fn convert_form_data(&self, event: &PlatformEventData) -> FormData {
         event.downcast::<NativeFormData>().unwrap().clone().into()
     }