Split out html-events crate

Cargo.toml

@@ -13,6 +13,7 @@ members = [
     "packages/extension",
     "packages/router",
     "packages/html",
+    "packages/html-events",
     "packages/html-internal-macro",
     "packages/hooks",
     "packages/web",
@@ -128,6 +129,7 @@ dioxus-router-macro = { path = "packages/router-macro", version = "0.7.4" }
 dioxus-document = { path = "packages/document", version = "0.7.4", default-features = false }
 dioxus-history = { path = "packages/history", version = "0.7.4", default-features = false }
 dioxus-html = { path = "packages/html", version = "0.7.4", default-features = false }
+html-events = { path = "packages/html-events", version = "0.7.4", default-features = false }
 dioxus-html-internal-macro = { path = "packages/html-internal-macro", version = "0.7.4" }
 dioxus-hooks = { path = "packages/hooks", version = "0.7.4" }
 dioxus-web = { path = "packages/web", version = "0.7.4", default-features = false }

packages/desktop/Cargo.toml

@@ -21,6 +21,7 @@ dioxus-asset-resolver = { workspace = true, features = ["native"] }
 generational-box = { workspace = true }
 dioxus-devtools = { workspace = true, optional = true }
 
+anyhow = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }

packages/desktop/src/file_upload.rs

