chore: iron out all events

packages/html/src/events.rs

@@ -24,53 +24,126 @@ macro_rules! impl_event {
     };
 }
 
-mod mouse;
-pub use mouse::*;
-
 mod animation;
-pub use animation::*;
-
+mod clipboard;
 mod composition;
-pub use composition::*;
-
 mod drag;
-pub use drag::*;
-
 mod focus;
-pub use focus::*;
-
 mod form;
-pub use form::*;
-
 mod image;
-pub use image::*;
-
 mod keyboard;
-pub use keyboard::*;
-
 mod media;
-pub use media::*;
-
+mod mouse;
 mod pointer;
-pub use pointer::*;
-
+mod scroll;
 mod selection;
-pub use selection::*;
-
 mod toggle;
-pub use toggle::*;
-
 mod touch;
-pub use touch::*;
-
 mod transition;
-pub use transition::*;
-
 mod wheel;
+
+pub use animation::*;
+pub use clipboard::*;
+pub use composition::*;
+pub use drag::*;
+pub use focus::*;
+pub use form::*;
+pub use image::*;
+pub use keyboard::*;
+pub use media::*;
+pub use mouse::*;
+pub use pointer::*;
+pub use scroll::*;
+pub use selection::*;
+pub use toggle::*;
+pub use touch::*;
+pub use transition::*;
 pub use wheel::*;
 
-mod clipboard;
-pub use clipboard::*;
-
-mod scroll;
-pub use scroll::*;
+// pub fn event_bubbles(evt: &str) -> bool {
+//     match evt {
+//         "copy" => true,
+//         "cut" => true,
+//         "paste" => true,
+//         "compositionend" => true,
+//         "compositionstart" => true,
+//         "compositionupdate" => true,
+//         "keydown" => true,
+//         "keypress" => true,
+//         "keyup" => true,
+//         "focus" => false,
+//         "focusout" => true,
+//         "focusin" => true,
+//         "blur" => false,
+//         "change" => true,
+//         "input" => true,
+//         "invalid" => true,
+//         "reset" => true,
+//         "submit" => true,
+//         "click" => true,
+//         "contextmenu" => true,
+//         "doubleclick" => true,
+//         "dblclick" => true,
+//         "drag" => true,
+//         "dragend" => true,
+//         "dragenter" => false,
+//         "dragexit" => false,
+//         "dragleave" => true,
+//         "dragover" => true,
+//         "dragstart" => true,
+//         "drop" => true,
+//         "mousedown" => true,
+//         "mouseenter" => false,
+//         "mouseleave" => false,
+//         "mousemove" => true,
+//         "mouseout" => true,
+//         "scroll" => false,
+//         "mouseover" => true,
+//         "mouseup" => true,
+//         "pointerdown" => true,
+//         "pointermove" => true,
+//         "pointerup" => true,
+//         "pointercancel" => true,
+//         "gotpointercapture" => true,
+//         "lostpointercapture" => true,
+//         "pointerenter" => false,
+//         "pointerleave" => false,
+//         "pointerover" => true,
+//         "pointerout" => true,
+//         "select" => true,
+//         "touchcancel" => true,
+//         "touchend" => true,
+//         "touchmove" => true,
+//         "touchstart" => true,
+//         "wheel" => true,
+//         "abort" => false,
+//         "canplay" => false,
+//         "canplaythrough" => false,
+//         "durationchange" => false,
+//         "emptied" => false,
+//         "encrypted" => true,
+//         "ended" => false,
+//         "error" => false,
+//         "loadeddata" => false,
+//         "loadedmetadata" => false,
+//         "loadstart" => false,
+//         "pause" => false,
+//         "play" => false,
+//         "playing" => false,
+//         "progress" => false,
+//         "ratechange" => false,
+//         "seeked" => false,
+//         "seeking" => false,
+//         "stalled" => false,
+//         "suspend" => false,
+//         "timeupdate" => false,
+//         "volumechange" => false,
+//         "waiting" => false,
+//         "animationstart" => true,
+//         "animationend" => true,
+//         "animationiteration" => true,
+//         "transitionend" => true,
+//         "toggle" => true,
+//         _ => panic!("unsupported event type {:?}", evt),
+//     }
+// }

packages/html/src/events/animation.rs

@@ -9,3 +9,16 @@ pub struct AnimationData {
     pub pseudo_element: String,
     pub elapsed_time: f32,
 }
+
+impl_event! [
+    AnimationData;
+
+    /// onanimationstart
+    onanimationstart
+
+    /// onanimationend
+    onanimationend
+
+    /// onanimationiteration
+    onanimationiteration
+];

packages/html/src/events/clipboard.rs

@@ -6,3 +6,16 @@ pub type ClipboardEvent = UiEvent<ClipboardData>;
 pub struct ClipboardData {
     // DOMDataTransfer clipboardData
 }
+
+impl_event![
+    ClipboardData;
+
+    /// oncopy
+    oncopy
+
+    /// oncut
+    oncut
+
+    /// onpaste
+    onpaste
+];

packages/html/src/events/composition.rs

@@ -6,3 +6,16 @@ pub type CompositionEvent = UiEvent<CompositionData>;
 pub struct CompositionData {
     pub data: String,
 }
+
+impl_event! [
+    CompositionData;
+
+    /// oncompositionstart
+    oncompositionstart
+
+    /// oncompositionend
+    oncompositionend
+
+    /// oncompositionupdate
+    oncompositionupdate
+];

packages/html/src/events/drag.rs