@@ -425,20 +425,16 @@ impl NativeFileData for DesktopFileData {
     fn read_bytes(
         &self,
     ) -> std::pin::Pin<
-        Box<
-            dyn std::future::Future<Output = Result<bytes::Bytes, dioxus_core::CapturedError>>
-                + 'static,
-        >,
+        Box<dyn std::future::Future<Output = Result<bytes::Bytes, anyhow::Error>> + 'static>,
     > {
         let path = self.0.clone();
         Box::pin(async move { Ok(bytes::Bytes::from(std::fs::read(&path)?)) })
     }
 
     fn read_string(
         &self,
-    ) -> std::pin::Pin<
-        Box<dyn std::future::Future<Output = Result<String, dioxus_core::CapturedError>> + 'static>,
-    > {
+    ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<String, anyhow::Error>> + 'static>>
+    {
         let path = self.0.clone();
         Box::pin(async move { Ok(std::fs::read_to_string(&path)?) })
     }
@@ -454,11 +450,7 @@ impl NativeFileData for DesktopFileData {
     fn byte_stream(
         &self,
     ) -> std::pin::Pin<
-        Box<
-            dyn futures_util::Stream<Item = Result<bytes::Bytes, dioxus_core::CapturedError>>
-                + 'static
-                + Send,
-        >,
+        Box<dyn futures_util::Stream<Item = Result<bytes::Bytes, anyhow::Error>> + 'static + Send>,
     > {
         let path = self.0.clone();
         Box::pin(futures_util::stream::once(async move {

packages/desktop/src/webview.rs

@@ -9,7 +9,7 @@ use crate::{
 use crate::{document::DesktopDocument, WeakDesktopContext};
 use crate::{element::DesktopElement, file_upload::DesktopFormData};
 use base64::prelude::BASE64_STANDARD;
-use dioxus_core::{consume_context, provide_context, Runtime, ScopeId, VirtualDom};
+use dioxus_core::{consume_context, provide_context, ElementId, Runtime, ScopeId, VirtualDom};
 use dioxus_document::Document;
 use dioxus_history::{History, MemoryHistory};
 use dioxus_hooks::to_owned;
@@ -105,6 +105,8 @@ impl WebviewEdits {
             bubbles,
             data,
         } = event;
+        let element = ElementId(element);
+
         let Some(desktop_context) = self.desktop_context.get() else {
             tracing::error!(
                 "Tried to handle event before setting the desktop context on the event handler"

packages/dioxus/src/lib.rs

@@ -193,7 +193,7 @@ pub mod prelude {
     #[cfg_attr(docsrs, doc(cfg(feature = "html")))]
     #[doc(no_inline)]
     pub use dioxus_elements::{
-        events::*, extensions::*, global_attributes, keyboard_types, svg_attributes, traits::*,
+        events::*, extensions::*, global_attributes, keyboard_types, svg_attributes,
         GlobalAttributesExtension, SvgAttributesExtension,
     };
 

packages/html-events/Cargo.toml

@@ -0,0 +1,42 @@
+[package]
+name = "html-events"
+version = { workspace = true }
+authors = ["Jonathan Kelley"]
+edition = "2021"
+description = "Types/Traits to represent HTML events"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/DioxusLabs/dioxus/"
+homepage = "https://dioxuslabs.com"
+keywords = ["dom", "ui", "gui", "react"]
+
+[dependencies]
+keyboard-types = { workspace = true, default-features = false }
+futures-util = { workspace = true }
+euclid = "0.22.11"
+enumset = "1.1.6"
+bytes = { workspace = true }
+anyhow = { workspace = true }
+
+# Serialize
+serde = { workspace = true, features = ["derive"], optional = true }
+serde_repr = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
+
+[dev-dependencies]
+serde_json = { workspace = true }
+tracing = { workspace = true }
+
+[features]
+default = ["serialize"]
+serialize = [
+    "dep:serde",
+    "dep:serde_json",
+    "dep:serde_repr",
+    "euclid/serde",
+    "keyboard-types/serde",
+    "bytes/serde"
+]
+
+[package.metadata.docs.rs]
+cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]
+feature = ["html-to-rsx", "hot-reload-context", "html-to-rsx"]

packages/html/src/events/animation.rs → packages/html-events/src/events/animation.rs

@@ -1,7 +1,3 @@
-use dioxus_core::Event;
-
-pub type AnimationEvent = Event<AnimationData>;
-
 pub struct AnimationData {
     inner: Box<dyn HasAnimationData>,
 }

packages/html/src/events/cancel.rs → packages/html-events/src/events/cancel.rs

@@ -1,7 +1,3 @@
-use dioxus_core::Event;
-
-pub type CancelEvent = Event<CancelData>;
-
 pub struct CancelData {
     inner: Box<dyn HasCancelData>,
 }

packages/html/src/events/clipboard.rs → packages/html-events/src/events/clipboard.rs

@@ -1,7 +1,3 @@
-use dioxus_core::Event;
-
-pub type ClipboardEvent = Event<ClipboardData>;
-
 pub struct ClipboardData {
     inner: Box<dyn HasClipboardData>,
 }

packages/html/src/events/composition.rs → packages/html-events/src/events/composition.rs

@@ -1,7 +1,3 @@
-use dioxus_core::Event;
-
-pub type CompositionEvent = Event<CompositionData>;
-
 pub struct CompositionData {
     inner: Box<dyn HasCompositionData>,
 }

packages/html/src/events/drag.rs → packages/html-events/src/events/drag.rs

@@ -5,13 +5,10 @@ use crate::{
     geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint},
 };
 
-use dioxus_core::Event;
 use keyboard_types::Modifiers;
 
 use crate::HasMouseData;
 
-pub type DragEvent = Event<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

packages/html/src/events/focus.rs → packages/html-events/src/events/focus.rs

@@ -1,7 +1,3 @@
-use dioxus_core::Event;
-
-pub type FocusEvent = Event<FocusData>;
-
 pub struct FocusData {
     inner: Box<dyn HasFocusData>,
 }

packages/html/src/events/form.rs → packages/html-events/src/events/form.rs

@@ -2,10 +2,6 @@ use crate::file_data::HasFileData;
 use crate::FileData;
 use std::fmt::Debug;
 
-use dioxus_core::Event;
-
-pub type FormEvent = Event<FormData>;
-
 /* DOMEvent:  Send + SyncTarget relatedTarget */
 pub struct FormData {
     inner: Box<dyn HasFormData>,

packages/html/src/events/generated.rs → packages/html-events/src/events/generated.rs

@@ -355,7 +355,25 @@ macro_rules! expand_html_event_converter {
                 fn $converter(&self, event: &PlatformEventData) -> $data;
             )*
         }
+    };
+}
 
+macro_rules! expand_from_impls {
+    (
+        enum Event {
+            $(
+                #[convert = $converter:ident]
+                #[events = [
+                    $(
+                        $( #[$attr:meta] )*
+                        $name:ident => $raw:ident,
+                    )*
+                ]]
+                $(#[raw = [$($raw_only:ident),* $(,)?]])?
+                $group:ident($data:ident),
+            )*
+        }
+    ) => {
         $(
             impl From<&PlatformEventData> for $data {
                 fn from(val: &PlatformEventData) -> Self {
@@ -413,36 +431,7 @@ macro_rules! expand_html_event_deserialize {
     };
 }
 
-macro_rules! expand_html_event_listeners {
-    (
-        enum Event {
-            $(
-                #[convert = $converter:ident]
-                #[events = [
-                    $(
-                        $( #[$attr:meta] )*
-                        $name:ident => $raw:ident,
-                    )*
-                ]]
-                $(#[raw = [$($raw_only:ident),* $(,)?]])?
-                $group:ident($data:ident),
-            )*
-        }
-    ) => {
-        $(
-            impl_event! {
-                $data;
-                $(
-                    #[doc = concat!(stringify!($name))]
-                    $( #[$attr] )*
-                    $name: concat!("on", stringify!($raw));
-                )*
-            }
-        )*
-    };
-}
-
 with_html_event_groups!(expand_html_event_converter);
 #[cfg(feature = "serialize")]
 with_html_event_groups!(expand_html_event_deserialize);
-with_html_event_groups!(expand_html_event_listeners);
+with_html_event_groups!(expand_from_impls);

packages/html/src/events/image.rs → packages/html-events/src/events/image.rs

@@ -1,6 +1,3 @@
-use dioxus_core::Event;
-
-pub type ImageEvent = Event<ImageData>;
 pub struct ImageData {
     inner: Box<dyn HasImageData>,
 }

packages/html/src/events/keyboard.rs → packages/html-events/src/events/keyboard.rs

@@ -1,4 +1,3 @@
-use dioxus_core::Event;
 use keyboard_types::{Code, Key, Location, Modifiers};
 use std::fmt::Debug;
 
@@ -14,7 +13,6 @@ where
     Ok(Code::deserialize(deserializer).unwrap_or(Code::Unidentified))
 }
 
-pub type KeyboardEvent = Event<KeyboardData>;
 pub struct KeyboardData {
     inner: Box<dyn HasKeyboardData>,
 }

packages/html/src/events/media.rs → packages/html-events/src/events/media.rs

@@ -1,6 +1,3 @@
-use dioxus_core::Event;
-
-pub type MediaEvent = Event<MediaData>;
 pub struct MediaData {
     inner: Box<dyn HasMediaData>,
 }