@@ -0,0 +1,47 @@
+use std::any::Any;
+
+use dioxus_core::UiEvent;
+
+use crate::MouseData;
+
+pub type DragEvent = UiEvent<DragData>;
+
+/// The DragEvent interface is a DOM event that represents a drag and drop interaction. The user initiates a drag by
+/// placing a pointer device (such as a mouse) on the touch surface and then dragging the pointer to a new location
+/// (such as another DOM element). Applications are free to interpret a drag and drop interaction in an
+/// application-specific way.
+pub struct DragData {
+    /// Inherit mouse data
+    pub mouse: MouseData,
+
+    /// And then add the rest of the drag data
+    pub data: Box<dyn Any>,
+}
+
+impl_event! {
+    DragData;
+
+    /// ondrag
+    ondrag
+
+    /// ondragend
+    ondragend
+
+    /// ondragenter
+    ondragenter
+
+    /// ondragexit
+    ondragexit
+
+    /// ondragleave
+    ondragleave
+
+    /// ondragover
+    ondragover
+
+    /// ondragstart
+    ondragstart
+
+    /// ondrop
+    ondrop
+}

packages/html/src/events/image.rs

@@ -6,3 +6,13 @@ pub type ImageEvent = UiEvent<ImageData>;
 pub struct ImageData {
     pub load_error: bool,
 }
+
+impl_event! [
+    ImageData;
+
+    /// onerror
+    onerror
+
+    /// onload
+    onload
+];

packages/html/src/events/media.rs

@@ -4,3 +4,78 @@ pub type MediaEvent = UiEvent<MediaData>;
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Debug, Clone)]
 pub struct MediaData {}
+
+impl_event! [
+    MediaData;
+
+    ///abort
+    onabort
+
+    ///canplay
+    oncanplay
+
+    ///canplaythrough
+    oncanplaythrough
+
+    ///durationchange
+    ondurationchange
+
+    ///emptied
+    onemptied
+
+    ///encrypted
+    onencrypted
+
+    ///ended
+    onended
+
+    // todo: this conflicts with image events
+    // neither have data, so it's okay
+    // ///error
+    // onerror
+
+    ///loadeddata
+    onloadeddata
+
+    ///loadedmetadata
+    onloadedmetadata
+
+    ///loadstart
+    onloadstart
+
+    ///pause
+    onpause
+
+    ///play
+    onplay
+
+    ///playing
+    onplaying
+
+    ///progress
+    onprogress
+
+    ///ratechange
+    onratechange
+
+    ///seeked
+    onseeked
+
+    ///seeking
+    onseeking
+
+    ///stalled
+    onstalled
+
+    ///suspend
+    onsuspend
+
+    ///timeupdate
+    ontimeupdate
+
+    ///volumechange
+    onvolumechange
+
+    ///waiting
+    onwaiting
+];

packages/html/src/events/mouse.rs

@@ -125,30 +125,6 @@ impl_event! {
     /// ondoubleclick
     ondblclick
 
-    /// ondrag
-    ondrag
-
-    /// ondragend
-    ondragend
-
-    /// ondragenter
-    ondragenter
-
-    /// ondragexit
-    ondragexit
-
-    /// ondragleave
-    ondragleave
-
-    /// ondragover
-    ondragover
-
-    /// ondragstart
-    ondragstart
-
-    /// ondrop
-    ondrop
-
     /// onmousedown
     onmousedown
 

packages/html/src/events/pointer.rs

@@ -29,3 +29,36 @@ pub struct PointerData {
     pub is_primary: bool,
     // pub get_modifier_state: bool,
 }
+
+impl_event![
+    PointerData;
+    /// pointerdown
+    onpointerdown
+
+    /// pointermove
+    onpointermove
+
+    /// pointerup
+    onpointerup
+
+    /// pointercancel
+    onpointercancel
+
+    /// gotpointercapture
+    ongotpointercapture
+
+    /// lostpointercapture
+    onlostpointercapture
+
+    /// pointerenter
+    onpointerenter
+
+    /// pointerleave
+    onpointerleave
+
+    /// pointerover
+    onpointerover
+
+    /// pointerout
+    onpointerout
+];

packages/html/src/events/scroll.rs

@@ -4,3 +4,10 @@ pub type ScrollEvent = UiEvent<ScrollData>;
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Debug, Clone)]
 pub struct ScrollData {}
+
+impl_event! {
+    ScrollData;
+
+    /// onscroll
+    onscroll
+}

packages/html/src/events/selection.rs

@@ -4,3 +4,16 @@ pub type SelectionEvent = UiEvent<SelectionData>;
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Debug, Clone)]
 pub struct SelectionData {}
+
+impl_event! [
+    SelectionData;
+
+    /// select
+    onselect
+
+    /// selectstart
+    onselectstart
+
+    /// selectionchange
+    onselectionchange
+];

packages/html/src/events/toggle.rs

@@ -4,3 +4,10 @@ pub type ToggleEvent = UiEvent<ToggleData>;
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Debug, Clone)]
 pub struct ToggleData {}
+
+impl_event! {
+    ToggleData;
+
+    /// ontoggle
+    ontoggle
+}

packages/html/src/events/touch.rs

@@ -13,3 +13,18 @@ pub struct TouchData {
     // targetTouches: DOMTouchList,
     // touches: DOMTouchList,
 }
+
+impl_event! {
+    TouchData;
+    /// touchstart
+    ontouchstart
+
+    /// touchmove
+    ontouchmove
+
+    /// touchend
+    ontouchend
+
+    /// touchcancel
+    ontouchcancel
+}

packages/html/src/events/transition.rs

@@ -8,3 +8,10 @@ pub struct TransitionData {
     pub pseudo_element: String,
     pub elapsed_time: f32,
 }
+
+impl_event! {
+    TransitionData;
+
+    /// transitionend
+    ontransitionend
+}