merge upstream

.github/workflows/cli_release.yml

@@ -36,6 +36,8 @@ jobs:
           toolchain: ${{ matrix.platform.toolchain }}
           targets: ${{ matrix.platform.target }}
 
+      - uses: ilammy/setup-nasm@v1
+
       # Setup the Github Actions Cache for the CLI package
       - name: Setup cache
         uses: Swatinem/rust-cache@v2

.github/workflows/main.yml

@@ -39,6 +39,7 @@ jobs:
     steps:
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+      - uses: ilammy/setup-nasm@v1
       - run: sudo apt-get update
       - run: sudo apt install libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev
       - uses: actions/checkout@v4
@@ -51,6 +52,7 @@ jobs:
     steps:
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+      - uses: ilammy/setup-nasm@v1
       - run: sudo apt-get update
       - run: sudo apt install libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev
       - uses: davidB/rust-cargo-make@v1
@@ -66,6 +68,7 @@ jobs:
     steps:
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+      - uses: ilammy/setup-nasm@v1
       - run: rustup component add rustfmt
       - uses: actions/checkout@v4
       - run: cargo fmt --all -- --check
@@ -77,6 +80,7 @@ jobs:
     steps:
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+      - uses: ilammy/setup-nasm@v1
       - run: sudo apt-get update
       - run: sudo apt install libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev
       - run: rustup component add clippy
@@ -124,6 +128,8 @@ jobs:
             }
 
     steps:
+      - uses: actions/checkout@v4
+      - uses: ilammy/setup-nasm@v1
       - name: install stable
         uses: dtolnay/rust-toolchain@master
         with:

.github/workflows/miri.yml

@@ -26,8 +26,8 @@ env:
   RUST_BACKTRACE: 1
   # Change to specific Rust release to pin
   rust_stable: stable
-  rust_nightly: nightly-2022-11-03
-  rust_clippy: 1.65.0
+  rust_nightly: nightly-2023-11-16
+  rust_clippy: 1.70.0
   # When updating this, also update:
   # - README.md
   # - tokio/README.md
@@ -70,6 +70,7 @@ jobs:
         run: echo "MIRIFLAGS=-Zmiri-tag-gc=1" >> $GITHUB_ENV
 
       - uses: actions/checkout@v4
+      - uses: ilammy/setup-nasm@v1
       - name: Install Rust ${{ env.rust_nightly }}
         uses: dtolnay/rust-toolchain@master
         with:

.github/workflows/playwright.yml

@@ -20,6 +20,7 @@ jobs:
     steps:
       # Do our best to cache the toolchain and node install steps
       - uses: actions/checkout@v4
+      - uses: ilammy/setup-nasm@v1
       - uses: actions/setup-node@v4
         with:
           node-version: 16

Cargo.toml

@@ -59,7 +59,7 @@ dioxus-core = { path = "packages/core", version = "0.4.2" }
 dioxus-core-macro = { path = "packages/core-macro", version = "0.4.0"  }
 dioxus-router = { path = "packages/router", version = "0.4.1"  }
 dioxus-router-macro = { path = "packages/router-macro", version = "0.4.1" }
-dioxus-html = { path = "packages/html", version = "0.4.0"  }
+dioxus-html = { path = "packages/html", default-features = false, version = "0.4.0"  }
 dioxus-hooks = { path = "packages/hooks", version = "0.4.0" }
 dioxus-web = { path = "packages/web", version = "0.4.0"  }
 dioxus-ssr = { path = "packages/ssr", version = "0.4.0"  }

examples/compose.rs

@@ -26,7 +26,7 @@ fn app(cx: Scope) -> Element {
             button {
                 onclick: move |_| {
                     let dom = VirtualDom::new_with_props(compose, ComposeProps { app_tx: tx.clone() });
-                    window.new_window(dom, Default::default());
+                    dioxus_desktop::window().new_window(dom, Default::default());
                 },
                 "Click to compose a new email"
             }
@@ -61,11 +61,8 @@ fn compose(cx: Scope<ComposeProps>) -> Element {
                 },
                 "Click to send"
             }
-
-            input {
-                oninput: move |e| user_input.set(e.value.clone()),
-                value: "{user_input}"
-            }
+          
+            input { oninput: move |e| user_input.set(e.value()), value: "{user_input}" }
         }
     })
 }

examples/counter.rs

@@ -22,7 +22,7 @@ fn app(cx: Scope) -> Element {
                     input {
                         value: "{counter}",
                         oninput: move |e| {
-                            if let Ok(value) = e.value.parse::<usize>() {
+                            if let Ok(value) = e.value().parse::<usize>() {
                                 counters.make_mut()[i] = value;
                             }
                         }

examples/crm.rs

@@ -35,14 +35,16 @@ fn App(cx: Scope) -> Element {
             rel: "stylesheet",
             href: "https://unpkg.com/purecss@2.0.6/build/pure-min.css",
             integrity: "sha384-Uu6IeWbM+gzNVXJcM9XV3SohHtmWE+3VGi496jvgX1jyvDTXfdK+rfZc8C1Aehk5",
-            crossorigin: "anonymous",
+            crossorigin: "anonymous"
         }
 
-        style { "
+        style {
+            "
             .red {{
                 background-color: rgb(202, 60, 60) !important;
             }}
-        " }
+        "
+        }
 
         h1 { "Dioxus CRM Example" }
 
@@ -57,16 +59,8 @@ fn ClientList(cx: Scope) -> Element {
     cx.render(rsx! {
         h2 { "List of Clients" }
 
-        Link {
-            to: Route::ClientAdd {},
-            class: "pure-button pure-button-primary",
-            "Add Client"
-        }
-        Link {
-            to: Route::Settings {},
-            class: "pure-button",
-            "Settings"
-        }
+        Link { to: Route::ClientAdd {}, class: "pure-button pure-button-primary", "Add Client" }
+        Link { to: Route::Settings {}, class: "pure-button", "Settings" }
 
         clients.read().iter().map(|client| rsx! {
             div {
@@ -94,79 +88,55 @@ fn ClientAdd(cx: Scope) -> Element {
             class: "pure-form pure-form-aligned",
             onsubmit: move |_| {
                 let mut clients = clients.write();
-
-                clients.push(Client {
-                    first_name: first_name.to_string(),
-                    last_name: last_name.to_string(),
-                    description: description.to_string(),
-                });
-
+                clients
+                    .push(Client {
+                        first_name: first_name.to_string(),
+                        last_name: last_name.to_string(),
+                        description: description.to_string(),
+                    });
                 dioxus_router::router().push(Route::ClientList {});
             },
 
             fieldset {
-                div {
-                    class: "pure-control-group",
-                    label {
-                        "for": "first_name",
-                        "First Name"
-                    }
+                div { class: "pure-control-group",
+                    label { "for": "first_name", "First Name" }
                     input {
                         id: "first_name",
                         "type": "text",
                         placeholder: "First Name…",
                         required: "",
                         value: "{first_name}",
-                        oninput: move |e| first_name.set(e.value.clone())
+                        oninput: move |e| first_name.set(e.value())
                     }
                 }
 
-                div {
-                    class: "pure-control-group",
-                    label {
-                        "for": "last_name",
-                        "Last Name"
-                    }
+                div { class: "pure-control-group",
+                    label { "for": "last_name", "Last Name" }
                     input {
                         id: "last_name",
                         "type": "text",
                         placeholder: "Last Name…",
                         required: "",
                         value: "{last_name}",
-                        oninput: move |e| last_name.set(e.value.clone())
+                        oninput: move |e| last_name.set(e.value())
                     }
                 }
 
-                div {
-                    class: "pure-control-group",
-                    label {
-                        "for": "description",
-                        "Description"
-                    }
+                div { class: "pure-control-group",
+                    label { "for": "description", "Description" }
                     textarea {
                         id: "description",
                         placeholder: "Description…",
                         value: "{description}",
-                        oninput: move |e| description.set(e.value.clone())
+                        oninput: move |e| description.set(e.value())
                     }
                 }
 
-                div {
-                    class: "pure-controls",
-                    button {
-                        "type": "submit",
-                        class: "pure-button pure-button-primary",
-                        "Save"
-                    }
-                    Link {
-                        to: Route::ClientList {},
-                        class: "pure-button pure-button-primary red",
-                        "Cancel"
-                    }
+                div { class: "pure-controls",
+                    button { "type": "submit", class: "pure-button pure-button-primary", "Save" }
+                    Link { to: Route::ClientList {}, class: "pure-button pure-button-primary red", "Cancel" }
                 }
             }
-
-
         }
     })
 }
@@ -187,10 +157,6 @@ fn Settings(cx: Scope) -> Element {
             "Remove all Clients"
         }
 
-        Link {
-            to: Route::ClientList {},
-            class: "pure-button",
-            "Go back"
-        }
+        Link { to: Route::ClientList {}, class: "pure-button", "Go back" }
     })
 }

examples/custom_assets.rs

@@ -10,7 +10,7 @@ fn app(cx: Scope) -> Element {
             p {
                 "This should show an image:"
             }
-            img { src: "examples/assets/logo.png" }
+            img { src: mg!(image("examples/assets/logo.png").format(ImageType::Avif)).to_string() }
         }
     })
 }

examples/file_explorer.rs

@@ -18,13 +18,14 @@ fn main() {
     );
 }
 
+const _STYLE: &str = mg!(file("./examples/assets/fileexplorer.css"));
+
 fn app(cx: Scope) -> Element {
     let files = use_ref(cx, Files::new);
 
     cx.render(rsx! {
         div {
             link { href:"https://fonts.googleapis.com/icon?family=Material+Icons", rel:"stylesheet", }
-            style { include_str!("./assets/fileexplorer.css") }
             header {
                 i { class: "material-icons icon-menu", "menu" }
                 h1 { "Files: ", files.read().current() }

examples/file_upload.rs

@@ -16,7 +16,7 @@ fn App(cx: Scope) -> Element {
                 r#type: "checkbox",
                 checked: "{enable_directory_upload}",
                 oninput: move |evt| {
-                    enable_directory_upload.set(evt.value.parse().unwrap());
+                    enable_directory_upload.set(evt.value().parse().unwrap());
                 },
             },
             "Enable directory upload"
@@ -30,7 +30,7 @@ fn App(cx: Scope) -> Element {
             onchange: |evt| {
                 to_owned![files_uploaded];
                 async move {
-                    if let Some(file_engine) = &evt.files {
+                    if let Some(file_engine) = &evt.files() {
                         let files = file_engine.files();
                         for file_name in files {
                             sleep(std::time::Duration::from_secs(1)).await;

examples/form.rs

@@ -14,8 +14,8 @@ fn app(cx: Scope) -> Element {
         div {
             h1 { "Form" }
             form {
-                onsubmit: move |ev| println!("Submitted {:?}", ev.values),
-                oninput: move |ev| println!("Input {:?}", ev.values),
+                onsubmit: move |ev| println!("Submitted {:?}", ev.values()),
+                oninput: move |ev| println!("Input {:?}", ev.values()),
                 input { r#type: "text", name: "username" }
                 input { r#type: "text", name: "full-name" }
                 input { r#type: "password", name: "password" }

examples/login_form.rs

@@ -12,8 +12,8 @@ fn app(cx: Scope) -> Element {
         let resp = reqwest::Client::new()
             .post("http://localhost:8080/login")
             .form(&[
-                ("username", &evt.values["username"]),
-                ("password", &evt.values["password"]),
+                ("username", &evt.values()["username"]),
+                ("password", &evt.values()["password"]),
             ])
             .send()
             .await;
@@ -31,8 +31,7 @@ fn app(cx: Scope) -> Element {
 
     cx.render(rsx! {
         h1 { "Login" }
-        form {
-            onsubmit: onsubmit,
+        form { onsubmit: onsubmit,
             input { r#type: "text", id: "username", name: "username" }
             label { "Username" }
             br {}

examples/query_segments_demo/src/main.rs

@@ -14,29 +14,35 @@ use dioxus_router::prelude::*;
 #[derive(Routable, Clone)]
 #[rustfmt::skip]
 enum Route {
-    // segments that start with ?: are query segments
-    #[route("/blog?:query_params")]
+    // segments that start with ?:.. are query segments that capture the entire query
+    #[route("/blog?:..query_params")]
     BlogPost {
         // You must include query segments in child variants
-        query_params: BlogQuerySegments,
+        query_params: ManualBlogQuerySegments,
+    },
+    // segments that follow the ?:field&:other_field syntax are query segments that follow the standard url query syntax
+    #[route("/autoblog?:name&:surname")]
+    AutomaticBlogPost {
+        name: String,
+        surname: String,
     },
 }
 
 #[derive(Debug, Clone, PartialEq)]
-struct BlogQuerySegments {
+struct ManualBlogQuerySegments {
     name: String,
     surname: String,
 }
 
 /// The display impl needs to display the query in a way that can be parsed:
-impl Display for BlogQuerySegments {
+impl Display for ManualBlogQuerySegments {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "name={}&surname={}", self.name, self.surname)
     }
 }
 
 /// The query segment is anything that implements <https://docs.rs/dioxus-router/latest/dioxus_router/routable/trait.FromQuery.html>. You can implement that trait for a struct if you want to parse multiple query parameters.
-impl FromQuery for BlogQuerySegments {
+impl FromQuery for ManualBlogQuerySegments {
     fn from_query(query: &str) -> Self {
         let mut name = None;
         let mut surname = None;
@@ -57,13 +63,21 @@ impl FromQuery for BlogQuerySegments {
 }
 
 #[component]
-fn BlogPost(cx: Scope, query_params: BlogQuerySegments) -> Element {
+fn BlogPost(cx: Scope, query_params: ManualBlogQuerySegments) -> Element {
     render! {
         div{"This is your blogpost with a query segment:"}
         div{format!("{:?}", query_params)}
     }
 }
 
+#[component]
+fn AutomaticBlogPost(cx: Scope, name: String, surname: String) -> Element {
+    render! {
+        div{"This is your blogpost with a query segment:"}
+        div{format!("name={}&surname={}", name, surname)}
+    }
+}
+
 #[component]
 fn App(cx: Scope) -> Element {
     render! { Router::<Route>{} }

examples/shared_state.rs

@@ -64,7 +64,7 @@ fn DataEditor(cx: Scope, id: usize) -> Element {
 fn DataView(cx: Scope, id: usize) -> Element {
     let cool_data = use_shared_state::<CoolData>(cx).unwrap();
 
-    let oninput = |e: FormEvent| cool_data.write().set(*id, e.value.clone());
+    let oninput = |e: FormEvent| cool_data.write().set(*id, e.value());
 
     let cool_data = cool_data.read();
     let my_data = &cool_data.view(id).unwrap();

examples/tailwind/Dioxus.toml

@@ -30,7 +30,7 @@ watch_path = ["src", "public"]
 [web.resource]
 
 # CSS style file
-style = ["/tailwind.css"]
+style = []
 
 # Javascript code file
 script = []

examples/tailwind/README.md

@@ -7,7 +7,7 @@ This example shows how an app might be styled with TailwindCSS.
 1. Install the Dioxus CLI:
 
 ```bash
-cargo install --git https://github.com/DioxusLabs/cli
+cargo install dioxus-cli
 ```
 
 2. Install npm: https://docs.npmjs.com/downloading-and-installing-node-js-and-npm

examples/tailwind/dist/tailwind3531548035813279582.css

@@ -0,0 +1 @@
+*,:before,:after{box-sizing:border-box;border:0 solid #e5e7eb}:before,:after{--tw-content:""}html{-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-feature-settings:normal;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}body{line-height:inherit;margin:0}hr{color:inherit;border-top-width:1px;height:0}abbr:where([title]){text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;font-weight:inherit;line-height:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button;background-color:#0000;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dl,dd,h1,h2,h3,h4,h5,h6,hr,figure,p,pre{margin:0}fieldset{margin:0;padding:0}legend{padding:0}ol,ul,menu{margin:0;padding:0;list-style:none}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}button,[role=button]{cursor:pointer}:disabled{cursor:default}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}[hidden]{display:none}*,:before,:after,::backdrop{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.container{width:100%}@media (width>=640px){.container{max-width:640px}}@media (width>=768px){.container{max-width:768px}}@media (width>=1024px){.container{max-width:1024px}}@media (width>=1280px){.container{max-width:1280px}}@media (width>=1536px){.container{max-width:1536px}}.mx-auto{margin-left:auto;margin-right:auto}.mb-16{margin-bottom:4rem}.mb-4{margin-bottom:1rem}.mb-8{margin-bottom:2rem}.ml-1{margin-left:.25rem}.ml-3{margin-left:.75rem}.ml-4{margin-left:1rem}.mr-5{margin-right:1.25rem}.mt-4{margin-top:1rem}.flex{display:flex}.inline-flex{display:inline-flex}.hidden{display:none}.h-10{height:2.5rem}.h-4{height:1rem}.w-10{width:2.5rem}.w-4{width:1rem}.w-5\/6{width:83.3333%}.flex-col{flex-direction:column}.flex-wrap{flex-wrap:wrap}.items-center{align-items:center}.justify-center{justify-content:center}.rounded{border-radius:.25rem}.rounded-full{border-radius:9999px}.border-0{border-width:0}.bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.bg-gray-900{--tw-bg-opacity:1;background-color:rgb(17 24 39/var(--tw-bg-opacity))}.bg-indigo-500{--tw-bg-opacity:1;background-color:rgb(99 102 241/var(--tw-bg-opacity))}.object-cover{-o-object-fit:cover;object-fit:cover}.object-center{-o-object-position:center;object-position:center}.p-2{padding:.5rem}.p-5{padding:1.25rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-5{padding-left:1.25rem;padding-right:1.25rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.py-24{padding-top:6rem;padding-bottom:6rem}.text-center{text-align:center}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-base{font-size:1rem;line-height:1.5rem}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.font-medium{font-weight:500}.leading-relaxed{line-height:1.625}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.hover\:bg-gray-700:hover{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity))}.hover\:bg-indigo-600:hover{--tw-bg-opacity:1;background-color:rgb(79 70 229/var(--tw-bg-opacity))}.hover\:text-white:hover{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.focus\:outline-none:focus{outline-offset:2px;outline:2px solid #0000}@media (width>=640px){.sm\:text-4xl{font-size:2.25rem;line-height:2.5rem}}@media (width>=768px){.md\:mb-0{margin-bottom:0}.md\:ml-auto{margin-left:auto}.md\:mt-0{margin-top:0}.md\:w-1\/2{width:50%}.md\:flex-row{flex-direction:row}.md\:items-start{align-items:flex-start}.md\:pr-16{padding-right:4rem}.md\:text-left{text-align:left}}@media (width>=1024px){.lg\:inline-block{display:inline-block}.lg\:w-full{width:100%}.lg\:max-w-lg{max-width:32rem}.lg\:flex-grow{flex-grow:1}.lg\:pr-24{padding-right:6rem}}

examples/tailwind/src/main.rs

@@ -2,13 +2,11 @@
 
 use dioxus::prelude::*;
 
+const _STYLE: &str = mg!(file("./public/tailwind.css"));
+
 fn main() {
     #[cfg(not(target_arch = "wasm32"))]
-    dioxus_desktop::launch_cfg(
-        app,
-        dioxus_desktop::Config::new()
-            .with_custom_head(r#"<link rel="stylesheet" href="public/tailwind.css">"#.to_string()),
-    );
+    dioxus_desktop::launch(app);
     #[cfg(target_arch = "wasm32")]
     dioxus_web::launch(app);
 }

examples/textarea.rs

@@ -17,7 +17,7 @@ fn app(cx: Scope) -> Element {
             rows: "10",
             cols: "80",
             value: "{model}",
-            oninput: move |e| model.set(e.value.clone()),
+            oninput: move |e| model.set(e.value().clone()),
         }
     })
 }

examples/todomvc.rs

@@ -7,6 +7,8 @@ fn main() {
     dioxus_desktop::launch(app);
 }
 
+const _STYLE: &str = mg!(file("./examples/assets/todomvc.css"));
+
 #[derive(PartialEq, Eq, Clone, Copy)]
 pub enum FilterState {
     All,
@@ -47,7 +49,6 @@ pub fn app(cx: Scope<()>) -> Element {
 
     cx.render(rsx! {
         section { class: "todoapp",
-            style { include_str!("./assets/todomvc.css") }
             TodoHeader { todos: todos }
             section { class: "main",
                 if !todos.is_empty() {
@@ -107,7 +108,7 @@ pub fn TodoHeader<'a>(cx: Scope<'a, TodoHeaderProps<'a>>) -> Element {
                 value: "{draft}",
                 autofocus: "true",
                 oninput: move |evt| {
-                    draft.set(evt.value.clone());
+                    draft.set(evt.value().clone());
                 },
                 onkeydown: move |evt| {
                     if evt.key() == Key::Enter && !draft.is_empty() {
@@ -154,7 +155,7 @@ pub fn TodoEntry<'a>(cx: Scope<'a, TodoEntryProps<'a>>) -> Element {
                     id: "cbg-{todo.id}",
                     checked: "{todo.checked}",
                     oninput: move |evt| {
-                        cx.props.todos.make_mut()[&cx.props.id].checked = evt.value.parse().unwrap();
+                        cx.props.todos.make_mut()[&cx.props.id].checked = evt.value().parse().unwrap();
                     }
                 }
                 label {
@@ -175,7 +176,7 @@ pub fn TodoEntry<'a>(cx: Scope<'a, TodoEntryProps<'a>>) -> Element {
                 input {
                     class: "edit",
                     value: "{todo.contents}",
-                    oninput: move |evt| cx.props.todos.make_mut()[&cx.props.id].contents = evt.value.clone(),
+                    oninput: move |evt| cx.props.todos.make_mut()[&cx.props.id].contents = evt.value(),
                     autofocus: "true",
                     onfocusout: move |_| is_editing.set(false),
                     onkeydown: move |evt| {

examples/window_zoom.rs

@@ -12,7 +12,7 @@ fn app(cx: Scope) -> Element {
             r#type: "number",
             value: "{level}",
             oninput: |e| {
-                if let Ok(new_zoom) = e.value.parse::<f64>() {
+                if let Ok(new_zoom) = e.value().parse::<f64>() {
                     level.set(new_zoom);
                     dioxus_desktop::window().webview.zoom(new_zoom);
                 }

examples/xss_safety.rs

@@ -20,7 +20,7 @@ fn app(cx: Scope) -> Element {
             input {
                 value: "{contents}",
                 r#type: "text",
-                oninput: move |e| contents.set(e.value.clone()),
+                oninput: move |e| contents.set(e.value()),
             }
         }
     })

packages/cli/Cargo.toml

@@ -30,7 +30,7 @@ cargo_metadata = "0.15.0"
 tokio = { version = "1.16.1", features = ["fs", "sync", "rt", "macros"] }
 atty = "0.2.14"
 chrono = "0.4.19"
-anyhow = "1.0.53"
+anyhow = "1"
 hyper = "0.14.17"
 hyper-rustls = "0.23.2"
 indicatif = "0.17.5"
@@ -75,6 +75,8 @@ toml_edit = "0.19.11"
 tauri-bundler = { version = "=1.3.0", features = ["native-tls-vendored"] }
 tauri-utils = "=1.4.*"
 
+manganis-cli-support= { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] }
+
 dioxus-autofmt = { workspace = true }
 dioxus-check = { workspace = true }
 rsx-rosetta = { workspace = true }

packages/cli/src/assets/autoreload.js

@@ -1,5 +1,5 @@
 // Dioxus-CLI
-// https://github.com/DioxusLabs/cli
+// https://github.com/DioxusLabs/dioxus/tree/master/packages/cli
 
 (function () {
   var protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
@@ -22,4 +22,4 @@
       }
   };
   ws.onclose = reload_upon_connect;
-})()
+})()

packages/cli/src/builder.rs

@@ -2,31 +2,35 @@ use crate::{
     config::{CrateConfig, ExecutableType},
     error::{Error, Result},
     tools::Tool,
-    DioxusConfig,
 };
 use cargo_metadata::{diagnostic::Diagnostic, Message};
 use indicatif::{ProgressBar, ProgressStyle};
+use lazy_static::lazy_static;
+use manganis_cli_support::AssetManifestExt;
 use serde::Serialize;
 use std::{
     fs::{copy, create_dir_all, File},
-    io::Read,
+    io::{Read, Write},
     panic,
     path::PathBuf,
     time::Duration,
 };
 use wasm_bindgen_cli_support::Bindgen;
 
+lazy_static! {
+    static ref PROGRESS_BARS: indicatif::MultiProgress = indicatif::MultiProgress::new();
+}
+
 #[derive(Serialize, Debug, Clone)]
 pub struct BuildResult {
     pub warnings: Vec<Diagnostic>,
     pub elapsed_time: u128,
 }
 
-#[allow(unused)]
-pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
+pub fn build(config: &CrateConfig, _: bool, skip_assets: bool) -> Result<BuildResult> {
     // [1] Build the project with cargo, generating a wasm32-unknown-unknown target (is there a more specific, better target to leverage?)
     // [2] Generate the appropriate build folders
-    // [3] Wasm-bindgen the .wasm fiile, and move it into the {builddir}/modules/xxxx/xxxx_bg.wasm
+    // [3] Wasm-bindgen the .wasm file, and move it into the {builddir}/modules/xxxx/xxxx_bg.wasm
     // [4] Wasm-opt the .wasm file with whatever optimizations need to be done
     // [5][OPTIONAL] Builds the Tailwind CSS file using the Tailwind standalone binary
     // [6] Link up the html page to the wasm module
@@ -41,6 +45,8 @@ pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
         ..
     } = config;
 
+    let _gaurd = WebAssetConfigDropGuard::new();
+
     // start to build the assets
     let ignore_files = build_assets(config)?;
 
@@ -60,8 +66,8 @@ pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
             .output()?;
     }
 
-    let cmd = subprocess::Exec::cmd("cargo");
-    let cmd = cmd
+    let cmd = subprocess::Exec::cmd("cargo")
+        .env("CARGO_TARGET_DIR", target_dir)
         .cwd(crate_dir)
         .arg("build")
         .arg("--target")
@@ -252,19 +258,28 @@ pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
         }
     }
 
+    if !skip_assets {
+        process_assets(config)?;
+    }
+
     Ok(BuildResult {
         warnings: warning_messages,
         elapsed_time: t_start.elapsed().as_millis(),
     })
 }
 
-pub fn build_desktop(config: &CrateConfig, _is_serve: bool) -> Result<BuildResult> {
+pub fn build_desktop(
+    config: &CrateConfig,
+    _is_serve: bool,
+    skip_assets: bool,
+) -> Result<BuildResult> {
     log::info!("🚅 Running build [Desktop] command...");
 
     let t_start = std::time::Instant::now();
     let ignore_files = build_assets(config)?;
 
     let mut cmd = subprocess::Exec::cmd("cargo")
+        .env("CARGO_TARGET_DIR", &config.target_dir)
         .cwd(&config.crate_dir)
         .arg("build")
         .arg("--message-format=json");
@@ -375,6 +390,13 @@ pub fn build_desktop(config: &CrateConfig, _is_serve: bool) -> Result<BuildResul
         }
     }
 
+    if !skip_assets {
+        // Collect assets
+        process_assets(config)?;
+        // Create the __assets_head.html file for bundling
+        create_assets_head(config)?;
+    }
+
     log::info!(
         "🚩 Build completed: [./{}]",
         config
@@ -394,11 +416,19 @@ pub fn build_desktop(config: &CrateConfig, _is_serve: bool) -> Result<BuildResul
     })
 }
 
+fn create_assets_head(config: &CrateConfig) -> Result<()> {
+    let manifest = config.asset_manifest();
+    let mut file = File::create(config.out_dir.join("__assets_head.html"))?;
+    file.write_all(manifest.head().as_bytes())?;
+    Ok(())
+}
+
 fn prettier_build(cmd: subprocess::Exec) -> anyhow::Result<Vec<Diagnostic>> {
     let mut warning_messages: Vec<Diagnostic> = vec![];
 
-    let pb = ProgressBar::new_spinner();
+    let mut pb = ProgressBar::new_spinner();
     pb.enable_steady_tick(Duration::from_millis(200));
+    pb = PROGRESS_BARS.add(pb);
     pb.set_style(
         ProgressStyle::with_template("{spinner:.dim.bold} {wide_msg}")
             .unwrap()
@@ -406,14 +436,6 @@ fn prettier_build(cmd: subprocess::Exec) -> anyhow::Result<Vec<Diagnostic>> {
     );
     pb.set_message("💼 Waiting to start build the project...");
 
-    struct StopSpinOnDrop(ProgressBar);
-
-    impl Drop for StopSpinOnDrop {
-        fn drop(&mut self) {
-            self.0.finish_and_clear();
-        }
-    }
-
     let stdout = cmd.detached().stream_stdout()?;
     let reader = std::io::BufReader::new(stdout);
 
@@ -449,13 +471,17 @@ fn prettier_build(cmd: subprocess::Exec) -> anyhow::Result<Vec<Diagnostic>> {
                     std::process::exit(1);
                 }
             }
-            _ => (), // Unknown message
+            _ => {
+                // Unknown message
+            }
         }
     }
     Ok(warning_messages)
 }
 
-pub fn gen_page(config: &DioxusConfig, serve: bool) -> String {
+pub fn gen_page(config: &CrateConfig, serve: bool, skip_assets: bool) -> String {
+    let _gaurd = WebAssetConfigDropGuard::new();
+
     let crate_root = crate::cargo::crate_root().unwrap();
     let custom_html_file = crate_root.join("index.html");
     let mut html = if custom_html_file.is_file() {
@@ -470,7 +496,7 @@ pub fn gen_page(config: &DioxusConfig, serve: bool) -> String {
         String::from(include_str!("./assets/index.html"))
     };
 
-    let resources = config.web.resource.clone();
+    let resources = config.dioxus_config.web.resource.clone();
 
     let mut style_list = resources.style.unwrap_or_default();
     let mut script_list = resources.script.unwrap_or_default();
@@ -490,6 +516,7 @@ pub fn gen_page(config: &DioxusConfig, serve: bool) -> String {
         ))
     }
     if config
+        .dioxus_config
         .application
         .tools
         .clone()
@@ -498,6 +525,10 @@ pub fn gen_page(config: &DioxusConfig, serve: bool) -> String {
     {
         style_str.push_str("<link rel=\"stylesheet\" href=\"/{base_path}/tailwind.css\">\n");
     }
+    if !skip_assets {
+        let manifest = config.asset_manifest();
+        style_str.push_str(&manifest.head());
+    }
 
     replace_or_insert_before("{style_include}", &style_str, "</head", &mut html);
 
@@ -518,11 +549,11 @@ pub fn gen_page(config: &DioxusConfig, serve: bool) -> String {
         );
     }
 
-    let base_path = match &config.web.app.base_path {
+    let base_path = match &config.dioxus_config.web.app.base_path {
         Some(path) => path,
         None => ".",
     };
-    let app_name = &config.application.name;
+    let app_name = &config.dioxus_config.application.name;
     // Check if a script already exists
     if html.contains("{app_name}") && html.contains("{base_path}") {
         html = html.replace("{app_name}", app_name);
@@ -547,6 +578,7 @@ pub fn gen_page(config: &DioxusConfig, serve: bool) -> String {
     }
 
     let title = config
+        .dioxus_config
         .web
         .app
         .title
@@ -716,3 +748,42 @@ fn build_assets(config: &CrateConfig) -> Result<Vec<PathBuf>> {
 
     Ok(result)
 }
+
+/// Process any assets collected from the binary
+fn process_assets(config: &CrateConfig) -> anyhow::Result<()> {
+    let manifest = config.asset_manifest();
+
+    let static_asset_output_dir = PathBuf::from(
+        config
+            .dioxus_config
+            .web
+            .app
+            .base_path
+            .clone()
+            .unwrap_or_default(),
+    );
+    let static_asset_output_dir = config.out_dir.join(static_asset_output_dir);
+
+    manifest.copy_static_assets_to(static_asset_output_dir)?;
+
+    Ok(())
+}
+
+pub(crate) struct WebAssetConfigDropGuard;
+
+impl WebAssetConfigDropGuard {
+    pub fn new() -> Self {
+        // Set up the collect asset config
+        manganis_cli_support::Config::default()
+            .with_assets_serve_location("/")
+            .save();
+        Self {}
+    }
+}
+
+impl Drop for WebAssetConfigDropGuard {
+    fn drop(&mut self) {
+        // Reset the config
+        manganis_cli_support::Config::default().save();
+    }
+}

packages/cli/src/cli/build.rs

@@ -1,6 +1,8 @@
-use crate::cfg::Platform;
 #[cfg(feature = "plugin")]
 use crate::plugin::PluginManager;
+use crate::server::fullstack::FullstackServerEnvGuard;
+use crate::server::fullstack::FullstackWebEnvGuard;
+use crate::{cfg::Platform, WebAssetConfigDropGuard};
 
 use super::*;
 
@@ -13,23 +15,26 @@ pub struct Build {
 }
 
 impl Build {
-    pub fn build(self, bin: Option<PathBuf>) -> Result<()> {
+    pub fn build(self, bin: Option<PathBuf>, target_dir: Option<&std::path::Path>) -> Result<()> {
         let mut crate_config = crate::CrateConfig::new(bin)?;
+        if let Some(target_dir) = target_dir {
+            crate_config.target_dir = target_dir.to_path_buf();
+        }
 
         // change the release state.
         crate_config.with_release(self.build.release);
         crate_config.with_verbose(self.build.verbose);
 
         if self.build.example.is_some() {
-            crate_config.as_example(self.build.example.unwrap());
+            crate_config.as_example(self.build.example.clone().unwrap());
         }
 
         if self.build.profile.is_some() {
-            crate_config.set_profile(self.build.profile.unwrap());
+            crate_config.set_profile(self.build.profile.clone().unwrap());
         }
 
         if self.build.features.is_some() {
-            crate_config.set_features(self.build.features.unwrap());
+            crate_config.set_features(self.build.features.clone().unwrap());
         }
 
         let platform = self
@@ -37,25 +42,56 @@ impl Build {
             .platform
             .unwrap_or(crate_config.dioxus_config.application.default_platform);
 
-        if let Some(target) = self.build.target {
+        if let Some(target) = self.build.target.clone() {
             crate_config.set_target(target);
         }
 
-        crate_config.set_cargo_args(self.build.cargo_args);
+        crate_config.set_cargo_args(self.build.cargo_args.clone());
 
         // #[cfg(feature = "plugin")]
         // let _ = PluginManager::on_build_start(&crate_config, &platform);
 
         match platform {
             Platform::Web => {
-                crate::builder::build(&crate_config, true)?;
+                crate::builder::build(&crate_config, false, self.build.skip_assets)?;
             }
             Platform::Desktop => {
-                crate::builder::build_desktop(&crate_config, false)?;
+                crate::builder::build_desktop(&crate_config, false, self.build.skip_assets)?;
+            }
+            Platform::Fullstack => {
+                // Fullstack mode must be built with web configs on the desktop (server) binary as well as the web binary
+                let _config = WebAssetConfigDropGuard::new();
+                {
+                    let mut web_config = crate_config.clone();
+                    let _gaurd = FullstackWebEnvGuard::new(&self.build);
+                    let web_feature = self.build.client_feature;
+                    let features = &mut web_config.features;
+                    match features {
+                        Some(features) => {
+                            features.push(web_feature);
+                        }
+                        None => web_config.features = Some(vec![web_feature]),
+                    };
+                    crate::builder::build(&crate_config, false, self.build.skip_assets)?;
+                }
+                {
+                    let mut desktop_config = crate_config.clone();
+                    let desktop_feature = self.build.server_feature;
+                    let features = &mut desktop_config.features;
+                    match features {
+                        Some(features) => {
+                            features.push(desktop_feature);
+                        }
+                        None => desktop_config.features = Some(vec![desktop_feature]),
+                    };
+                    let _gaurd =
+                        FullstackServerEnvGuard::new(self.build.force_debug, self.build.release);
+                    crate::builder::build_desktop(&desktop_config, false, self.build.skip_assets)?;
+                }
             }
         }
 
-        let temp = gen_page(&crate_config.dioxus_config, false);
+        let temp = gen_page(&crate_config, false, self.build.skip_assets);
 
         let mut file = std::fs::File::create(
             crate_config

packages/cli/src/cli/bundle.rs

@@ -83,7 +83,7 @@ impl Bundle {
         crate_config.set_cargo_args(self.build.cargo_args);
 
         // build the desktop app
-        build_desktop(&crate_config, false)?;
+        build_desktop(&crate_config, false, false)?;
 
         // copy the binary to the out dir
         let package = crate_config.manifest.package.unwrap();
@@ -134,6 +134,19 @@ impl Bundle {
             }
         }
 
+        // Add all assets from collect assets to the bundle
+        {
+            let config = manganis_cli_support::Config::current();
+            let location = config.assets_serve_location().to_string();
+            let location = format!("./{}", location);
+            println!("Adding assets from {} to bundle", location);
+            if let Some(resources) = &mut bundle_settings.resources {
+                resources.push(location);
+            } else {
+                bundle_settings.resources = Some(vec![location]);
+            }
+        }
+
         let mut settings = SettingsBuilder::new()
             .project_out_directory(crate_config.out_dir)
             .package_settings(PackageSettings {

packages/cli/src/cli/cfg.rs

@@ -11,6 +11,11 @@ pub struct ConfigOptsBuild {
     #[serde(default)]
     pub release: bool,
 
+    /// This flag only applies to fullstack builds. By default fullstack builds will run with something in between debug and release mode. This flag will force the build to run in debug mode. [default: false]
+    #[clap(long)]
+    #[serde(default)]
+    pub force_debug: bool,
+
     // Use verbose output [default: false]
     #[clap(long)]
     #[serde(default)]
@@ -28,10 +33,23 @@ pub struct ConfigOptsBuild {
     #[clap(long, value_enum)]
     pub platform: Option<Platform>,
 
+    /// Skip collecting assets from dependencies [default: false]
+    #[clap(long)]
+    #[serde(default)]
+    pub skip_assets: bool,
+
     /// Space separated list of features to activate
     #[clap(long)]
     pub features: Option<Vec<String>>,
 
+    /// The feature to use for the client in a fullstack app [default: "web"]
+    #[clap(long, default_value_t = { "web".to_string() })]
+    pub client_feature: String,
+
+    /// The feature to use for the server in a fullstack app [default: "ssr"]
+    #[clap(long, default_value_t = { "ssr".to_string() })]
+    pub server_feature: String,
+
     /// Rustc platform triple
     #[clap(long)]
     pub target: Option<String>,
@@ -41,6 +59,25 @@ pub struct ConfigOptsBuild {
     pub cargo_args: Vec<String>,
 }
 
+impl From<ConfigOptsServe> for ConfigOptsBuild {
+    fn from(serve: ConfigOptsServe) -> Self {
+        Self {
+            target: serve.target,
+            release: serve.release,
+            verbose: serve.verbose,
+            example: serve.example,
+            profile: serve.profile,
+            platform: serve.platform,
+            features: serve.features,
+            client_feature: serve.client_feature,
+            server_feature: serve.server_feature,
+            skip_assets: serve.skip_assets,
+            force_debug: serve.force_debug,
+            cargo_args: serve.cargo_args,
+        }
+    }
+}
+
 #[derive(Clone, Debug, Default, Deserialize, Parser)]
 pub struct ConfigOptsServe {
     /// Port of dev server
@@ -62,6 +99,11 @@ pub struct ConfigOptsServe {
     #[serde(default)]
     pub release: bool,
 
+    /// This flag only applies to fullstack builds. By default fullstack builds will run with something in between debug and release mode. This flag will force the build to run in debug mode. [default: false]
+    #[clap(long)]
+    #[serde(default)]
+    pub force_debug: bool,
+
     // Use verbose output [default: false]
     #[clap(long)]
     #[serde(default)]
@@ -71,7 +113,7 @@ pub struct ConfigOptsServe {
     #[clap(long)]
     pub profile: Option<String>,
 
-    /// Build platform: support Web & Desktop [default: "default_platform"]
+    /// Build platform: support Web, Desktop, and Fullstack [default: "default_platform"]
     #[clap(long, value_enum)]
     pub platform: Option<Platform>,
 
@@ -90,6 +132,19 @@ pub struct ConfigOptsServe {
     #[clap(long)]
     pub features: Option<Vec<String>>,
 
+    /// Skip collecting assets from dependencies [default: false]
+    #[clap(long)]
+    #[serde(default)]
+    pub skip_assets: bool,
+
+    /// The feature to use for the client in a fullstack app [default: "web"]
+    #[clap(long, default_value_t = { "web".to_string() })]
+    pub client_feature: String,
+
+    /// The feature to use for the server in a fullstack app [default: "ssr"]
+    #[clap(long, default_value_t = { "ssr".to_string() })]
+    pub server_feature: String,
+
     /// Rustc platform triple
     #[clap(long)]
     pub target: Option<String>,
@@ -107,6 +162,9 @@ pub enum Platform {
     #[clap(name = "desktop")]
     #[serde(rename = "desktop")]
     Desktop,
+    #[clap(name = "fullstack")]
+    #[serde(rename = "fullstack")]
+    Fullstack,
 }
 
 /// Config options for the bundling system.

packages/cli/src/cli/clean.rs

@@ -28,6 +28,12 @@ impl Clean {
             remove_dir_all(crate_config.crate_dir.join(&out_dir))?;
         }
 
+        let fullstack_out_dir = crate_config.crate_dir.join(".dioxus");
+
+        if fullstack_out_dir.is_dir() {
+            remove_dir_all(fullstack_out_dir)?;
+        }
+
         Ok(())
     }
 }

packages/cli/src/cli/serve.rs

@@ -12,6 +12,7 @@ pub struct Serve {
 impl Serve {
     pub async fn serve(self, bin: Option<PathBuf>) -> Result<()> {
         let mut crate_config = crate::CrateConfig::new(bin)?;
+        let serve_cfg = self.serve.clone();
 
         // change the relase state.
         crate_config.with_hot_reload(self.serve.hot_reload);
@@ -48,21 +49,29 @@ impl Serve {
         match platform {
             cfg::Platform::Web => {
                 // generate dev-index page
-                Serve::regen_dev_page(&crate_config)?;
+                Serve::regen_dev_page(&crate_config, self.serve.skip_assets)?;
 
                 // start the develop server
-                server::web::startup(self.serve.port, crate_config.clone(), self.serve.open)
-                    .await?;
+                server::web::startup(
+                    self.serve.port,
+                    crate_config.clone(),
+                    self.serve.open,
+                    self.serve.skip_assets,
+                )
+                .await?;
             }
             cfg::Platform::Desktop => {
-                server::desktop::startup(crate_config.clone()).await?;
+                server::desktop::startup(crate_config.clone(), &serve_cfg).await?;
+            }
+            cfg::Platform::Fullstack => {
+                server::fullstack::startup(crate_config.clone(), &serve_cfg).await?;
             }
         }
         Ok(())
     }
 
-    pub fn regen_dev_page(crate_config: &CrateConfig) -> Result<()> {
-        let serve_html = gen_page(&crate_config.dioxus_config, true);
+    pub fn regen_dev_page(crate_config: &CrateConfig, skip_assets: bool) -> Result<()> {
+        let serve_html = gen_page(crate_config, true, skip_assets);
 
         let dist_path = crate_config.crate_dir.join(
             crate_config

packages/cli/src/config.rs

@@ -1,4 +1,6 @@
 use crate::{cfg::Platform, error::Result};
+use manganis_cli_support::AssetManifest;
+use manganis_cli_support::AssetManifestExt;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,
@@ -303,6 +305,13 @@ impl CrateConfig {
         })
     }
 
+    pub fn asset_manifest(&self) -> AssetManifest {
+        AssetManifest::load_from_path(
+            self.crate_dir.join("Cargo.toml"),
+            self.workspace_dir.join("Cargo.lock"),
+        )
+    }
+
     pub fn as_example(&mut self, example_name: String) -> &mut Self {
         self.executable = ExecutableType::Example(example_name);
         self

packages/cli/src/main.rs

@@ -63,7 +63,7 @@ async fn main() -> anyhow::Result<()> {
             .map_err(|e| anyhow!("🚫 Translation of HTML into RSX failed: {}", e)),
 
         Build(opts) if bin.is_ok() => opts
-            .build(Some(bin.unwrap().clone()))
+            .build(Some(bin.unwrap().clone()), None)
             .map_err(|e| anyhow!("🚫 Building project failed: {}", e)),
 
         Clean(opts) if bin.is_ok() => opts

packages/cli/src/server/desktop/mod.rs

@@ -1,11 +1,12 @@
+use crate::server::Platform;
 use crate::{
+    cfg::ConfigOptsServe,
     server::{
         output::{print_console_info, PrettierOptions},
         setup_file_watcher,
     },
     BuildResult, CrateConfig, Result,
 };
-
 use dioxus_hot_reload::HotReloadMsg;
 use dioxus_html::HtmlCtx;
 use dioxus_rsx::hot_reload::*;
@@ -21,7 +22,14 @@ use plugin::PluginManager;
 
 use super::HotReloadState;
 
-pub async fn startup(config: CrateConfig) -> Result<()> {
+pub async fn startup(config: CrateConfig, serve: &ConfigOptsServe) -> Result<()> {
+    startup_with_platform::<DesktopPlatform>(config, serve).await
+}
+
+pub(crate) async fn startup_with_platform<P: Platform + Send + 'static>(
+    config: CrateConfig,
+    serve_cfg: &ConfigOptsServe,
+) -> Result<()> {
     // ctrl-c shutdown checker
     let _crate_config = config.clone();
     let _ = ctrlc::set_handler(move || {
@@ -51,15 +59,18 @@ pub async fn startup(config: CrateConfig) -> Result<()> {
         false => None,
     };
 
-    serve(config, hot_reload_state).await?;
+    serve::<P>(config, serve_cfg, hot_reload_state).await?;
 
     Ok(())
 }
 
 /// Start the server without hot reload
-pub async fn serve(config: CrateConfig, hot_reload_state: Option<HotReloadState>) -> Result<()> {
-    let (child, first_build_result) = start_desktop(&config)?;
-    let currently_running_child: RwLock<Child> = RwLock::new(child);
+async fn serve<P: Platform + Send + 'static>(
+    config: CrateConfig,
+    serve: &ConfigOptsServe,
+    hot_reload_state: Option<HotReloadState>,
+) -> Result<()> {
+    let platform = RwLock::new(P::start(&config, serve)?);
 
     log::info!("🚀 Starting development server...");
 
@@ -68,15 +79,7 @@ pub async fn serve(config: CrateConfig, hot_reload_state: Option<HotReloadState>
     let _watcher = setup_file_watcher(
         {
             let config = config.clone();
-
-            move || {
-                let mut current_child = currently_running_child.write().unwrap();
-                log::trace!("Killing old process");
-                current_child.kill()?;
-                let (child, result) = start_desktop(&config)?;
-                *current_child = child;
-                Ok(result)
-            }
+            move || platform.write().unwrap().rebuild(&config)
         },
         &config,
         None,
@@ -84,19 +87,9 @@ pub async fn serve(config: CrateConfig, hot_reload_state: Option<HotReloadState>
     )
     .await?;
 
-    // Print serve info
-    print_console_info(
-        &config,
-        PrettierOptions {
-            changed: vec![],
-            warnings: first_build_result.warnings,
-            elapsed_time: first_build_result.elapsed_time,
-        },
-        None,
-    );
-
     match hot_reload_state {
         Some(hot_reload_state) => {
+            // The open interprocess sockets
             start_desktop_hot_reload(hot_reload_state).await?;
         }
         None => {
@@ -192,7 +185,7 @@ async fn start_desktop_hot_reload(hot_reload_state: HotReloadState) -> Result<()
 }
 
 fn clear_paths(file_socket_path: &std::path::Path) {
-    if cfg!(target_os = "macos") {
+    if cfg!(unix) {
         // On unix, if you force quit the application, it can leave the file socket open
         // This will cause the local socket listener to fail to open
         // We check if the file socket is already open from an old session and then delete it
@@ -217,10 +210,9 @@ fn send_msg(msg: HotReloadMsg, channel: &mut impl std::io::Write) -> bool {
     }
 }
 
-pub fn start_desktop(config: &CrateConfig) -> Result<(Child, BuildResult)> {
+fn start_desktop(config: &CrateConfig, skip_assets: bool) -> Result<(RAIIChild, BuildResult)> {
     // Run the desktop application
-    log::trace!("Building application");
-    let result = crate::builder::build_desktop(config, true)?;
+    let result = crate::builder::build_desktop(config, true, skip_assets)?;
 
     match &config.executable {
         crate::ExecutableType::Binary(name)
@@ -230,10 +222,58 @@ pub fn start_desktop(config: &CrateConfig) -> Result<(Child, BuildResult)> {
             if cfg!(windows) {
                 file.set_extension("exe");
             }
-            log::trace!("Running application from {:?}", file);
-            let child = Command::new(file.to_str().unwrap()).spawn()?;
+            let active = "DIOXUS_ACTIVE";
+            let child = RAIIChild(
+                Command::new(file.to_str().unwrap())
+                    .env(active, "true")
+                    .spawn()?,
+            );
 
             Ok((child, result))
         }
     }
 }
+
+pub(crate) struct DesktopPlatform {
+    currently_running_child: RAIIChild,
+    skip_assets: bool,
+}
+
+impl Platform for DesktopPlatform {
+    fn start(config: &CrateConfig, serve: &ConfigOptsServe) -> Result<Self> {
+        let (child, first_build_result) = start_desktop(config, serve.skip_assets)?;
+
+        log::info!("🚀 Starting development server...");
+
+        // Print serve info
+        print_console_info(
+            config,
+            PrettierOptions {
+                changed: vec![],
+                warnings: first_build_result.warnings,
+                elapsed_time: first_build_result.elapsed_time,
+            },
+            None,
+        );
+
+        Ok(Self {
+            currently_running_child: child,
+            skip_assets: serve.skip_assets,
+        })
+    }
+
+    fn rebuild(&mut self, config: &CrateConfig) -> Result<BuildResult> {
+        self.currently_running_child.0.kill()?;
+        let (child, result) = start_desktop(config, self.skip_assets)?;
+        self.currently_running_child = child;
+        Ok(result)
+    }
+}
+
+struct RAIIChild(Child);
+
+impl Drop for RAIIChild {
+    fn drop(&mut self) {
+        let _ = self.0.kill();
+    }
+}

packages/cli/src/server/fullstack/mod.rs

@@ -0,0 +1,161 @@
+use crate::{
+    cfg::{ConfigOptsBuild, ConfigOptsServe},
+    CrateConfig, Result, WebAssetConfigDropGuard,
+};
+
+use super::{desktop, Platform};
+
+pub async fn startup(config: CrateConfig, serve: &ConfigOptsServe) -> Result<()> {
+    desktop::startup_with_platform::<FullstackPlatform>(config, serve).await
+}
+
+fn start_web_build_thread(
+    config: &CrateConfig,
+    serve: &ConfigOptsServe,
+) -> std::thread::JoinHandle<Result<()>> {
+    let serve = serve.clone();
+    let target_directory = config.crate_dir.join(".dioxus").join("web");
+    std::fs::create_dir_all(&target_directory).unwrap();
+    std::thread::spawn(move || build_web(serve, &target_directory))
+}
+
+struct FullstackPlatform {
+    serve: ConfigOptsServe,
+    desktop: desktop::DesktopPlatform,
+    _config: WebAssetConfigDropGuard,
+}
+
+impl Platform for FullstackPlatform {
+    fn start(config: &CrateConfig, serve: &ConfigOptsServe) -> Result<Self>
+    where
+        Self: Sized,
+    {
+        let thread_handle = start_web_build_thread(config, serve);
+
+        let mut desktop_config = config.clone();
+        let desktop_feature = serve.server_feature.clone();
+        let features = &mut desktop_config.features;
+        match features {
+            Some(features) => {
+                features.push(desktop_feature);
+            }
+            None => desktop_config.features = Some(vec![desktop_feature]),
+        };
+        let config = WebAssetConfigDropGuard::new();
+        let desktop = desktop::DesktopPlatform::start(&desktop_config, serve)?;
+        thread_handle
+            .join()
+            .map_err(|_| anyhow::anyhow!("Failed to join thread"))??;
+
+        Ok(Self {
+            desktop,
+            serve: serve.clone(),
+            _config: config,
+        })
+    }
+
+    fn rebuild(&mut self, crate_config: &CrateConfig) -> Result<crate::BuildResult> {
+        let thread_handle = start_web_build_thread(crate_config, &self.serve);
+        let result = {
+            let mut desktop_config = crate_config.clone();
+            let desktop_feature = self.serve.server_feature.clone();
+            let features = &mut desktop_config.features;
+            match features {
+                Some(features) => {
+                    features.push(desktop_feature);
+                }
+                None => desktop_config.features = Some(vec![desktop_feature]),
+            };
+            let _gaurd = FullstackServerEnvGuard::new(self.serve.force_debug, self.serve.release);
+            self.desktop.rebuild(&desktop_config)
+        };
+        thread_handle
+            .join()
+            .map_err(|_| anyhow::anyhow!("Failed to join thread"))??;
+        result
+    }
+}
+
+fn build_web(serve: ConfigOptsServe, target_directory: &std::path::Path) -> Result<()> {
+    let mut web_config: ConfigOptsBuild = serve.into();
+    let web_feature = web_config.client_feature.clone();
+    let features = &mut web_config.features;
+    match features {
+        Some(features) => {
+            features.push(web_feature);
+        }
+        None => web_config.features = Some(vec![web_feature]),
+    };
+    web_config.platform = Some(crate::cfg::Platform::Web);
+
+    let _gaurd = FullstackWebEnvGuard::new(&web_config);
+    crate::cli::build::Build { build: web_config }.build(None, Some(target_directory))
+}
+
+// Debug mode web builds have a very large size by default. If debug mode is not enabled, we strip some of the debug info by default
+// This reduces a hello world from ~40MB to ~2MB
+pub(crate) struct FullstackWebEnvGuard {
+    old_rustflags: Option<String>,
+}
+
+impl FullstackWebEnvGuard {
+    pub fn new(serve: &ConfigOptsBuild) -> Self {
+        Self {
+            old_rustflags: (!serve.force_debug).then(|| {
+                let old_rustflags = std::env::var("RUSTFLAGS").unwrap_or_default();
+                let debug_assertions = if serve.release {
+                    ""
+                } else {
+                    " -C debug-assertions"
+                };
+
+                std::env::set_var(
+                    "RUSTFLAGS",
+                    format!(
+                        "{old_rustflags} -C debuginfo=none -C strip=debuginfo{debug_assertions}"
+                    ),
+                );
+                old_rustflags
+            }),
+        }
+    }
+}
+
+impl Drop for FullstackWebEnvGuard {
+    fn drop(&mut self) {
+        if let Some(old_rustflags) = self.old_rustflags.take() {
+            std::env::set_var("RUSTFLAGS", old_rustflags);
+        }
+    }
+}
+
+// Debug mode web builds have a very large size by default. If debug mode is not enabled, we strip some of the debug info by default
+// This reduces a hello world from ~40MB to ~2MB
+pub(crate) struct FullstackServerEnvGuard {
+    old_rustflags: Option<String>,
+}
+
+impl FullstackServerEnvGuard {
+    pub fn new(debug: bool, release: bool) -> Self {
+        Self {
+            old_rustflags: (!debug).then(|| {
+                let old_rustflags = std::env::var("RUSTFLAGS").unwrap_or_default();
+                let debug_assertions = if release { "" } else { " -C debug-assertions" };
+
+                std::env::set_var(
+                    "RUSTFLAGS",
+                    format!("{old_rustflags} -C opt-level=2 {debug_assertions}"),
+                );
+                old_rustflags
+            }),
+        }
+    }
+}
+
+impl Drop for FullstackServerEnvGuard {
+    fn drop(&mut self) {
+        if let Some(old_rustflags) = self.old_rustflags.take() {
+            std::env::set_var("RUSTFLAGS", old_rustflags);
+        }
+    }
+}

packages/cli/src/server/mod.rs

@@ -1,4 +1,4 @@
-use crate::{BuildResult, CrateConfig, Result};
+use crate::{cfg::ConfigOptsServe, BuildResult, CrateConfig, Result};
 
 use cargo_metadata::diagnostic::Diagnostic;
 use dioxus_core::Template;
@@ -14,6 +14,7 @@ use tokio::sync::broadcast::{self};
 mod output;
 use output::*;
 pub mod desktop;
+pub mod fullstack;
 pub mod web;
 
 /// Sets up a file watcher
@@ -141,6 +142,13 @@ async fn setup_file_watcher<F: Fn() -> Result<BuildResult> + Send + 'static>(
     Ok(watcher)
 }
 
+pub(crate) trait Platform {
+    fn start(config: &CrateConfig, serve: &ConfigOptsServe) -> Result<Self>
+    where
+        Self: Sized;
+    fn rebuild(&mut self, config: &CrateConfig) -> Result<BuildResult>;
+}
+
 #[derive(Clone)]
 pub struct HotReloadState {
     pub messages: broadcast::Sender<Template<'static>>,

packages/cli/src/server/web/mod.rs

@@ -48,7 +48,12 @@ struct WsReloadState {
     update: broadcast::Sender<()>,
 }
 
-pub async fn startup(port: u16, config: CrateConfig, start_browser: bool) -> Result<()> {
+pub async fn startup(
+    port: u16,
+    config: CrateConfig,
+    start_browser: bool,
+    skip_assets: bool,
+) -> Result<()> {
     // ctrl-c shutdown checker
     let _crate_config = config.clone();
     let _ = ctrlc::set_handler(move || {
@@ -80,7 +85,15 @@ pub async fn startup(port: u16, config: CrateConfig, start_browser: bool) -> Res
         false => None,
     };
 
-    serve(ip, port, config, start_browser, hot_reload_state).await?;
+    serve(
+        ip,
+        port,
+        config,
+        start_browser,
+        skip_assets,
+        hot_reload_state,
+    )
+    .await?;
 
     Ok(())
 }
@@ -91,9 +104,10 @@ pub async fn serve(
     port: u16,
     config: CrateConfig,
     start_browser: bool,
+    skip_assets: bool,
     hot_reload_state: Option<HotReloadState>,
 ) -> Result<()> {
-    let first_build_result = crate::builder::build(&config, true)?;
+    let first_build_result = crate::builder::build(&config, false, skip_assets)?;
 
     log::info!("🚀 Starting development server...");
 
@@ -106,7 +120,7 @@ pub async fn serve(
         {
             let config = config.clone();
             let reload_tx = reload_tx.clone();
-            move || build(&config, &reload_tx)
+            move || build(&config, &reload_tx, skip_assets)
         },
         &config,
         Some(WebServerInfo {
@@ -420,8 +434,8 @@ async fn ws_handler(
     })
 }
 
-fn build(config: &CrateConfig, reload_tx: &Sender<()>) -> Result<BuildResult> {
-    let result = builder::build(config, true)?;
+fn build(config: &CrateConfig, reload_tx: &Sender<()>, skip_assets: bool) -> Result<BuildResult> {
+    let result = builder::build(config, true, skip_assets)?;
     // change the websocket reload state to true;
     // the page will auto-reload.
     if config
@@ -431,7 +445,7 @@ fn build(config: &CrateConfig, reload_tx: &Sender<()>) -> Result<BuildResult> {
         .reload_html
         .unwrap_or(false)
     {
-        let _ = Serve::regen_dev_page(config);
+        let _ = Serve::regen_dev_page(config, skip_assets);
     }
     let _ = reload_tx.send(());
     Ok(result)

packages/core/Cargo.toml

@@ -33,6 +33,7 @@ serde = { version = "1", features = ["derive"], optional = true }
 [dev-dependencies]
 tokio = { workspace = true, features = ["full"] }
 dioxus = { workspace = true }
+dioxus-html = { workspace = true, features = ["serialize"] }
 pretty_assertions = "1.3.0"
 rand = "0.8.5"
 dioxus-ssr = { workspace = true }

packages/core/src/events.rs

@@ -28,6 +28,27 @@ pub struct Event<T: 'static + ?Sized> {
 }
 
 impl<T> Event<T> {
+    /// Map the event data to a new type
+    ///
+    /// # Example
+    ///
+    /// ```rust, ignore
+    /// rsx! {
+    ///    button {
+    ///       onclick: move |evt: Event<FormData>| {
+    ///          let data = evt.map(|data| data.value());
+    ///          assert_eq!(data.inner(), "hello world");
+    ///       }
+    ///    }
+    /// }
+    /// ```
+    pub fn map<U: 'static, F: FnOnce(&T) -> U>(&self, f: F) -> Event<U> {
+        Event {
+            data: Rc::new(f(&self.data)),
+            propagates: self.propagates.clone(),
+        }
+    }
+
     /// Prevent this event from continuing to bubble up the tree to parent elements.
     ///
     /// # Example

packages/core/tests/event_propagation.rs

@@ -6,11 +6,13 @@ static CLICKS: Mutex<usize> = Mutex::new(0);
 
 #[test]
 fn events_propagate() {
+    set_event_converter(Box::new(dioxus_html::SerializedHtmlEventConverter));
+
     let mut dom = VirtualDom::new(app);
     _ = dom.rebuild();
 
     // Top-level click is registered
-    dom.handle_event("click", Rc::new(MouseData::default()), ElementId(1), true);
+    dom.handle_event("click", Rc::new(PlatformEventData::new(Box::<SerializedMouseData>::default())), ElementId(1), true);
     assert_eq!(*CLICKS.lock().unwrap(), 1);
 
     // break reference....
@@ -20,7 +22,7 @@ fn events_propagate() {
     }
 
     // Lower click is registered
-    dom.handle_event("click", Rc::new(MouseData::default()), ElementId(2), true);
+    dom.handle_event("click", Rc::new(PlatformEventData::new(Box::<SerializedMouseData>::default())), ElementId(2), true);
     assert_eq!(*CLICKS.lock().unwrap(), 3);
 
     // break reference....
@@ -30,14 +32,13 @@ fn events_propagate() {
     }
 
     // Stop propagation occurs
-    dom.handle_event("click", Rc::new(MouseData::default()), ElementId(2), true);
+    dom.handle_event("click", Rc::new(PlatformEventData::new(Box::<SerializedMouseData>::default())), ElementId(2), true);
     assert_eq!(*CLICKS.lock().unwrap(), 3);
 }
 
 fn app(cx: Scope) -> Element {
     render! {
-        div {
-            onclick: move |_| {
+        div { onclick: move |_| {
                 println!("top clicked");
                 *CLICKS.lock().unwrap() += 1;
             },
@@ -53,17 +54,14 @@ fn app(cx: Scope) -> Element {
 
 fn problematic_child(cx: Scope) -> Element {
     render! {
-        button {
-            onclick: move |evt| {
+        button { onclick: move |evt| {
                 println!("bottom clicked");
                 let mut clicks = CLICKS.lock().unwrap();
-
                 if *clicks == 3 {
                     evt.stop_propagation();
                 } else {
                     *clicks += 1;
                 }
-            }
-        }
+            } }
     }
 }

packages/core/tests/lifecycle.rs

@@ -4,6 +4,7 @@
 //! Tests for the lifecycle of components.
 use dioxus::core::{ElementId, Mutation::*};
 use dioxus::prelude::*;
+use dioxus_html::SerializedHtmlEventConverter;
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 
@@ -39,6 +40,7 @@ fn manual_diffing() {
 
 #[test]
 fn events_generate() {
+    set_event_converter(Box::new(SerializedHtmlEventConverter));
     fn app(cx: Scope) -> Element {
         let count = cx.use_hook(|| 0);
 
@@ -56,7 +58,12 @@ fn events_generate() {
     let mut dom = VirtualDom::new(app);
     _ = dom.rebuild();
 
-    dom.handle_event("click", Rc::new(MouseData::default()), ElementId(1), true);
+    dom.handle_event(
+        "click",
+        Rc::new(PlatformEventData::new(Box::<SerializedMouseData>::default())),
+        ElementId(1),
+        true,
+    );
 
     dom.mark_dirty(ScopeId::ROOT);
     let edits = dom.render_immediate();

packages/core/tests/miri_full_app.rs

@@ -1,15 +1,23 @@
+use crate::dioxus_elements::SerializedMouseData;
 use dioxus::prelude::*;
 use dioxus_core::ElementId;
+use dioxus_elements::SerializedHtmlEventConverter;
 use std::rc::Rc;
 
 #[test]
 fn miri_rollover() {
+    set_event_converter(Box::new(SerializedHtmlEventConverter));
     let mut dom = VirtualDom::new(App);
 
     _ = dom.rebuild();
 
     for _ in 0..3 {
-        dom.handle_event("click", Rc::new(MouseData::default()), ElementId(2), true);
+        dom.handle_event(
+            "click",
+            Rc::new(PlatformEventData::new(Box::<SerializedMouseData>::default())),
+            ElementId(2),
+            true,
+        );
         dom.process_events();
         _ = dom.render_immediate();
     }

packages/core/tests/task.rs

@@ -1,13 +1,33 @@
 //! Verify that tasks get polled by the virtualdom properly, and that we escape wait_for_work safely
 
-use dioxus::prelude::*;
-use std::{sync::atomic::AtomicUsize, time::Duration};
-
-static POLL_COUNT: AtomicUsize = AtomicUsize::new(0);
-
 #[cfg(not(miri))]
 #[tokio::test]
 async fn it_works() {
+    use dioxus::prelude::*;
+    use std::{sync::atomic::AtomicUsize, time::Duration};
+
+    static POLL_COUNT: AtomicUsize = AtomicUsize::new(0);
+
+    fn app(cx: Scope) -> Element {
+        cx.use_hook(|| {
+            cx.spawn(async {
+                for x in 0..10 {
+                    tokio::time::sleep(Duration::from_micros(50)).await;
+                    POLL_COUNT.fetch_add(x, std::sync::atomic::Ordering::Relaxed);
+                }
+            });
+
+            cx.spawn(async {
+                for x in 0..10 {
+                    tokio::time::sleep(Duration::from_micros(25)).await;
+                    POLL_COUNT.fetch_add(x * 2, std::sync::atomic::Ordering::Relaxed);
+                }
+            });
+        });
+
+        cx.render(rsx!(()))
+    }
+
     let mut dom = VirtualDom::new(app);
 
     let _ = dom.rebuild();
@@ -24,23 +44,3 @@ async fn it_works() {
         135
     );
 }
-
-fn app(cx: Scope) -> Element {
-    cx.use_hook(|| {
-        cx.spawn(async {
-            for x in 0..10 {
-                tokio::time::sleep(Duration::from_micros(50)).await;
-                POLL_COUNT.fetch_add(x, std::sync::atomic::Ordering::Relaxed);
-            }
-        });
-
-        cx.spawn(async {
-            for x in 0..10 {
-                tokio::time::sleep(Duration::from_micros(25)).await;
-                POLL_COUNT.fetch_add(x * 2, std::sync::atomic::Ordering::Relaxed);
-            }
-        });
-    });
-
-    cx.render(rsx!(()))
-}

packages/desktop/Cargo.toml

@@ -11,14 +11,14 @@ keywords = ["dom", "ui", "gui", "react"]
 
 [dependencies]
 dioxus-core = { workspace = true, features = ["serialize"] }
-dioxus-html = { workspace = true, features = ["serialize", "native-bind"] }
+dioxus-html = { workspace = true, features = ["serialize", "native-bind", "mounted", "eval"] }
 dioxus-interpreter-js = { workspace = true, features = ["binary-protocol"] }
 dioxus-hot-reload = { workspace = true, optional = true }
 
 serde = "1.0.136"
 serde_json = "1.0.79"
 thiserror = { workspace = true }
-tracing = { workspace = true }
+tracing.workspace = true
 wry = { version = "0.34.0", default-features = false, features = ["tao", "protocol", "file-drop"] }
 futures-channel = { workspace = true }
 tokio = { workspace = true, features = [
@@ -40,8 +40,9 @@ urlencoding = "2.1.2"
 async-trait = "0.1.68"
 crossbeam-channel = "0.5.8"
 
-
 [target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux",target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies]
+# This is only for debug mode, and it appears mobile does not support some packages this uses
+manganis-cli-support = { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] }
 rfd = "0.12"
 global-hotkey = { git = "https://github.com/tauri-apps/global-hotkey" }
 

packages/desktop/headless_tests/events.rs

@@ -17,7 +17,7 @@ pub(crate) fn check_app_exits(app: Component) {
 
     dioxus_desktop::launch_cfg(
         app,
-        Config::new().with_window(WindowBuilder::new().with_visible(false)),
+        Config::new().with_window(WindowBuilder::new().with_visible(true)),
     );
 
     // Stop deadman's switch
@@ -221,7 +221,7 @@ fn app(cx: Scope) -> Element {
         desktop_context.close();
     }
 
-    cx.render(rsx! {
+    render! {
         div {
             button {
                 id: "button",
@@ -229,14 +229,11 @@ fn app(cx: Scope) -> Element {
                     println!("{:?}", event.data);
                     assert!(event.data.modifiers().is_empty());
                     assert!(event.data.held_buttons().is_empty());
-                    assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Primary));
-                    received_events.modify(|x| *x + 1)
-                },
                     assert_eq!(
                         event.data.trigger_button(),
                         Some(dioxus_html::input_data::MouseButton::Primary),
                     );
-                    recieved_events.modify(|x| *x + 1)
+                    received_events.modify(|x| *x + 1)
                 }
             }
             div {
@@ -244,7 +241,12 @@ fn app(cx: Scope) -> Element {
                 onmousemove: move |event| {
                     println!("{:?}", event.data);
                     assert!(event.data.modifiers().is_empty());
-                    assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Secondary));
+                    assert!(
+                        event
+                            .data
+                            .held_buttons()
+                            .contains(dioxus_html::input_data::MouseButton::Secondary),
+                    );
                     received_events.modify(|x| *x + 1)
                 }
             }
@@ -253,8 +255,16 @@ fn app(cx: Scope) -> Element {
                 onclick: move |event| {
                     println!("{:?}", event.data);
                     assert!(event.data.modifiers().is_empty());
-                    assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Secondary));
-                    assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Secondary));
+                    assert!(
+                        event
+                            .data
+                            .held_buttons()
+                            .contains(dioxus_html::input_data::MouseButton::Secondary),
+                    );
+                    assert_eq!(
+                        event.data.trigger_button(),
+                        Some(dioxus_html::input_data::MouseButton::Secondary),
+                    );
                     received_events.modify(|x| *x + 1)
                 }
             }
@@ -263,9 +273,19 @@ fn app(cx: Scope) -> Element {
                 ondoubleclick: move |event| {
                     println!("{:?}", event.data);
                     assert!(event.data.modifiers().is_empty());
-                    assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Primary));
-                    assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Secondary));
-                    assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Secondary));
+                    assert!(
+                        event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Primary),
+                    );
+                    assert!(
+                        event
+                            .data
+                            .held_buttons()
+                            .contains(dioxus_html::input_data::MouseButton::Secondary),
+                    );
+                    assert_eq!(
+                        event.data.trigger_button(),
+                        Some(dioxus_html::input_data::MouseButton::Secondary),
+                    );
                     received_events.modify(|x| *x + 1)
                 }
             }
@@ -274,8 +294,16 @@ fn app(cx: Scope) -> Element {
                 onmousedown: move |event| {
                     println!("{:?}", event.data);
                     assert!(event.data.modifiers().is_empty());
-                    assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Secondary));
-                    assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Secondary));
+                    assert!(
+                        event
+                            .data
+                            .held_buttons()
+                            .contains(dioxus_html::input_data::MouseButton::Secondary),
+                    );
+                    assert_eq!(
+                        event.data.trigger_button(),
+                        Some(dioxus_html::input_data::MouseButton::Secondary),
+                    );
                     received_events.modify(|x| *x + 1)
                 }
             }
@@ -285,7 +313,10 @@ fn app(cx: Scope) -> Element {
                     println!("{:?}", event.data);
                     assert!(event.data.modifiers().is_empty());
                     assert!(event.data.held_buttons().is_empty());
-                    assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Primary));
+                    assert_eq!(
+                        event.data.trigger_button(),
+                        Some(dioxus_html::input_data::MouseButton::Primary),
+                    );
                     received_events.modify(|x| *x + 1)
                 }
             }
@@ -309,10 +340,9 @@ fn app(cx: Scope) -> Element {
                     assert!(event.data.modifiers().is_empty());
                     assert_eq!(event.data.key().to_string(), "a");
                     assert_eq!(event.data.code().to_string(), "KeyA");
-                    assert_eq!(event.data.location, 0);
+                    assert_eq!(event.data.location(), Location::Standard);
                     assert!(event.data.is_auto_repeating());
                     received_events.modify(|x| *x + 1)
-
                 }
             }
             input {
@@ -322,7 +352,7 @@ fn app(cx: Scope) -> Element {
                     assert!(event.data.modifiers().is_empty());
                     assert_eq!(event.data.key().to_string(), "a");
                     assert_eq!(event.data.code().to_string(), "KeyA");
-                    assert_eq!(event.data.location, 0);
+                    assert_eq!(event.data.location(), Location::Standard);
                     assert!(!event.data.is_auto_repeating());
                     received_events.modify(|x| *x + 1)
                 }
@@ -334,7 +364,7 @@ fn app(cx: Scope) -> Element {
                     assert!(event.data.modifiers().is_empty());
                     assert_eq!(event.data.key().to_string(), "a");
                     assert_eq!(event.data.code().to_string(), "KeyA");
-                    assert_eq!(event.data.location, 0);
+                    assert_eq!(event.data.location(), Location::Standard);
                     assert!(!event.data.is_auto_repeating());
                     received_events.modify(|x| *x + 1)
                 }
@@ -354,5 +384,5 @@ fn app(cx: Scope) -> Element {
                 }
             }
         }
-    })
+    }
 }

packages/desktop/headless_tests/rendering.rs

@@ -16,7 +16,7 @@ pub(crate) fn check_app_exits(app: Component) {
 
     dioxus_desktop::launch_cfg(
         app,
-        Config::new().with_window(WindowBuilder::new().with_visible(false)),
+        Config::new().with_window(WindowBuilder::new().with_visible(true)),
     );
 
     should_panic.store(false, std::sync::atomic::Ordering::SeqCst);

packages/desktop/src/collect_assets.rs

@@ -0,0 +1,60 @@
+pub fn copy_assets() {
+    #[cfg(all(
+        debug_assertions,
+        any(
+            target_os = "windows",
+            target_os = "macos",
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        )
+    ))]
+    {
+        // The CLI will copy assets to the current working directory
+        if std::env::var_os("DIOXUS_ACTIVE").is_some() {
+            return;
+        }
+        use manganis_cli_support::AssetManifest;
+        use manganis_cli_support::AssetManifestExt;
+        use manganis_cli_support::Config;
+        use std::path::PathBuf;
+        let config = Config::current();
+        let asset_location = config.assets_serve_location();
+        let asset_location = PathBuf::from(asset_location);
+        let _ = std::fs::remove_dir_all(&asset_location);
+
+        println!("Finding assets... (Note: if you run a dioxus desktop application with the CLI. This process will be significantly faster.)");
+        let manifest = AssetManifest::load();
+        let has_assets = manifest
+            .packages()
+            .iter()
+            .any(|package| !package.assets().is_empty());
+
+        if has_assets {
+            println!("Copying and optimizing assets...");
+            manifest.copy_static_assets_to(&asset_location).unwrap();
+            println!("Copied assets to {}", asset_location.display());
+        } else {
+            println!("No assets found");
+        }
+    }
+    #[cfg(not(all(
+        debug_assertions,
+        any(
+            target_os = "windows",
+            target_os = "macos",
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        )
+    )))]
+    {
+        println!(
+            "Skipping assets in release mode. You compile assets with the dioxus-cli in release mode"
+        );
+    }
+}

packages/desktop/src/element.rs

@@ -3,6 +3,7 @@ use dioxus_html::{geometry::euclid::Rect, MountedResult, RenderedElementBacking}
 
 use crate::{desktop_context::DesktopContext, query::QueryEngine};
 
+#[derive(Clone)]
 /// A mounted element passed to onmounted events
 pub struct DesktopElement {
     id: ElementId,
@@ -17,8 +18,8 @@ impl DesktopElement {
 }
 
 impl RenderedElementBacking for DesktopElement {
-    fn get_raw_element(&self) -> dioxus_html::MountedResult<&dyn std::any::Any> {
-        Ok(self)
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
     }
 
     fn get_client_rect(

packages/desktop/src/events.rs

@@ -1,7 +1,10 @@
 //! Convert a serialized event to an event trigger
 
+use dioxus_html::*;
 use serde::{Deserialize, Serialize};
 
+use crate::element::DesktopElement;
+
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct IpcMessage {
     method: String,
@@ -17,3 +20,147 @@ impl IpcMessage {
         self.params
     }
 }
+
+pub(crate) struct SerializedHtmlEventConverter;
+
+impl HtmlEventConverter for SerializedHtmlEventConverter {
+    fn convert_animation_data(&self, event: &PlatformEventData) -> AnimationData {
+        event
+            .downcast::<SerializedAnimationData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_clipboard_data(&self, event: &PlatformEventData) -> ClipboardData {
+        event
+            .downcast::<SerializedClipboardData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_composition_data(&self, event: &PlatformEventData) -> CompositionData {
+        event
+            .downcast::<SerializedCompositionData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_drag_data(&self, event: &PlatformEventData) -> DragData {
+        event
+            .downcast::<SerializedDragData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_focus_data(&self, event: &PlatformEventData) -> FocusData {
+        event
+            .downcast::<SerializedFocusData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_form_data(&self, event: &PlatformEventData) -> FormData {
+        event
+            .downcast::<SerializedFormData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_image_data(&self, event: &PlatformEventData) -> ImageData {
+        event
+            .downcast::<SerializedImageData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_keyboard_data(&self, event: &PlatformEventData) -> KeyboardData {
+        event
+            .downcast::<SerializedKeyboardData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_media_data(&self, event: &PlatformEventData) -> MediaData {
+        event
+            .downcast::<SerializedMediaData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_mounted_data(&self, event: &PlatformEventData) -> MountedData {
+        event.downcast::<DesktopElement>().cloned().unwrap().into()
+    }
+
+    fn convert_mouse_data(&self, event: &PlatformEventData) -> MouseData {
+        event
+            .downcast::<SerializedMouseData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_pointer_data(&self, event: &PlatformEventData) -> PointerData {
+        event
+            .downcast::<SerializedPointerData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_scroll_data(&self, event: &PlatformEventData) -> ScrollData {
+        event
+            .downcast::<SerializedScrollData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_selection_data(&self, event: &PlatformEventData) -> SelectionData {
+        event
+            .downcast::<SerializedSelectionData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_toggle_data(&self, event: &PlatformEventData) -> ToggleData {
+        event
+            .downcast::<SerializedToggleData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_touch_data(&self, event: &PlatformEventData) -> TouchData {
+        event
+            .downcast::<SerializedTouchData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_transition_data(&self, event: &PlatformEventData) -> TransitionData {
+        event
+            .downcast::<SerializedTransitionData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_wheel_data(&self, event: &PlatformEventData) -> WheelData {
+        event
+            .downcast::<SerializedWheelData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+}

packages/desktop/src/lib.rs

@@ -4,6 +4,7 @@
 #![deny(missing_docs)]
 
 mod cfg;
+mod collect_assets;
 mod desktop_context;
 mod element;
 mod escape;
@@ -28,11 +29,12 @@ pub use desktop_context::{
 };
 use desktop_context::{EventData, UserWindowEvent, WebviewQueue, WindowEventHandlers};
 use dioxus_core::*;
-use dioxus_html::{event_bubbles, MountedData};
-use dioxus_html::{native_bind::NativeFileEngine, FormData, HtmlEvent};
+use dioxus_html::{event_bubbles, FileEngine, HasFormData, MountedData, PlatformEventData};
+use dioxus_html::{native_bind::NativeFileEngine, HtmlEvent};
 use dioxus_interpreter_js::binary_protocol::Channel;
 use element::DesktopElement;
 use eval::init_eval;
+use events::SerializedHtmlEventConverter;
 use futures_util::{pin_mut, FutureExt};
 pub use protocol::{use_asset_handler, AssetFuture, AssetHandler, AssetRequest, AssetResponse};
 use rustc_hash::FxHashMap;
@@ -145,6 +147,12 @@ pub fn launch_with_props<P: Clone + 'static>(root: Component<P>, props: P, cfg:
         }
     });
 
+    // Copy over any assets we find
+    crate::collect_assets::copy_assets();
+  
+    // Set the event converter
+    dioxus_html::set_event_converter(Box::new(SerializedHtmlEventConverter));
+
     // We start the tokio runtime *on this thread*
     // Any future we poll later will use this runtime to spawn tasks and for IO
     let rt = tokio::runtime::Builder::new_multi_thread()
@@ -312,7 +320,7 @@ pub fn launch_with_props<P: Clone + 'static>(root: Component<P>, props: P, cfg:
                         let element =
                             DesktopElement::new(element, view.desktop_context.clone(), query);
 
-                        Rc::new(MountedData::new(element))
+                        Rc::new(PlatformEventData::new(Box::new(MountedData::new(element))))
                     } else {
                         data.into_any()
                     };
@@ -368,15 +376,28 @@ pub fn launch_with_props<P: Clone + 'static>(root: Component<P>, props: P, cfg:
                     if let Ok(file_diolog) =
                         serde_json::from_value::<file_upload::FileDialogRequest>(msg.params())
                     {
+                        struct DesktopFileUploadForm {
+                            files: Arc<NativeFileEngine>,
+                        }
+
+                        impl HasFormData for DesktopFileUploadForm {
+                            fn files(&self) -> Option<Arc<dyn FileEngine>> {
+                                Some(self.files.clone())
+                            }
+
+                            fn as_any(&self) -> &dyn std::any::Any {
+                                self
+                            }
+                        }
+
                         let id = ElementId(file_diolog.target);
                         let event_name = &file_diolog.event;
                         let event_bubbles = file_diolog.bubbles;
                         let files = file_upload::get_file_event(&file_diolog);
-                        let data = Rc::new(FormData {
-                            value: Default::default(),
-                            values: Default::default(),
-                            files: Some(Arc::new(NativeFileEngine::new(files))),
-                        });
+                        let data =
+                            Rc::new(PlatformEventData::new(Box::new(DesktopFileUploadForm {
+                                files: Arc::new(NativeFileEngine::new(files)),
+                            })));
 
                         let view = webviews.get_mut(&event.1).unwrap();
 

packages/desktop/src/protocol.rs

@@ -214,6 +214,7 @@ pub(super) async fn desktop_handler(
     request: Request<Vec<u8>>,
     custom_head: Option<String>,
     custom_index: Option<String>,
+    #[allow(unused_variables)] assets_head: Option<String>,
     root_name: &str,
     asset_handlers: &AssetHandlerRegistry,
     edit_queue: &EditQueue,
@@ -238,10 +239,47 @@ pub(super) async fn desktop_handler(
                 // Otherwise, we'll serve the default index.html and apply a custom head if that's specified.
                 let mut template = include_str!("./index.html").to_string();
 
-                if let Some(custom_head) = custom_head {
-                    template = template.replace("<!-- CUSTOM HEAD -->", &custom_head);
+                #[allow(unused_mut)]
+                let mut head = custom_head.unwrap_or_default();
+                #[cfg(all(
+                    debug_assertions,
+                    any(
+                        target_os = "windows",
+                        target_os = "macos",
+                        target_os = "linux",
+                        target_os = "dragonfly",
+                        target_os = "freebsd",
+                        target_os = "netbsd",
+                        target_os = "openbsd"
+                    )
+                ))]
+                {
+                    use manganis_cli_support::AssetManifestExt;
+                    let manifest = manganis_cli_support::AssetManifest::load();
+                    head += &manifest.head();
+                }
+                #[cfg(not(all(
+                    debug_assertions,
+                    any(
+                        target_os = "windows",
+                        target_os = "macos",
+                        target_os = "linux",
+                        target_os = "dragonfly",
+                        target_os = "freebsd",
+                        target_os = "netbsd",
+                        target_os = "openbsd"
+                    )
+                )))]
+                {
+                    if let Some(assets_head) = assets_head {
+                        head += &assets_head;
+                    } else {
+                        tracing::warn!("No assets head found. You can compile assets with the dioxus-cli in release mode");
+                    }
                 }
 
+                template = template.replace("<!-- CUSTOM HEAD -->", &head);
+
                 template
                     .replace(
                         "<!-- MODULE LOADER -->",
@@ -277,12 +315,10 @@ pub(super) async fn desktop_handler(
     // Else, try to serve a file from the filesystem.
 
     // If the path is relative, we'll try to serve it from the assets directory.
-    let mut asset = get_asset_root()
-        .unwrap_or_else(|| Path::new(".").to_path_buf())
-        .join(&request.path);
+    let mut asset = get_asset_root_or_default().join(&request.path);
 
     if !asset.exists() {
-        asset = PathBuf::from("/").join(request.path);
+        asset = PathBuf::from("/").join(&request.path);
     }
 
     if asset.exists() {
@@ -293,7 +329,7 @@ pub(super) async fn desktop_handler(
                 return;
             }
         };
-        let asset = match std::fs::read(asset) {
+        let asset = match std::fs::read(&asset) {
             Ok(asset) => asset,
             Err(err) => {
                 tracing::error!("error reading asset: {}", err);
@@ -312,6 +348,12 @@ pub(super) async fn desktop_handler(
         }
     }
 
+    tracing::error!(
+        "Failed to find {} (as path {})",
+        request.uri().path(),
+        asset.display()
+    );
+
     match Response::builder()
         .status(StatusCode::NOT_FOUND)
         .body(Cow::from(String::from("Not Found").into_bytes()))
@@ -323,6 +365,11 @@ pub(super) async fn desktop_handler(
     }
 }
 
+#[allow(unreachable_code)]
+pub(crate) fn get_asset_root_or_default() -> PathBuf {
+    get_asset_root().unwrap_or_else(|| Path::new(".").to_path_buf())
+}
+
 #[allow(unreachable_code)]
 fn get_asset_root() -> Option<PathBuf> {
     /*
@@ -337,7 +384,7 @@ fn get_asset_root() -> Option<PathBuf> {
 
     */
 
-    if std::env::var_os("CARGO").is_some() {
+    if std::env::var_os("CARGO").is_some() || std::env::var_os("DIOXUS_ACTIVE").is_some() {
         return None;
     }
 

packages/desktop/src/webview.rs

@@ -5,7 +5,6 @@ use tao::event_loop::{EventLoopProxy, EventLoopWindowTarget};
 pub use wry;
 pub use wry::application as tao;
 use wry::application::window::Window;
-use wry::http::Response;
 use wry::webview::{WebContext, WebView, WebViewBuilder};
 
 pub(crate) fn build(
@@ -19,6 +18,46 @@ pub(crate) fn build(
     let custom_head = cfg.custom_head.clone();
     let index_file = cfg.custom_index.clone();
     let root_name = cfg.root_name.clone();
+    let assets_head = {
+        #[cfg(all(
+            debug_assertions,
+            any(
+                target_os = "windows",
+                target_os = "macos",
+                target_os = "linux",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            )
+        ))]
+        {
+            None
+        }
+        #[cfg(not(all(
+            debug_assertions,
+            any(
+                target_os = "windows",
+                target_os = "macos",
+                target_os = "linux",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            )
+        )))]
+        {
+            let head = crate::protocol::get_asset_root_or_default();
+            let head = head.join("dist/__assets_head.html");
+            match std::fs::read_to_string(&head) {
+                Ok(s) => Some(s),
+                Err(err) => {
+                    tracing::error!("Failed to read {head:?}: {err}");
+                    None
+                }
+            }
+        }
+    };
 
     // TODO: restore the menu bar with muda: https://github.com/tauri-apps/muda/blob/dev/examples/wry.rs
     // if cfg.enable_default_menu_bar {
@@ -59,6 +98,7 @@ pub(crate) fn build(
             move |request, responder| {
                 let custom_head = custom_head.clone();
                 let index_file = index_file.clone();
+                let assets_head = assets_head.clone();
                 let root_name = root_name.clone();
                 let asset_handlers_ref = asset_handlers_ref.clone();
                 let edit_queue = edit_queue.clone();
@@ -67,6 +107,7 @@ pub(crate) fn build(
                         request,
                         custom_head.clone(),
                         index_file.clone(),
+                        assets_head.clone(),
                         &root_name,
                         &asset_handlers_ref,
                         &edit_queue,

packages/dioxus-tui/examples/hover.rs

@@ -56,7 +56,6 @@ fn app(cx: Scope) -> Element {
             width: "100%",
             height: "100%",
             flex_direction: "column",
-
             div {
                 width: "100%",
                 height: "50%",
@@ -71,7 +70,7 @@ fn app(cx: Scope) -> Element {
                     onmouseenter: move |m| q1_color.set([get_brightness(m.inner()), 0, 0]),
                     onmousedown: move |m| q1_color.set([get_brightness(m.inner()), 0, 0]),
                     onmouseup: move |m| q1_color.set([get_brightness(m.inner()), 0, 0]),
-                    onwheel: move |w| q1_color.set([q1_color[0] + (10.0*w.delta().strip_units().y) as i32, 0, 0]),
+                    onwheel: move |w| q1_color.set([q1_color[0] + (10.0 * w.delta().strip_units().y) as i32, 0, 0]),
                     onmouseleave: move |_| q1_color.set([200; 3]),
                     onmousemove: update_data,
                     "click me"
@@ -85,7 +84,7 @@ fn app(cx: Scope) -> Element {
                     onmouseenter: move |m| q2_color.set([get_brightness(m.inner()); 3]),
                     onmousedown: move |m| q2_color.set([get_brightness(m.inner()); 3]),
                     onmouseup: move |m| q2_color.set([get_brightness(m.inner()); 3]),
-                    onwheel: move |w| q2_color.set([q2_color[0] + (10.0*w.delta().strip_units().y) as i32;3]),
+                    onwheel: move |w| q2_color.set([q2_color[0] + (10.0 * w.delta().strip_units().y) as i32; 3]),
                     onmouseleave: move |_| q2_color.set([200; 3]),
                     onmousemove: update_data,
                     "click me"
@@ -105,7 +104,7 @@ fn app(cx: Scope) -> Element {
                     onmouseenter: move |m| q3_color.set([0, get_brightness(m.inner()), 0]),
                     onmousedown: move |m| q3_color.set([0, get_brightness(m.inner()), 0]),
                     onmouseup: move |m| q3_color.set([0, get_brightness(m.inner()), 0]),
-                    onwheel: move |w| q3_color.set([0, q3_color[1] + (10.0*w.delta().strip_units().y) as i32, 0]),
+                    onwheel: move |w| q3_color.set([0, q3_color[1] + (10.0 * w.delta().strip_units().y) as i32, 0]),
                     onmouseleave: move |_| q3_color.set([200; 3]),
                     onmousemove: update_data,
                     "click me"
@@ -119,16 +118,16 @@ fn app(cx: Scope) -> Element {
                     onmouseenter: move |m| q4_color.set([0, 0, get_brightness(m.inner())]),
                     onmousedown: move |m| q4_color.set([0, 0, get_brightness(m.inner())]),
                     onmouseup: move |m| q4_color.set([0, 0, get_brightness(m.inner())]),
-                    onwheel: move |w| q4_color.set([0, 0, q4_color[2] + (10.0*w.delta().strip_units().y) as i32]),
+                    onwheel: move |w| q4_color.set([0, 0, q4_color[2] + (10.0 * w.delta().strip_units().y) as i32]),
                     onmouseleave: move |_| q4_color.set([200; 3]),
                     onmousemove: update_data,
                     "click me"
                 }
-            },
-            div {"Page coordinates: {page_coordinates}"},
-            div {"Element coordinates: {element_coordinates}"},
-            div {"Buttons: {buttons}"},
-            div {"Modifiers: {modifiers}"},
+            }
+            div { "Page coordinates: {page_coordinates}" }
+            div { "Element coordinates: {element_coordinates}" }
+            div { "Buttons: {buttons}" }
+            div { "Modifiers: {modifiers}" }
         }
     })
 }

packages/dioxus-tui/examples/widgets.rs

@@ -18,7 +18,7 @@ fn app(cx: Scope) -> Element {
             justify_content: "center",
 
             input {
-                oninput: |data| if &data.value == "good"{
+                oninput: |data| if &data.value()== "good"{
                     bg_green.set(true);
                 } else{
                     bg_green.set(false);
@@ -30,7 +30,7 @@ fn app(cx: Scope) -> Element {
                 checked: "true",
             }
             input {
-                oninput: |data| if &data.value == "hello world"{
+                oninput: |data| if &data.value()== "hello world"{
                     bg_green.set(true);
                 } else{
                     bg_green.set(false);
@@ -41,7 +41,7 @@ fn app(cx: Scope) -> Element {
             }
             input {
                 oninput: |data| {
-                    if (data.value.parse::<f32>().unwrap() - 40.0).abs() < 5.0 {
+                    if (data.value().parse::<f32>().unwrap() - 40.0).abs() < 5.0 {
                         bg_green.set(true);
                     } else{
                         bg_green.set(false);
@@ -55,7 +55,7 @@ fn app(cx: Scope) -> Element {
             }
             input {
                 oninput: |data| {
-                    if data.value == "10"{
+                    if data.value()== "10"{
                         bg_green.set(true);
                     } else{
                         bg_green.set(false);
@@ -68,7 +68,7 @@ fn app(cx: Scope) -> Element {
             }
             input {
                 oninput: |data| {
-                    if data.value == "hello world"{
+                    if data.value()== "hello world"{
                         bg_green.set(true);
                     } else{
                         bg_green.set(false);

packages/dioxus-tui/src/element.rs

@@ -1,7 +1,6 @@
 use std::{
     any::Any,
     fmt::{Display, Formatter},
-    rc::Rc,
 };
 
 use dioxus_core::{ElementId, Mutations, VirtualDom};
@@ -30,7 +29,7 @@ pub(crate) fn find_mount_events(mutations: &Mutations) -> Vec<ElementId> {
 // We need to queue the mounted events to give rink time to rendere and resolve the layout of elements after they are created
 pub(crate) fn create_mounted_events(
     vdom: &VirtualDom,
-    events: &mut Vec<(ElementId, &'static str, Rc<dyn Any>, bool)>,
+    events: &mut Vec<(ElementId, &'static str, Box<dyn Any>, bool)>,
     mount_events: impl Iterator<Item = (ElementId, NodeId)>,
 ) {
     let query: Query = vdom
@@ -42,11 +41,12 @@ pub(crate) fn create_mounted_events(
             query: query.clone(),
             id: node_id,
         };
-        events.push((id, "mounted", Rc::new(MountedData::new(element)), false));
+        events.push((id, "mounted", Box::new(MountedData::new(element)), false));
     }
 }
 
-struct TuiElement {
+#[derive(Clone)]
+pub(crate) struct TuiElement {
     query: Query,
     id: NodeId,
 }
@@ -82,8 +82,8 @@ impl RenderedElementBacking for TuiElement {
         })
     }
 
-    fn get_raw_element(&self) -> dioxus_html::MountedResult<&dyn std::any::Any> {
-        Ok(self)
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
     }
 }
 

packages/dioxus-tui/src/events.rs

@@ -0,0 +1,108 @@
+use core::panic;
+
+use dioxus_html::*;
+
+use crate::element::TuiElement;
+
+fn downcast(event: &PlatformEventData) -> plasmo::EventData {
+    event
+        .downcast::<plasmo::EventData>()
+        .expect("event should be of type EventData")
+        .clone()
+}
+
+pub(crate) struct SerializedHtmlEventConverter;
+
+impl HtmlEventConverter for SerializedHtmlEventConverter {
+    fn convert_animation_data(&self, _: &PlatformEventData) -> AnimationData {
+        panic!("animation events not supported")
+    }
+
+    fn convert_clipboard_data(&self, _: &PlatformEventData) -> ClipboardData {
+        panic!("clipboard events not supported")
+    }
+
+    fn convert_composition_data(&self, _: &PlatformEventData) -> CompositionData {
+        panic!("composition events not supported")
+    }
+
+    fn convert_drag_data(&self, _: &PlatformEventData) -> DragData {
+        panic!("drag events not supported")
+    }
+
+    fn convert_focus_data(&self, event: &PlatformEventData) -> FocusData {
+        if let plasmo::EventData::Focus(event) = downcast(event) {
+            FocusData::new(event)
+        } else {
+            panic!("event should be of type Focus")
+        }
+    }
+
+    fn convert_form_data(&self, event: &PlatformEventData) -> FormData {
+        if let plasmo::EventData::Form(event) = downcast(event) {
+            FormData::new(event)
+        } else {
+            panic!("event should be of type Form")
+        }
+    }
+
+    fn convert_image_data(&self, _: &PlatformEventData) -> ImageData {
+        panic!("image events not supported")
+    }
+
+    fn convert_keyboard_data(&self, event: &PlatformEventData) -> KeyboardData {
+        if let plasmo::EventData::Keyboard(event) = downcast(event) {
+            KeyboardData::new(event)
+        } else {
+            panic!("event should be of type Keyboard")
+        }
+    }
+
+    fn convert_media_data(&self, _: &PlatformEventData) -> MediaData {
+        panic!("media events not supported")
+    }
+
+    fn convert_mounted_data(&self, event: &PlatformEventData) -> MountedData {
+        event.downcast::<TuiElement>().cloned().unwrap().into()
+    }
+
+    fn convert_mouse_data(&self, event: &PlatformEventData) -> MouseData {
+        if let plasmo::EventData::Mouse(event) = downcast(event) {
+            MouseData::new(event)
+        } else {
+            panic!("event should be of type Mouse")
+        }
+    }
+
+    fn convert_pointer_data(&self, _: &PlatformEventData) -> PointerData {
+        panic!("pointer events not supported")
+    }
+
+    fn convert_scroll_data(&self, _: &PlatformEventData) -> ScrollData {
+        panic!("scroll events not supported")
+    }
+
+    fn convert_selection_data(&self, _: &PlatformEventData) -> SelectionData {
+        panic!("selection events not supported")
+    }
+
+    fn convert_toggle_data(&self, _: &PlatformEventData) -> ToggleData {
+        panic!("toggle events not supported")
+    }
+
+    fn convert_touch_data(&self, _: &PlatformEventData) -> TouchData {
+        panic!("touch events not supported")
+    }
+
+    fn convert_transition_data(&self, _: &PlatformEventData) -> TransitionData {
+        panic!("transition events not supported")
+    }
+
+    fn convert_wheel_data(&self, event: &PlatformEventData) -> WheelData {
+        if let plasmo::EventData::Wheel(event) = downcast(event) {
+            WheelData::new(event)
+        } else {
+            panic!("event should be of type Wheel")
+        }
+    }
+}

packages/dioxus-tui/src/lib.rs

@@ -3,6 +3,7 @@
 #![doc(html_favicon_url = "https://avatars.githubusercontent.com/u/79236386")]
 
 mod element;
+mod events;
 
 use std::{
     any::Any,
@@ -12,6 +13,7 @@ use std::{
 };
 
 use dioxus_core::{Component, ElementId, VirtualDom};
+use dioxus_html::PlatformEventData;
 use dioxus_native_core::dioxus::{DioxusState, NodeImmutableDioxusExt};
 use dioxus_native_core::prelude::*;
 
@@ -28,6 +30,8 @@ pub fn launch_cfg(app: Component<()>, cfg: Config) {
 }
 
 pub fn launch_cfg_with_props<Props: 'static>(app: Component<Props>, props: Props, cfg: Config) {
+    dioxus_html::set_event_converter(Box::new(events::SerializedHtmlEventConverter));
+
     render(cfg, |rdom, taffy, event_tx| {
         let dioxus_state = {
             let mut rdom = rdom.write().unwrap();
@@ -85,7 +89,7 @@ struct DioxusRenderer {
     vdom: VirtualDom,
     dioxus_state: Rc<RwLock<DioxusState>>,
     // Events that are queued up to be sent to the vdom next time the vdom is polled
-    queued_events: Vec<(ElementId, &'static str, Rc<dyn Any>, bool)>,
+    queued_events: Vec<(ElementId, &'static str, Box<dyn Any>, bool)>,
     #[cfg(all(feature = "hot-reload", debug_assertions))]
     hot_reload_rx: tokio::sync::mpsc::UnboundedReceiver<dioxus_hot_reload::HotReloadMsg>,
 }
@@ -126,15 +130,19 @@ impl Driver for DioxusRenderer {
         let id = { rdom.read().unwrap().get(id).unwrap().mounted_id() };
         if let Some(id) = id {
             let inner_value = value.deref().clone();
+            let boxed_event = Box::new(inner_value);
+            let platform_event = PlatformEventData::new(boxed_event);
             self.vdom
-                .handle_event(event, inner_value.into_any(), id, bubbles);
+                .handle_event(event, Rc::new(platform_event), id, bubbles);
         }
     }
 
     fn poll_async(&mut self) -> std::pin::Pin<Box<dyn futures::Future<Output = ()> + '_>> {
         // Add any queued events
         for (id, event, value, bubbles) in self.queued_events.drain(..) {
-            self.vdom.handle_event(event, value, id, bubbles);
+            let platform_event = PlatformEventData::new(value);
+            self.vdom
+                .handle_event(event, Rc::new(platform_event), id, bubbles);
         }
 
         #[cfg(all(feature = "hot-reload", debug_assertions))]

packages/dioxus-tui/tests/events.rs

@@ -63,7 +63,7 @@ fn key_down() {
                 onkeydown: move |evt| {
                     assert_eq!(evt.data.code(), Code::KeyA);
                     tui_ctx.quit();
-                },
+                }
             }
         })
     }
@@ -95,9 +95,11 @@ fn mouse_down() {
                 width: "100%",
                 height: "100%",
                 onmousedown: move |evt| {
-                    assert!(evt.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Primary));
+                    assert!(
+                        evt.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Primary)
+                    );
                     tui_ctx.quit();
-                },
+                }
             }
         })
     }
@@ -136,7 +138,7 @@ fn mouse_up() {
                 height: "100%",
                 onmouseup: move |_| {
                     tui_ctx.quit();
-                },
+                }
             }
         })
     }
@@ -175,7 +177,7 @@ fn mouse_enter() {
                 height: "50%",
                 onmouseenter: move |_| {
                     tui_ctx.quit();
-                },
+                }
             }
         })
     }
@@ -214,7 +216,7 @@ fn mouse_exit() {
                 height: "50%",
                 onmouseenter: move |_| {
                     tui_ctx.quit();
-                },
+                }
             }
         })
     }
@@ -251,9 +253,9 @@ fn mouse_move() {
             div {
                 width: "100%",
                 height: "100%",
-                onmousemove: move |_|{
+                onmousemove: move |_| {
                     tui_ctx.quit();
-                },
+                }
             }
         })
     }
@@ -293,7 +295,7 @@ fn wheel() {
                 onwheel: move |evt| {
                     assert!(evt.data.delta().strip_units().y > 0.0);
                     tui_ctx.quit();
-                },
+                }
             }
         })
     }
@@ -330,9 +332,9 @@ fn click() {
             div {
                 width: "100%",
                 height: "100%",
-                onclick: move |_|{
+                onclick: move |_| {
                     tui_ctx.quit();
-                },
+                }
             }
         })
     }
@@ -369,9 +371,9 @@ fn context_menu() {
             div {
                 width: "100%",
                 height: "100%",
-                oncontextmenu: move |_|{
+                oncontextmenu: move |_| {
                     tui_ctx.quit();
-                },
+                }
             }
         })
     }

packages/dioxus/Cargo.toml

@@ -16,6 +16,7 @@ dioxus-html = { workspace = true, optional = true }
 dioxus-core-macro = { workspace = true, optional = true }
 dioxus-hooks = { workspace = true, optional = true }
 dioxus-rsx = { workspace = true, optional = true }
+manganis = { git = "https://github.com/DioxusLabs/collect-assets" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 dioxus-hot-reload = { workspace = true, optional = true }

packages/dioxus/src/lib.rs

@@ -22,6 +22,9 @@ pub use dioxus_rsx as rsx;
 pub use dioxus_core_macro as core_macro;
 
 pub mod prelude {
+    pub use manganis;
+    pub use manganis::mg;
+
     #[cfg(feature = "hooks")]
     pub use crate::hooks::*;
 

packages/fullstack/Cargo.toml

@@ -70,6 +70,10 @@ dioxus-hot-reload = { workspace = true }
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web-sys = { version = "0.3.61", features = ["Window", "Document", "Element", "HtmlDocument", "Storage", "console"] }
 
+[target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux",target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies]
+# This is only for debug mode, and it appears mobile does not support some packages this uses
+manganis-cli-support = { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] }
+
 [features]
 default = ["hot-reload", "default-tls"]
 router = ["dioxus-router"]

packages/fullstack/examples/axum-auth/.gitignore

@@ -1,3 +1,4 @@
 dist
 target
-static
+static
+.dioxus

packages/fullstack/examples/axum-desktop/.gitignore

@@ -1,2 +1,4 @@
 dist
-target
+target
+static
+.dioxus

packages/fullstack/examples/axum-hello-world/.gitignore

@@ -1,3 +1,4 @@
 dist
 target
-static
+static
+.dioxus

packages/fullstack/examples/axum-router/.gitignore

@@ -1,3 +1,4 @@
 dist
 target
-static
+static
+.dioxus

packages/fullstack/examples/salvo-hello-world/.gitignore

@@ -1,3 +1,4 @@
 dist
 target
-static
+static
+.dioxus

packages/fullstack/examples/static-hydrated/.gitignore

@@ -1,3 +1,4 @@
 docs
 target
-static
+static
+.dioxus

packages/fullstack/examples/warp-hello-world/.gitignore

@@ -1,3 +1,4 @@
 dist
 target
-static
+static
+.dioxus

packages/fullstack/src/adapters/axum_adapter.rs

@@ -276,6 +276,9 @@ where
     fn serve_static_assets(mut self, assets_path: impl Into<std::path::PathBuf>) -> Self {
         use tower_http::services::{ServeDir, ServeFile};
 
+        // Copy over any assets we find
+        crate::collect_assets::copy_assets();
+
         let assets_path = assets_path.into();
 
         // Serve all files in dist folder except index.html

packages/fullstack/src/adapters/salvo_adapter.rs

@@ -241,6 +241,9 @@ impl DioxusRouterExt for Router {
     }
 
     fn serve_static_assets(mut self, assets_path: impl Into<std::path::PathBuf>) -> Self {
+        // Copy over any assets we find
+        crate::collect_assets::copy_assets();
+
         let assets_path = assets_path.into();
 
         // Serve all files in dist folder except index.html

packages/fullstack/src/adapters/warp_adapter.rs

@@ -187,6 +187,9 @@ pub fn serve_dioxus_application<P: Clone + serde::Serialize + Send + Sync + 'sta
     // Serve the dist folder and the index.html file
     let serve_dir = warp::fs::dir(cfg.assets_path);
 
+    // Copy over any assets we find
+    crate::collect_assets::copy_assets();
+
     connect_hot_reload()
         // First register the server functions
         .or(register_server_fns(server_fn_route))

packages/fullstack/src/collect_assets.rs

@@ -0,0 +1,61 @@
+#[cfg(any(feature = "axum", feature = "warp", feature = "salvo"))]
+pub fn copy_assets() {
+    #[cfg(all(
+        debug_assertions,
+        any(
+            target_os = "windows",
+            target_os = "macos",
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        )
+    ))]
+    {
+        // The CLI will copy assets to the current working directory
+        if std::env::var_os("DIOXUS_ACTIVE").is_some() {
+            return;
+        }
+        use manganis_cli_support::AssetManifest;
+        use manganis_cli_support::AssetManifestExt;
+        use manganis_cli_support::Config;
+        use std::path::PathBuf;
+        let config = Config::current();
+        let asset_location = config.assets_serve_location();
+        let asset_location = PathBuf::from(asset_location);
+        let _ = std::fs::remove_dir_all(&asset_location);
+
+        println!("Finding assets... (Note: if you run a dioxus desktop application with the CLI. This process will be significantly faster.)");
+        let manifest = AssetManifest::load();
+        let has_assets = manifest
+            .packages()
+            .iter()
+            .any(|package| !package.assets().is_empty());
+
+        if has_assets {
+            println!("Copying and optimizing assets...");
+            manifest.copy_static_assets_to(&asset_location).unwrap();
+            println!("Copied assets to {}", asset_location.display());
+        } else {
+            println!("No assets found");
+        }
+    }
+    #[cfg(not(all(
+        debug_assertions,
+        any(
+            target_os = "windows",
+            target_os = "macos",
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        )
+    )))]
+    {
+        println!(
+            "Skipping assets in release mode. You compile assets with the dioxus-cli in release mode"
+        );
+    }
+}

packages/fullstack/src/lib.rs

@@ -14,6 +14,7 @@ pub mod router;
 mod adapters;
 #[cfg(feature = "ssr")]
 pub use adapters::*;
+mod collect_assets;
 mod hooks;
 #[cfg(all(debug_assertions, feature = "hot-reload", feature = "ssr"))]
 mod hot_reload;

packages/hot-reload/README.md

@@ -68,7 +68,7 @@ rsx! {
 
 ## Usage
 
-> This crate implements hot reloading for native compilation targets not WASM. For hot relaoding with the web renderer, see the [dioxus-cli](https://github.com/DioxusLabs/cli) project.
+> This crate implements hot reloading for native compilation targets not WASM. For hot relaoding with the web renderer, see the [dioxus-cli](https://github.com/DioxusLabs/dioxus/tree/master/packages/cli) project.
 
 Add this to the top of your main function on any renderer that supports hot reloading to start the hot reloading server:
 

packages/hot-reload/src/file_watcher.rs

@@ -155,7 +155,7 @@ pub fn init<Ctx: HotReloadingContext + Send + 'static>(cfg: Config<Ctx>) {
         let target_dir = crate_dir.join("target");
         let hot_reload_socket_path = target_dir.join("dioxusin");
 
-        #[cfg(target_os = "macos")]
+        #[cfg(unix)]
         {
             // On unix, if you force quit the application, it can leave the file socket open
             // This will cause the local socket listener to fail to open

packages/html/Cargo.toml

@@ -16,7 +16,7 @@ serde = { version = "1", features = ["derive"], optional = true }
 serde_repr = { version = "0.1", optional = true }
 wasm-bindgen = { workspace = true, optional = true }
 euclid = "0.22.7"
-enumset = "1.0.11"
+enumset = "1.1.2"
 keyboard-types = "0.7"
 async-trait = "0.1.58"
 serde-value = "0.7.0"
@@ -29,28 +29,29 @@ serde_json = { version = "1", optional = true }
 optional = true
 version = "0.3.56"
 features = [
-     "TouchEvent",
-     "MouseEvent",
-     "InputEvent",
-     "ClipboardEvent",
-     "KeyboardEvent",
-     "TouchEvent",
-     "WheelEvent",
-     "AnimationEvent",
-     "TransitionEvent",
-     "PointerEvent",
-     "FocusEvent",
-     "CompositionEvent",
-     "ClipboardEvent",
+    "Touch",
+    "TouchList",
+    "TouchEvent",
+    "MouseEvent",
+    "InputEvent",
+    "ClipboardEvent",
+    "KeyboardEvent",
+    "WheelEvent",
+    "AnimationEvent",
+    "TransitionEvent",
+    "PointerEvent",
+    "FocusEvent",
+    "CompositionEvent",
 ]
 
 [dev-dependencies]
 serde_json = "1"
 
 [features]
-default = ["serialize", "mounted"]
+default = ["serialize", "mounted", "eval"]
 serialize = [
     "serde",
+    "serde/rc",
     "serde_repr",
     "serde_json",
     "euclid/serde",
@@ -65,6 +66,10 @@ mounted = [
     "web-sys/ScrollBehavior",
     "web-sys/HtmlElement",
 ]
+eval = [
+    "serde",
+    "serde_json"
+]
 wasm-bind = ["web-sys", "wasm-bindgen"]
 native-bind = ["tokio"]
 hot-reload-context = ["dioxus-rsx"]

packages/html/src/events.rs

@@ -1,3 +1,6 @@
+use std::any::Any;
+use std::sync::RwLock;
+
 macro_rules! impl_event {
     (
         $data:ty;
@@ -12,8 +15,8 @@ macro_rules! impl_event {
             pub fn $name<E: crate::EventReturn<T>, T>(mut _f: impl FnMut(::dioxus_core::Event<$data>) -> E + 'static) -> ::dioxus_core::Attribute {
                 ::dioxus_core::Attribute::new(
                     stringify!($name),
-                    ::dioxus_core::AttributeValue::listener(move |e: ::dioxus_core::Event<$data>| {
-                        _f(e).spawn();
+::dioxus_core::AttributeValue::listener(move |e: ::dioxus_core::Event<crate::PlatformEventData>| {
+                        _f(e.map(|e|e.into())).spawn(_cx);
                     }),
                     None,
                     false,
@@ -23,6 +26,193 @@ macro_rules! impl_event {
     };
 }
 
+static EVENT_CONVERTER: RwLock<Option<Box<dyn HtmlEventConverter>>> = RwLock::new(None);
+
+#[inline]
+pub fn set_event_converter(converter: Box<dyn HtmlEventConverter>) {
+    *EVENT_CONVERTER.write().unwrap() = Some(converter);
+}
+
+#[inline]
+pub(crate) fn with_event_converter<F, R>(f: F) -> R
+where
+    F: FnOnce(&dyn HtmlEventConverter) -> R,
+{
+    let converter = EVENT_CONVERTER.read().unwrap();
+    f(converter.as_ref().unwrap().as_ref())
+}
+
+/// A platform specific event.
+pub struct PlatformEventData {
+    event: Box<dyn Any>,
+}
+
+impl PlatformEventData {
+    pub fn new(event: Box<dyn Any>) -> Self {
+        Self { event }
+    }
+
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.event.downcast_ref::<T>()
+    }
+
+    pub fn downcast_mut<T: 'static>(&mut self) -> Option<&mut T> {
+        self.event.downcast_mut::<T>()
+    }
+
+    pub fn into_inner<T: 'static>(self) -> Option<T> {
+        self.event.downcast::<T>().ok().map(|e| *e)
+    }
+}
+
+/// A converter between a platform specific event and a general event. All code in a renderer that has a large binary size should be placed in this trait. Each of these functions should be snipped in high levels of optimization.
+pub trait HtmlEventConverter: Send + Sync {
+    /// Convert a general event to an animation data event
+    fn convert_animation_data(&self, event: &PlatformEventData) -> AnimationData;
+    /// Convert a general event to a clipboard data event
+    fn convert_clipboard_data(&self, event: &PlatformEventData) -> ClipboardData;
+    /// Convert a general event to a composition data event
+    fn convert_composition_data(&self, event: &PlatformEventData) -> CompositionData;
+    /// Convert a general event to a drag data event
+    fn convert_drag_data(&self, event: &PlatformEventData) -> DragData;
+    /// Convert a general event to a focus data event
+    fn convert_focus_data(&self, event: &PlatformEventData) -> FocusData;
+    /// Convert a general event to a form data event
+    fn convert_form_data(&self, event: &PlatformEventData) -> FormData;
+    /// Convert a general event to an image data event
+    fn convert_image_data(&self, event: &PlatformEventData) -> ImageData;
+    /// Convert a general event to a keyboard data event
+    fn convert_keyboard_data(&self, event: &PlatformEventData) -> KeyboardData;
+    /// Convert a general event to a media data event
+    fn convert_media_data(&self, event: &PlatformEventData) -> MediaData;
+    /// Convert a general event to a mounted data event
+    fn convert_mounted_data(&self, event: &PlatformEventData) -> MountedData;
+    /// Convert a general event to a mouse data event
+    fn convert_mouse_data(&self, event: &PlatformEventData) -> MouseData;
+    /// Convert a general event to a pointer data event
+    fn convert_pointer_data(&self, event: &PlatformEventData) -> PointerData;
+    /// Convert a general event to a scroll data event
+    fn convert_scroll_data(&self, event: &PlatformEventData) -> ScrollData;
+    /// Convert a general event to a selection data event
+    fn convert_selection_data(&self, event: &PlatformEventData) -> SelectionData;
+    /// Convert a general event to a toggle data event
+    fn convert_toggle_data(&self, event: &PlatformEventData) -> ToggleData;
+    /// Convert a general event to a touch data event
+    fn convert_touch_data(&self, event: &PlatformEventData) -> TouchData;
+    /// Convert a general event to a transition data event
+    fn convert_transition_data(&self, event: &PlatformEventData) -> TransitionData;
+    /// Convert a general event to a wheel data event
+    fn convert_wheel_data(&self, event: &PlatformEventData) -> WheelData;
+}
+
+impl From<&PlatformEventData> for AnimationData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_animation_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for ClipboardData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_clipboard_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for CompositionData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_composition_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for DragData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_drag_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for FocusData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_focus_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for FormData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_form_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for ImageData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_image_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for KeyboardData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_keyboard_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for MediaData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_media_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for MountedData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_mounted_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for MouseData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_mouse_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for PointerData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_pointer_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for ScrollData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_scroll_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for SelectionData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_selection_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for ToggleData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_toggle_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for TouchData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_touch_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for TransitionData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_transition_data(val))
+    }
+}
+
+impl From<&PlatformEventData> for WheelData {
+    fn from(val: &PlatformEventData) -> Self {
+        with_event_converter(|c| c.convert_wheel_data(val))
+    }
+}
+
 mod animation;
 mod clipboard;
 mod composition;
@@ -151,8 +341,6 @@ pub fn event_bubbles(evt: &str) -> bool {
     }
 }
 
-use std::future::Future;
-
 #[doc(hidden)]
 pub trait EventReturn<P>: Sized {
     fn spawn(self) {}
@@ -164,7 +352,7 @@ pub struct AsyncMarker;
 
 impl<T> EventReturn<AsyncMarker> for T
 where
-    T: Future<Output = ()> + 'static,
+    T: std::future::Future<Output = ()> + 'static,
 {
     #[inline]
     fn spawn(self) {

packages/html/src/events/animation.rs

@@ -2,12 +2,132 @@ use dioxus_core::Event;
 
 pub type AnimationEvent = Event<AnimationData>;
 
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq)]
 pub struct AnimationData {
-    pub animation_name: String,
-    pub pseudo_element: String,
-    pub elapsed_time: f32,
+    inner: Box<dyn HasAnimationData>,
+}
+
+impl AnimationData {
+    /// Create a new AnimationData
+    pub fn new(inner: impl HasAnimationData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// The name of the animation
+    pub fn animation_name(&self) -> String {
+        self.inner.animation_name()
+    }
+
+    /// The name of the pseudo-element the animation runs on
+    pub fn pseudo_element(&self) -> String {
+        self.inner.pseudo_element()
+    }
+
+    /// The amount of time the animation has been running
+    pub fn elapsed_time(&self) -> f32 {
+        self.inner.elapsed_time()
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_ref().as_any().downcast_ref::<T>()
+    }
+}
+
+impl<E: HasAnimationData> From<E> for AnimationData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for AnimationData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("AnimationData")
+            .field("animation_name", &self.animation_name())
+            .field("pseudo_element", &self.pseudo_element())
+            .field("elapsed_time", &self.elapsed_time())
+            .finish()
+    }
+}
+
+impl PartialEq for AnimationData {
+    fn eq(&self, other: &Self) -> bool {
+        self.animation_name() == other.animation_name()
+            && self.pseudo_element() == other.pseudo_element()
+            && self.elapsed_time() == other.elapsed_time()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of AnimationData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedAnimationData {
+    animation_name: String,
+    pseudo_element: String,
+    elapsed_time: f32,
+}
+
+#[cfg(feature = "serialize")]
+impl From<&AnimationData> for SerializedAnimationData {
+    fn from(data: &AnimationData) -> Self {
+        Self {
+            animation_name: data.animation_name(),
+            pseudo_element: data.pseudo_element(),
+            elapsed_time: data.elapsed_time(),
+        }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasAnimationData for SerializedAnimationData {
+    fn animation_name(&self) -> String {
+        self.animation_name.clone()
+    }
+
+    fn pseudo_element(&self) -> String {
+        self.pseudo_element.clone()
+    }
+
+    fn elapsed_time(&self) -> f32 {
+        self.elapsed_time
+    }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for AnimationData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedAnimationData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for AnimationData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedAnimationData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+/// A trait for any object that has the data for an animation event
+pub trait HasAnimationData: std::any::Any {
+    /// The name of the animation
+    fn animation_name(&self) -> String;
+
+    /// The name of the pseudo-element the animation runs on
+    fn pseudo_element(&self) -> String;
+
+    /// The amount of time the animation has been running
+    fn elapsed_time(&self) -> f32;
+
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
 }
 
 impl_event! [

packages/html/src/events/clipboard.rs

@@ -1,10 +1,82 @@
 use dioxus_core::Event;
 
 pub type ClipboardEvent = Event<ClipboardData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
+
 pub struct ClipboardData {
-    // DOMDataTransfer clipboardData
+    inner: Box<dyn HasClipboardData>,
+}
+
+impl<E: HasClipboardData> From<E> for ClipboardData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for ClipboardData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ClipboardData").finish()
+    }
+}
+
+impl PartialEq for ClipboardData {
+    fn eq(&self, _other: &Self) -> bool {
+        true
+    }
+}
+
+impl ClipboardData {
+    /// Create a new ClipboardData
+    pub fn new(inner: impl HasClipboardData) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_ref().as_any().downcast_ref::<T>()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of ClipboardData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedClipboardData {}
+
+#[cfg(feature = "serialize")]
+impl From<&ClipboardData> for SerializedClipboardData {
+    fn from(_: &ClipboardData) -> Self {
+        Self {}
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasClipboardData for SerializedClipboardData {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for ClipboardData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedClipboardData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for ClipboardData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedClipboardData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+pub trait HasClipboardData: std::any::Any {
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
 }
 
 impl_event![

packages/html/src/events/composition.rs

@@ -1,10 +1,98 @@
 use dioxus_core::Event;
 
 pub type CompositionEvent = Event<CompositionData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
+
 pub struct CompositionData {
-    pub data: String,
+    inner: Box<dyn HasCompositionData>,
+}
+
+impl std::fmt::Debug for CompositionData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("CompositionData")
+            .field("data", &self.data())
+            .finish()
+    }
+}
+
+impl<E: HasCompositionData> From<E> for CompositionData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl PartialEq for CompositionData {
+    fn eq(&self, other: &Self) -> bool {
+        self.data() == other.data()
+    }
+}
+
+impl CompositionData {
+    /// Create a new CompositionData
+    pub fn new(inner: impl HasCompositionData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// The characters generated by the input method that raised the event
+    pub fn data(&self) -> String {
+        self.inner.data()
+    }
+
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of CompositionData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedCompositionData {
+    data: String,
+}
+
+#[cfg(feature = "serialize")]
+impl From<&CompositionData> for SerializedCompositionData {
+    fn from(data: &CompositionData) -> Self {
+        Self { data: data.data() }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasCompositionData for SerializedCompositionData {
+    fn data(&self) -> String {
+        self.data.clone()
+    }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for CompositionData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedCompositionData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for CompositionData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedCompositionData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+/// A trait for any object that has the data for a composition event
+pub trait HasCompositionData: std::any::Any {
+    /// The characters generated by the input method that raised the event
+    fn data(&self) -> String;
+
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
 }
 
 impl_event! [

packages/html/src/events/drag.rs

@@ -1,6 +1,11 @@
+use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint};
+use crate::input_data::{MouseButton, MouseButtonSet};
+use crate::prelude::*;
+
 use dioxus_core::Event;
+use keyboard_types::Modifiers;
 
-use crate::MouseData;
+use crate::HasMouseData;
 
 pub type DragEvent = Event<DragData>;
 
@@ -8,13 +13,181 @@ pub type DragEvent = Event<DragData>;
 /// 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.
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct DragData {
-    /// Inherit mouse data
-    pub mouse: MouseData,
+    inner: Box<dyn HasDragData>,
+}
+
+impl<E: HasDragData + 'static> From<E> for DragData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for DragData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("DragData")
+            .field("coordinates", &self.coordinates())
+            .field("modifiers", &self.modifiers())
+            .field("held_buttons", &self.held_buttons())
+            .field("trigger_button", &self.trigger_button())
+            .finish()
+    }
+}
+
+impl PartialEq for DragData {
+    fn eq(&self, other: &Self) -> bool {
+        self.coordinates() == other.coordinates()
+            && self.modifiers() == other.modifiers()
+            && self.held_buttons() == other.held_buttons()
+            && self.trigger_button() == other.trigger_button()
+    }
+}
+
+impl DragData {
+    /// Create a new DragData
+    pub fn new(inner: impl HasDragData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// Downcast this event data to a specific type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+impl InteractionLocation for DragData {
+    fn client_coordinates(&self) -> ClientPoint {
+        self.inner.client_coordinates()
+    }
+
+    fn page_coordinates(&self) -> PagePoint {
+        self.inner.page_coordinates()
+    }
+
+    fn screen_coordinates(&self) -> ScreenPoint {
+        self.inner.screen_coordinates()
+    }
+}
+
+impl InteractionElementOffset for DragData {
+    fn element_coordinates(&self) -> ElementPoint {
+        self.inner.element_coordinates()
+    }
+
+    fn coordinates(&self) -> Coordinates {
+        self.inner.coordinates()
+    }
+}
+
+impl ModifiersInteraction for DragData {
+    fn modifiers(&self) -> Modifiers {
+        self.inner.modifiers()
+    }
+}
+
+impl PointerInteraction for DragData {
+    fn held_buttons(&self) -> MouseButtonSet {
+        self.inner.held_buttons()
+    }
+
+    // todo the following is kind of bad; should we just return None when the trigger_button is unreliable (and frankly irrelevant)? i guess we would need the event_type here
+    fn trigger_button(&self) -> Option<MouseButton> {
+        self.inner.trigger_button()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of DragData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedDragData {
+    mouse: crate::point_interaction::SerializedPointInteraction,
+}
+
+#[cfg(feature = "serialize")]
+impl From<&DragData> for SerializedDragData {
+    fn from(data: &DragData) -> Self {
+        Self {
+            mouse: crate::point_interaction::SerializedPointInteraction::from(data),
+        }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasDragData for SerializedDragData {}
+
+#[cfg(feature = "serialize")]
+impl HasMouseData for SerializedDragData {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
 }
 
+#[cfg(feature = "serialize")]
+impl InteractionLocation for SerializedDragData {
+    fn client_coordinates(&self) -> ClientPoint {
+        self.mouse.client_coordinates()
+    }
+
+    fn page_coordinates(&self) -> PagePoint {
+        self.mouse.page_coordinates()
+    }
+
+    fn screen_coordinates(&self) -> ScreenPoint {
+        self.mouse.screen_coordinates()
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl InteractionElementOffset for SerializedDragData {
+    fn element_coordinates(&self) -> ElementPoint {
+        self.mouse.element_coordinates()
+    }
+
+    fn coordinates(&self) -> Coordinates {
+        self.mouse.coordinates()
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl ModifiersInteraction for SerializedDragData {
+    fn modifiers(&self) -> Modifiers {
+        self.mouse.modifiers()
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl PointerInteraction for SerializedDragData {
+    fn held_buttons(&self) -> MouseButtonSet {
+        self.mouse.held_buttons()
+    }
+
+    fn trigger_button(&self) -> Option<MouseButton> {
+        self.mouse.trigger_button()
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for DragData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedDragData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for DragData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedDragData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+/// A trait for any object that has the data for a drag event
+pub trait HasDragData: HasMouseData {}
+
 impl_event! {
     DragData;
 

packages/html/src/events/focus.rs

@@ -2,9 +2,82 @@ use dioxus_core::Event;
 
 pub type FocusEvent = Event<FocusData>;
 
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct FocusData {/* DOMEventInner:  Send + SyncTarget relatedTarget */}
+pub struct FocusData {
+    inner: Box<dyn HasFocusData>,
+}
+
+impl<E: HasFocusData> From<E> for FocusData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for FocusData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("FocusData").finish()
+    }
+}
+
+impl PartialEq for FocusData {
+    fn eq(&self, _other: &Self) -> bool {
+        true
+    }
+}
+
+impl FocusData {
+    /// Create a new FocusData
+    pub fn new(inner: impl HasFocusData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// Downcast this event data to a specific type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of FocusData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone, Default)]
+pub struct SerializedFocusData {}
+
+#[cfg(feature = "serialize")]
+impl From<&FocusData> for SerializedFocusData {
+    fn from(_: &FocusData) -> Self {
+        Self {}
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasFocusData for SerializedFocusData {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for FocusData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedFocusData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for FocusData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedFocusData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+pub trait HasFocusData: std::any::Any {
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
+}
 
 impl_event! [
     FocusData;

packages/html/src/events/form.rs

@@ -4,28 +4,176 @@ use dioxus_core::Event;
 
 pub type FormEvent = Event<FormData>;
 
-/* DOMEvent:  Send + SyncTarget relatedTarget */
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone)]
 pub struct FormData {
-    pub value: String,
-
-    pub values: HashMap<String, Vec<String>>,
-
-    #[cfg_attr(
-        feature = "serialize",
-        serde(
-            default,
-            skip_serializing,
-            deserialize_with = "deserialize_file_engine"
-        )
-    )]
-    pub files: Option<std::sync::Arc<dyn FileEngine>>,
+    inner: Box<dyn HasFormData>,
+}
+
+impl<E: HasFormData> From<E> for FormData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl PartialEq for FormData {
+    fn eq(&self, other: &Self) -> bool {
+        self.value() == other.value() && self.values() == other.values()
+    }
+}
+
+impl Debug for FormData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("FormEvent")
+            .field("value", &self.value())
+            .field("values", &self.values())
+            .finish()
+    }
+}
+
+impl FormData {
+    /// Create a new form event
+    pub fn new(event: impl HasFormData + 'static) -> Self {
+        Self {
+            inner: Box::new(event),
+        }
+    }
+
+    /// Get the value of the form event
+    pub fn value(&self) -> String {
+        self.inner.value()
+    }
+
+    /// Get the values of the form event
+    pub fn values(&self) -> HashMap<String, Vec<String>> {
+        self.inner.values()
+    }
+
+    /// Get the files of the form event
+    pub fn files(&self) -> Option<std::sync::Arc<dyn FileEngine>> {
+        self.inner.files()
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+/// An object that has all the data for a form event
+pub trait HasFormData: std::any::Any {
+    fn value(&self) -> String {
+        Default::default()
+    }
+
+    fn values(&self) -> HashMap<String, Vec<String>> {
+        Default::default()
+    }
+
+    fn files(&self) -> Option<std::sync::Arc<dyn FileEngine>> {
+        None
+    }
+
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized form data object
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedFormData {
+    value: String,
+    values: HashMap<String, Vec<String>>,
+    files: Option<std::sync::Arc<SerializedFileEngine>>,
+}
+
+#[cfg(feature = "serialize")]
+impl SerializedFormData {
+    /// Create a new serialized form data object
+    pub fn new(
+        value: String,
+        values: HashMap<String, Vec<String>>,
+        files: Option<std::sync::Arc<SerializedFileEngine>>,
+    ) -> Self {
+        Self {
+            value,
+            values,
+            files,
+        }
+    }
+
+    /// Create a new serialized form data object from a traditional form data object
+    pub async fn async_from(data: &FormData) -> Self {
+        Self {
+            value: data.value(),
+            values: data.values(),
+            files: match data.files() {
+                Some(files) => {
+                    let mut resolved_files = HashMap::new();
+
+                    for file in files.files() {
+                        let bytes = files.read_file(&file).await;
+                        resolved_files.insert(file, bytes.unwrap_or_default());
+                    }
+
+                    Some(std::sync::Arc::new(SerializedFileEngine {
+                        files: resolved_files,
+                    }))
+                }
+                None => None,
+            },
+        }
+    }
+
+    fn from_lossy(data: &FormData) -> Self {
+        Self {
+            value: data.value(),
+            values: data.values(),
+            files: None,
+        }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasFormData for SerializedFormData {
+    fn value(&self) -> String {
+        self.value.clone()
+    }
+
+    fn values(&self) -> HashMap<String, Vec<String>> {
+        self.values.clone()
+    }
+
+    fn files(&self) -> Option<std::sync::Arc<dyn FileEngine>> {
+        self.files
+            .as_ref()
+            .map(|files| std::sync::Arc::clone(files) as std::sync::Arc<dyn FileEngine>)
+    }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for FormData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedFormData::from_lossy(self).serialize(serializer)
+    }
 }
 
 #[cfg(feature = "serialize")]
-#[derive(serde::Serialize, serde::Deserialize)]
-struct SerializedFileEngine {
+impl<'de> serde::Deserialize<'de> for FormData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedFormData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A file engine that serializes files to bytes
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedFileEngine {
     files: HashMap<String, Vec<u8>>,
 }
 
@@ -53,38 +201,6 @@ impl FileEngine for SerializedFileEngine {
     }
 }
 
-#[cfg(feature = "serialize")]
-fn deserialize_file_engine<'de, D>(
-    deserializer: D,
-) -> Result<Option<std::sync::Arc<dyn FileEngine>>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    use serde::Deserialize;
-
-    let Ok(file_engine) = SerializedFileEngine::deserialize(deserializer) else {
-        return Ok(None);
-    };
-
-    let file_engine = std::sync::Arc::new(file_engine);
-    Ok(Some(file_engine))
-}
-
-impl PartialEq for FormData {
-    fn eq(&self, other: &Self) -> bool {
-        self.value == other.value && self.values == other.values
-    }
-}
-
-impl Debug for FormData {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("FormEvent")
-            .field("value", &self.value)
-            .field("values", &self.values)
-            .finish()
-    }
-}
-
 #[async_trait::async_trait(?Send)]
 pub trait FileEngine {
     // get a list of file names

packages/html/src/events/image.rs

@@ -1,11 +1,97 @@
 use dioxus_core::Event;
 
 pub type ImageEvent = Event<ImageData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ImageData {
-    #[cfg_attr(feature = "serialize", serde(default))]
-    pub load_error: bool,
+    inner: Box<dyn HasImageData>,
+}
+
+impl<E: HasImageData> From<E> for ImageData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for ImageData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ImageData")
+            .field("load_error", &self.load_error())
+            .finish()
+    }
+}
+
+impl PartialEq for ImageData {
+    fn eq(&self, other: &Self) -> bool {
+        self.load_error() == other.load_error()
+    }
+}
+
+impl ImageData {
+    /// Create a new ImageData
+    pub fn new(e: impl HasImageData) -> Self {
+        Self { inner: Box::new(e) }
+    }
+
+    /// If the renderer encountered an error while loading the image
+    pub fn load_error(&self) -> bool {
+        self.inner.load_error()
+    }
+
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of ImageData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedImageData {
+    load_error: bool,
+}
+
+#[cfg(feature = "serialize")]
+impl From<&ImageData> for SerializedImageData {
+    fn from(data: &ImageData) -> Self {
+        Self {
+            load_error: data.load_error(),
+        }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasImageData for SerializedImageData {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+
+    fn load_error(&self) -> bool {
+        self.load_error
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for ImageData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedImageData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for ImageData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedImageData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+/// A trait for any object that has the data for an image event
+pub trait HasImageData: std::any::Any {
+    /// If the renderer encountered an error while loading the image
+    fn load_error(&self) -> bool;
+
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
 }
 
 impl_event! [

packages/html/src/events/keyboard.rs

@@ -1,9 +1,8 @@
-use crate::input_data::{decode_key_location, encode_key_location};
 use dioxus_core::Event;
 use keyboard_types::{Code, Key, Location, Modifiers};
-use std::convert::TryInto;
-use std::fmt::{Debug, Formatter};
-use std::str::FromStr;
+use std::fmt::Debug;
+
+use crate::prelude::ModifiersInteraction;
 
 #[cfg(feature = "serialize")]
 fn resilient_deserialize_code<'de, D>(deserializer: D) -> Result<Code, D::Error>
@@ -16,73 +15,99 @@ where
 }
 
 pub type KeyboardEvent = Event<KeyboardData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, PartialEq, Eq)]
 pub struct KeyboardData {
-    #[deprecated(
-        since = "0.3.0",
-        note = "This may not work in all environments. Use key() instead."
-    )]
-    pub char_code: u32,
-
-    /// Identify which "key" was entered.
-    #[deprecated(since = "0.3.0", note = "use key() instead")]
-    pub key: String,
-
-    /// Get the key code as an enum Variant.
-    #[deprecated(
-        since = "0.3.0",
-        note = "This may not work in all environments. Use code() instead."
-    )]
-    pub key_code: KeyCode,
-
-    /// the physical key on the keyboard
-    #[cfg_attr(
-        feature = "serialize",
-        serde(deserialize_with = "resilient_deserialize_code")
-    )]
-    code: Code,
+    inner: Box<dyn HasKeyboardData>,
+}
 
-    /// Indicate if the `alt` modifier key was pressed during this keyboard event
-    #[deprecated(since = "0.3.0", note = "use modifiers() instead")]
-    pub alt_key: bool,
+impl<E: HasKeyboardData> From<E> for KeyboardData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
 
-    /// Indicate if the `ctrl` modifier key was pressed during this keyboard event
-    #[deprecated(since = "0.3.0", note = "use modifiers() instead")]
-    pub ctrl_key: bool,
+impl std::fmt::Debug for KeyboardData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("KeyboardData")
+            .field("key", &self.key())
+            .field("code", &self.code())
+            .field("modifiers", &self.modifiers())
+            .field("location", &self.location())
+            .field("is_auto_repeating", &self.is_auto_repeating())
+            .finish()
+    }
+}
 
-    /// Indicate if the `meta` modifier key was pressed during this keyboard event
-    #[deprecated(since = "0.3.0", note = "use modifiers() instead")]
-    pub meta_key: bool,
+impl PartialEq for KeyboardData {
+    fn eq(&self, other: &Self) -> bool {
+        self.key() == other.key()
+            && self.code() == other.code()
+            && self.modifiers() == other.modifiers()
+            && self.location() == other.location()
+            && self.is_auto_repeating() == other.is_auto_repeating()
+    }
+}
 
-    /// Indicate if the `shift` modifier key was pressed during this keyboard event
-    #[deprecated(since = "0.3.0", note = "use modifiers() instead")]
-    pub shift_key: bool,
+impl KeyboardData {
+    /// Create a new KeyboardData
+    pub fn new(inner: impl HasKeyboardData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
 
-    #[deprecated(since = "0.3.0", note = "use location() instead")]
-    pub location: usize,
+    /// The value of the key pressed by the user, taking into consideration the state of modifier keys such as Shift as well as the keyboard locale and layout.
+    pub fn key(&self) -> Key {
+        self.inner.key()
+    }
 
-    #[deprecated(since = "0.3.0", note = "use is_auto_repeating() instead")]
-    pub repeat: bool,
+    /// A physical key on the keyboard (as opposed to the character generated by pressing the key). In other words, this property returns a value that isn't altered by keyboard layout or the state of the modifier keys.
+    pub fn code(&self) -> Code {
+        self.inner.code()
+    }
 
-    #[deprecated(since = "0.3.0", note = "use code() or key() instead")]
-    pub which: usize,
-}
+    /// The location of the key on the keyboard or other input device.
+    pub fn location(&self) -> Location {
+        self.inner.location()
+    }
 
-impl_event! {
-    KeyboardData;
+    /// `true` iff the key is being held down such that it is automatically repeating.
+    pub fn is_auto_repeating(&self) -> bool {
+        self.inner.is_auto_repeating()
+    }
 
-    /// onkeydown
-    onkeydown
+    /// Downcast this KeyboardData to a concrete type.
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
 
-    /// onkeypress
-    onkeypress
+impl ModifiersInteraction for KeyboardData {
+    fn modifiers(&self) -> Modifiers {
+        self.inner.modifiers()
+    }
+}
 
-    /// onkeyup
-    onkeyup
+#[cfg(feature = "serialize")]
+/// A serialized version of KeyboardData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedKeyboardData {
+    char_code: u32,
+    key: String,
+    key_code: KeyCode,
+    #[serde(deserialize_with = "resilient_deserialize_code")]
+    code: Code,
+    alt_key: bool,
+    ctrl_key: bool,
+    meta_key: bool,
+    shift_key: bool,
+    location: usize,
+    repeat: bool,
+    which: usize,
 }
 
-impl KeyboardData {
+#[cfg(feature = "serialize")]
+impl SerializedKeyboardData {
+    /// Create a new SerializedKeyboardData
     pub fn new(
         key: Key,
         code: Code,
@@ -90,13 +115,11 @@ impl KeyboardData {
         is_auto_repeating: bool,
         modifiers: Modifiers,
     ) -> Self {
-        #[allow(deprecated)]
-        KeyboardData {
+        Self {
             char_code: key.legacy_charcode(),
             key: key.to_string(),
             key_code: KeyCode::from_raw_code(
-                key.legacy_keycode()
-                    .try_into()
+                std::convert::TryInto::try_into(key.legacy_keycode())
                     .expect("could not convert keycode to u8"),
             ),
             code,
@@ -104,72 +127,117 @@ impl KeyboardData {
             ctrl_key: modifiers.contains(Modifiers::CONTROL),
             meta_key: modifiers.contains(Modifiers::META),
             shift_key: modifiers.contains(Modifiers::SHIFT),
-            location: encode_key_location(location),
+            location: crate::input_data::encode_key_location(location),
             repeat: is_auto_repeating,
-            which: key
-                .legacy_charcode()
-                .try_into()
+            which: std::convert::TryInto::try_into(key.legacy_charcode())
                 .expect("could not convert charcode to usize"),
         }
     }
+}
 
-    /// The value of the key pressed by the user, taking into consideration the state of modifier keys such as Shift as well as the keyboard locale and layout.
-    pub fn key(&self) -> Key {
-        #[allow(deprecated)]
-        FromStr::from_str(&self.key).unwrap_or(Key::Unidentified)
+#[cfg(feature = "serialize")]
+impl From<&KeyboardData> for SerializedKeyboardData {
+    fn from(data: &KeyboardData) -> Self {
+        Self::new(
+            data.key(),
+            data.code(),
+            data.location(),
+            data.is_auto_repeating(),
+            data.modifiers(),
+        )
     }
+}
 
-    /// A physical key on the keyboard (as opposed to the character generated by pressing the key). In other words, this property returns a value that isn't altered by keyboard layout or the state of the modifier keys.
-    pub fn code(&self) -> Code {
+#[cfg(feature = "serialize")]
+impl HasKeyboardData for SerializedKeyboardData {
+    fn key(&self) -> Key {
+        std::str::FromStr::from_str(&self.key).unwrap_or(Key::Unidentified)
+    }
+
+    fn code(&self) -> Code {
         self.code
     }
 
-    /// The set of modifier keys which were pressed when the event occurred
-    pub fn modifiers(&self) -> Modifiers {
+    fn location(&self) -> Location {
+        crate::input_data::decode_key_location(self.location)
+    }
+
+    fn is_auto_repeating(&self) -> bool {
+        self.repeat
+    }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl ModifiersInteraction for SerializedKeyboardData {
+    fn modifiers(&self) -> Modifiers {
         let mut modifiers = Modifiers::empty();
 
-        #[allow(deprecated)]
-        {
-            if self.alt_key {
-                modifiers.insert(Modifiers::ALT);
-            }
-            if self.ctrl_key {
-                modifiers.insert(Modifiers::CONTROL);
-            }
-            if self.meta_key {
-                modifiers.insert(Modifiers::META);
-            }
-            if self.shift_key {
-                modifiers.insert(Modifiers::SHIFT);
-            }
+        if self.alt_key {
+            modifiers.insert(Modifiers::ALT);
+        }
+        if self.ctrl_key {
+            modifiers.insert(Modifiers::CONTROL);
+        }
+        if self.meta_key {
+            modifiers.insert(Modifiers::META);
+        }
+        if self.shift_key {
+            modifiers.insert(Modifiers::SHIFT);
         }
 
         modifiers
     }
+}
 
-    /// The location of the key on the keyboard or other input device.
-    pub fn location(&self) -> Location {
-        #[allow(deprecated)]
-        decode_key_location(self.location)
+#[cfg(feature = "serialize")]
+impl serde::Serialize for KeyboardData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedKeyboardData::from(self).serialize(serializer)
     }
+}
 
-    /// `true` iff the key is being held down such that it is automatically repeating.
-    pub fn is_auto_repeating(&self) -> bool {
-        #[allow(deprecated)]
-        self.repeat
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for KeyboardData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedKeyboardData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
     }
 }
 
-impl Debug for KeyboardData {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("KeyboardData")
-            .field("key", &self.key())
-            .field("code", &self.code())
-            .field("modifiers", &self.modifiers())
-            .field("location", &self.location())
-            .field("is_auto_repeating", &self.is_auto_repeating())
-            .finish()
-    }
+impl_event! {
+    KeyboardData;
+
+    /// onkeydown
+    onkeydown
+
+    /// onkeypress
+    onkeypress
+
+    /// onkeyup
+    onkeyup
+}
+
+pub trait HasKeyboardData: ModifiersInteraction + std::any::Any {
+    /// The value of the key pressed by the user, taking into consideration the state of modifier keys such as Shift as well as the keyboard locale and layout.
+    fn key(&self) -> Key;
+
+    /// A physical key on the keyboard (as opposed to the character generated by pressing the key). In other words, this property returns a value that isn't altered by keyboard layout or the state of the modifier keys.
+    fn code(&self) -> Code;
+
+    /// The location of the key on the keyboard or other input device.
+    fn location(&self) -> Location;
+
+    /// `true` iff the key is being held down such that it is automatically repeating.
+    fn is_auto_repeating(&self) -> bool;
+
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
 }
 
 #[cfg(feature = "serialize")]
@@ -178,6 +246,8 @@ impl<'de> serde::Deserialize<'de> for KeyCode {
     where
         D: serde::Deserializer<'de>,
     {
+        use std::convert::TryInto;
+
         // We could be deserializing a unicode character, so we need to use u64 even if the output only takes u8
         let value = u64::deserialize(deserializer)?;
 

packages/html/src/events/media.rs

@@ -1,9 +1,82 @@
 use dioxus_core::Event;
 
 pub type MediaEvent = Event<MediaData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct MediaData {}
+pub struct MediaData {
+    inner: Box<dyn HasMediaData>,
+}
+
+impl<E: HasMediaData> From<E> for MediaData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for MediaData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("MediaData").finish()
+    }
+}
+
+impl PartialEq for MediaData {
+    fn eq(&self, _: &Self) -> bool {
+        true
+    }
+}
+
+impl MediaData {
+    /// Create a new MediaData
+    pub fn new(inner: impl HasMediaData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of MediaData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedMediaData {}
+
+#[cfg(feature = "serialize")]
+impl From<&MediaData> for SerializedMediaData {
+    fn from(_: &MediaData) -> Self {
+        Self {}
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasMediaData for SerializedMediaData {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for MediaData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedMediaData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for MediaData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedMediaData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+pub trait HasMediaData: std::any::Any {
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
+}
 
 impl_event! [
     MediaData;
@@ -29,7 +102,7 @@ impl_event! [
     ///ended
     onended
 
-    // todo: this conflicts with image events
+    // todo: this conflicts with Media events
     // neither have data, so it's okay
     // ///error
     // onerror

packages/html/src/events/mounted.rs

@@ -3,22 +3,18 @@
 use euclid::Rect;
 
 use std::{
-    any::Any,
     fmt::{Display, Formatter},
     future::Future,
     pin::Pin,
-    rc::Rc,
 };
 
 /// An Element that has been rendered and allows reading and modifying information about it.
 ///
 /// Different platforms will have different implementations and different levels of support for this trait. Renderers that do not support specific features will return `None` for those queries.
 // we can not use async_trait here because it does not create a trait that is object safe
-pub trait RenderedElementBacking {
-    /// Get the renderer specific element for the given id
-    fn get_raw_element(&self) -> MountedResult<&dyn Any> {
-        Err(MountedError::NotSupported)
-    }
+pub trait RenderedElementBacking: std::any::Any {
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
 
     /// Get the bounding rectangle of the element relative to the viewport (this does not include the scroll position)
     #[allow(clippy::type_complexity)]
@@ -40,7 +36,11 @@ pub trait RenderedElementBacking {
     }
 }
 
-impl RenderedElementBacking for () {}
+impl RenderedElementBacking for () {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
 
 /// The way that scrolling should be performed
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
@@ -57,22 +57,23 @@ pub enum ScrollBehavior {
 ///
 /// Different platforms will have different implementations and different levels of support for this trait. Renderers that do not support specific features will return `None` for those queries.
 pub struct MountedData {
-    inner: Rc<dyn RenderedElementBacking>,
+    inner: Box<dyn RenderedElementBacking>,
+}
+
+impl<E: RenderedElementBacking> From<E> for MountedData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
 }
 
 impl MountedData {
     /// Create a new MountedData
     pub fn new(registry: impl RenderedElementBacking + 'static) -> Self {
         Self {
-            inner: Rc::new(registry),
+            inner: Box::new(registry),
         }
     }
 
-    /// Get the renderer specific element for the given id
-    pub fn get_raw_element(&self) -> MountedResult<&dyn Any> {
-        self.inner.get_raw_element()
-    }
-
     /// Get the bounding rectangle of the element relative to the viewport (this does not include the scroll position)
     pub async fn get_client_rect(&self) -> MountedResult<Rect<f64, f64>> {
         self.inner.get_client_rect().await
@@ -90,6 +91,11 @@ impl MountedData {
     pub fn set_focus(&self, focus: bool) -> Pin<Box<dyn Future<Output = MountedResult<()>>>> {
         self.inner.set_focus(focus)
     }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
 }
 
 use dioxus_core::Event;

packages/html/src/events/mouse.rs

@@ -1,91 +1,47 @@
 use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint};
-use crate::input_data::{
-    decode_mouse_button_set, encode_mouse_button_set, MouseButton, MouseButtonSet,
-};
+use crate::input_data::{MouseButton, MouseButtonSet};
+use crate::prelude::*;
 use dioxus_core::Event;
 use keyboard_types::Modifiers;
-use std::fmt::{Debug, Formatter};
 
 pub type MouseEvent = Event<MouseData>;
 
 /// A synthetic event that wraps a web-style [`MouseEvent`](https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent)
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Default, PartialEq, Eq)]
 /// Data associated with a mouse event
-///
-/// Do not use the deprecated fields; they may change or become private in the future.
 pub struct MouseData {
-    /// True if the alt key was down when the mouse event was fired.
-    #[deprecated(since = "0.3.0", note = "use modifiers() instead")]
-    pub alt_key: bool,
-
-    /// The button number that was pressed (if applicable) when the mouse event was fired.
-    #[deprecated(since = "0.3.0", note = "use trigger_button() instead")]
-    pub button: i16,
-
-    /// Indicates which buttons are pressed on the mouse (or other input device) when a mouse event is triggered.
-    ///
-    /// Each button that can be pressed is represented by a given number (see below). If more than one button is pressed, the button values are added together to produce a new number. For example, if the secondary (2) and auxiliary (4) buttons are pressed simultaneously, the value is 6 (i.e., 2 + 4).
-    ///
-    /// - 1: Primary button (usually the left button)
-    /// - 2: Secondary button (usually the right button)
-    /// - 4: Auxiliary button (usually the mouse wheel button or middle button)
-    /// - 8: 4th button (typically the "Browser Back" button)
-    /// - 16 : 5th button (typically the "Browser Forward" button)
-    #[deprecated(since = "0.3.0", note = "use held_buttons() instead")]
-    pub buttons: u16,
-
-    /// The horizontal coordinate within the application's viewport at which the event occurred (as opposed to the coordinate within the page).
-    ///
-    /// For example, clicking on the left edge of the viewport will always result in a mouse event with a clientX value of 0, regardless of whether the page is scrolled horizontally.
-    #[deprecated(since = "0.3.0", note = "use client_coordinates() instead")]
-    pub client_x: i32,
-
-    /// The vertical coordinate within the application's viewport at which the event occurred (as opposed to the coordinate within the page).
-    ///
-    /// For example, clicking on the top edge of the viewport will always result in a mouse event with a clientY value of 0, regardless of whether the page is scrolled vertically.
-    #[deprecated(since = "0.3.0", note = "use client_coordinates() instead")]
-    pub client_y: i32,
-
-    /// True if the control key was down when the mouse event was fired.
-    #[deprecated(since = "0.3.0", note = "use modifiers() instead")]
-    pub ctrl_key: bool,
-
-    /// True if the meta key was down when the mouse event was fired.
-    #[deprecated(since = "0.3.0", note = "use modifiers() instead")]
-    pub meta_key: bool,
-
-    /// The offset in the X coordinate of the mouse pointer between that event and the padding edge of the target node.
-    #[deprecated(since = "0.3.0", note = "use element_coordinates() instead")]
-    pub offset_x: i32,
-
-    /// The offset in the Y coordinate of the mouse pointer between that event and the padding edge of the target node.
-    #[deprecated(since = "0.3.0", note = "use element_coordinates() instead")]
-    pub offset_y: i32,
-
-    /// The X (horizontal) coordinate (in pixels) of the mouse, relative to the left edge of the entire document. This includes any portion of the document not currently visible.
-    ///
-    /// Being based on the edge of the document as it is, this property takes into account any horizontal scrolling of the page. For example, if the page is scrolled such that 200 pixels of the left side of the document are scrolled out of view, and the mouse is clicked 100 pixels inward from the left edge of the view, the value returned by pageX will be 300.
-    #[deprecated(since = "0.3.0", note = "use page_coordinates() instead")]
-    pub page_x: i32,
+    inner: Box<dyn HasMouseData>,
+}
 
-    /// The Y (vertical) coordinate in pixels of the event relative to the whole document.
-    ///
-    /// See `page_x`.
-    #[deprecated(since = "0.3.0", note = "use page_coordinates() instead")]
-    pub page_y: i32,
+impl<E: HasMouseData + 'static> From<E> for MouseData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
 
-    /// The X coordinate of the mouse pointer in global (screen) coordinates.
-    #[deprecated(since = "0.3.0", note = "use screen_coordinates() instead")]
-    pub screen_x: i32,
+impl std::fmt::Debug for MouseData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("MouseData")
+            .field("coordinates", &self.coordinates())
+            .field("modifiers", &self.modifiers())
+            .field("held_buttons", &self.held_buttons())
+            .field("trigger_button", &self.trigger_button())
+            .finish()
+    }
+}
 
-    /// The Y coordinate of the mouse pointer in global (screen) coordinates.
-    #[deprecated(since = "0.3.0", note = "use screen_coordinates() instead")]
-    pub screen_y: i32,
+impl<E: HasMouseData> PartialEq<E> for MouseData {
+    fn eq(&self, other: &E) -> bool {
+        self.coordinates() == other.coordinates()
+            && self.modifiers() == other.modifiers()
+            && self.held_buttons() == other.held_buttons()
+            && self.trigger_button() == other.trigger_button()
+    }
+}
 
-    /// True if the shift key was down when the mouse event was fired.
-    #[deprecated(since = "0.3.0", note = "use modifiers() instead")]
-    pub shift_key: bool,
+/// A trait for any object that has the data for a mouse event
+pub trait HasMouseData: PointerInteraction {
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
 }
 
 impl_event! {
@@ -162,131 +118,172 @@ pub fn ondoubleclick<E: crate::EventReturn<T>, T>(
 }
 
 impl MouseData {
-    /// Construct MouseData with the specified properties
+    /// Create a new instance of MouseData
+    pub fn new(inner: impl HasMouseData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+impl InteractionLocation for MouseData {
+    fn client_coordinates(&self) -> ClientPoint {
+        self.inner.client_coordinates()
+    }
+
+    fn page_coordinates(&self) -> PagePoint {
+        self.inner.page_coordinates()
+    }
+
+    fn screen_coordinates(&self) -> ScreenPoint {
+        self.inner.screen_coordinates()
+    }
+}
+
+impl InteractionElementOffset for MouseData {
+    fn element_coordinates(&self) -> ElementPoint {
+        self.inner.element_coordinates()
+    }
+
+    fn coordinates(&self) -> Coordinates {
+        self.inner.coordinates()
+    }
+}
+
+impl ModifiersInteraction for MouseData {
+    /// The set of modifier keys which were pressed when the event occurred
+    fn modifiers(&self) -> Modifiers {
+        self.inner.modifiers()
+    }
+}
+
+impl PointerInteraction for MouseData {
+    /// The set of mouse buttons which were held when the event occurred.
+    fn held_buttons(&self) -> MouseButtonSet {
+        self.inner.held_buttons()
+    }
+
+    /// The mouse button that triggered the event
     ///
-    /// Note: the current implementation truncates coordinates. In the future, when we change the internal representation, it may also support a fractional part.
+    // todo the following is kind of bad; should we just return None when the trigger_button is unreliable (and frankly irrelevant)? i guess we would need the event_type here
+    /// This is only guaranteed to indicate which button was pressed during events caused by pressing or releasing a button. As such, it is not reliable for events such as mouseenter, mouseleave, mouseover, mouseout, or mousemove. For example, a value of MouseButton::Primary may also indicate that no button was pressed.
+    fn trigger_button(&self) -> Option<MouseButton> {
+        self.inner.trigger_button()
+    }
+}
+
+impl PartialEq for MouseData {
+    fn eq(&self, other: &Self) -> bool {
+        self.coordinates() == other.coordinates()
+            && self.modifiers() == other.modifiers()
+            && self.held_buttons() == other.held_buttons()
+            && self.trigger_button() == other.trigger_button()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of [`MouseData`]
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone, Default)]
+pub struct SerializedMouseData {
+    /// Common data for all pointer/mouse events
+    #[serde(flatten)]
+    point_data: crate::point_interaction::SerializedPointInteraction,
+}
+
+#[cfg(feature = "serialize")]
+impl SerializedMouseData {
+    /// Create a new instance of SerializedMouseData
     pub fn new(
-        coordinates: Coordinates,
         trigger_button: Option<MouseButton>,
         held_buttons: MouseButtonSet,
+        coordinates: Coordinates,
         modifiers: Modifiers,
     ) -> Self {
-        let alt_key = modifiers.contains(Modifiers::ALT);
-        let ctrl_key = modifiers.contains(Modifiers::CONTROL);
-        let meta_key = modifiers.contains(Modifiers::META);
-        let shift_key = modifiers.contains(Modifiers::SHIFT);
-
-        let [client_x, client_y]: [i32; 2] = coordinates.client().cast().into();
-        let [offset_x, offset_y]: [i32; 2] = coordinates.element().cast().into();
-        let [page_x, page_y]: [i32; 2] = coordinates.page().cast().into();
-        let [screen_x, screen_y]: [i32; 2] = coordinates.screen().cast().into();
+        Self {
+            point_data: crate::point_interaction::SerializedPointInteraction::new(
+                trigger_button,
+                held_buttons,
+                coordinates,
+                modifiers,
+            ),
+        }
+    }
+}
 
-        #[allow(deprecated)]
+#[cfg(feature = "serialize")]
+impl From<&MouseData> for SerializedMouseData {
+    fn from(e: &MouseData) -> Self {
         Self {
-            alt_key,
-            ctrl_key,
-            meta_key,
-            shift_key,
-
-            button: trigger_button.map_or(0, |b| b.into_web_code()),
-            buttons: encode_mouse_button_set(held_buttons),
-
-            client_x,
-            client_y,
-            offset_x,
-            offset_y,
-            page_x,
-            page_y,
-            screen_x,
-            screen_y,
+            point_data: crate::point_interaction::SerializedPointInteraction::from(e),
         }
     }
+}
 
-    /// The event's coordinates relative to the application's viewport (as opposed to the coordinate within the page).
-    ///
-    /// For example, clicking in the top left corner of the viewport will always result in a mouse event with client coordinates (0., 0.), regardless of whether the page is scrolled horizontally.
-    pub fn client_coordinates(&self) -> ClientPoint {
-        #[allow(deprecated)]
-        ClientPoint::new(self.client_x.into(), self.client_y.into())
+#[cfg(feature = "serialize")]
+impl HasMouseData for SerializedMouseData {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
     }
+}
 
-    /// The event's coordinates relative to the padding edge of the target element
-    ///
-    /// For example, clicking in the top left corner of an element will result in element coordinates (0., 0.)
-    pub fn element_coordinates(&self) -> ElementPoint {
-        #[allow(deprecated)]
-        ElementPoint::new(self.offset_x.into(), self.offset_y.into())
+#[cfg(feature = "serialize")]
+impl InteractionLocation for SerializedMouseData {
+    fn client_coordinates(&self) -> ClientPoint {
+        self.point_data.client_coordinates()
     }
 
-    /// The event's coordinates relative to the entire document. This includes any portion of the document not currently visible.
-    ///
-    /// For example, if the page is scrolled 200 pixels to the right and 300 pixels down, clicking in the top left corner of the viewport would result in page coordinates (200., 300.)
-    pub fn page_coordinates(&self) -> PagePoint {
-        #[allow(deprecated)]
-        PagePoint::new(self.page_x.into(), self.page_y.into())
+    fn page_coordinates(&self) -> PagePoint {
+        self.point_data.page_coordinates()
     }
 
-    /// The event's coordinates relative to the entire screen. This takes into account the window's offset.
-    pub fn screen_coordinates(&self) -> ScreenPoint {
-        #[allow(deprecated)]
-        ScreenPoint::new(self.screen_x.into(), self.screen_y.into())
+    fn screen_coordinates(&self) -> ScreenPoint {
+        self.point_data.screen_coordinates()
     }
+}
 
-    pub fn coordinates(&self) -> Coordinates {
-        Coordinates::new(
-            self.screen_coordinates(),
-            self.client_coordinates(),
-            self.element_coordinates(),
-            self.page_coordinates(),
-        )
+#[cfg(feature = "serialize")]
+impl InteractionElementOffset for SerializedMouseData {
+    fn element_coordinates(&self) -> ElementPoint {
+        self.point_data.element_coordinates()
     }
+}
 
-    /// The set of modifier keys which were pressed when the event occurred
-    pub fn modifiers(&self) -> Modifiers {
-        let mut modifiers = Modifiers::empty();
-
-        #[allow(deprecated)]
-        {
-            if self.alt_key {
-                modifiers.insert(Modifiers::ALT);
-            }
-            if self.ctrl_key {
-                modifiers.insert(Modifiers::CONTROL);
-            }
-            if self.meta_key {
-                modifiers.insert(Modifiers::META);
-            }
-            if self.shift_key {
-                modifiers.insert(Modifiers::SHIFT);
-            }
-        }
+#[cfg(feature = "serialize")]
+impl ModifiersInteraction for SerializedMouseData {
+    fn modifiers(&self) -> Modifiers {
+        self.point_data.modifiers()
+    }
+}
 
-        modifiers
+#[cfg(feature = "serialize")]
+impl PointerInteraction for SerializedMouseData {
+    fn held_buttons(&self) -> MouseButtonSet {
+        self.point_data.held_buttons()
     }
 
-    /// The set of mouse buttons which were held when the event occurred.
-    pub fn held_buttons(&self) -> MouseButtonSet {
-        #[allow(deprecated)]
-        decode_mouse_button_set(self.buttons)
+    fn trigger_button(&self) -> Option<MouseButton> {
+        self.point_data.trigger_button()
     }
+}
 
-    /// The mouse button that triggered the event
-    ///
-    // todo the following is kind of bad; should we just return None when the trigger_button is unreliable (and frankly irrelevant)? i guess we would need the event_type here
-    /// This is only guaranteed to indicate which button was pressed during events caused by pressing or releasing a button. As such, it is not reliable for events such as mouseenter, mouseleave, mouseover, mouseout, or mousemove. For example, a value of MouseButton::Primary may also indicate that no button was pressed.
-    pub fn trigger_button(&self) -> Option<MouseButton> {
-        #[allow(deprecated)]
-        Some(MouseButton::from_web_code(self.button))
+#[cfg(feature = "serialize")]
+impl serde::Serialize for MouseData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedMouseData::from(self).serialize(serializer)
     }
 }
 
-impl Debug for MouseData {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("MouseData")
-            .field("coordinates", &self.coordinates())
-            .field("modifiers", &self.modifiers())
-            .field("held_buttons", &self.held_buttons())
-            .field("trigger_button", &self.trigger_button())
-            .finish()
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for MouseData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedMouseData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
     }
 }

packages/html/src/events/pointer.rs

@@ -1,33 +1,107 @@
 use dioxus_core::Event;
+use keyboard_types::Modifiers;
 
+use crate::{geometry::*, input_data::*, prelude::*};
+
+/// A synthetic event that wraps a web-style [`PointerEvent`](https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent)
 pub type PointerEvent = Event<PointerData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq)]
+
 pub struct PointerData {
-    // Mouse only
-    pub alt_key: bool,
-    pub button: i16,
-    pub buttons: u16,
-    pub client_x: i32,
-    pub client_y: i32,
-    pub ctrl_key: bool,
-    pub meta_key: bool,
-    pub page_x: i32,
-    pub page_y: i32,
-    pub screen_x: i32,
-    pub screen_y: i32,
-    pub shift_key: bool,
-    pub pointer_id: i32,
-    pub width: i32,
-    pub height: i32,
-    pub pressure: f32,
-    pub tangential_pressure: f32,
-    pub tilt_x: i32,
-    pub tilt_y: i32,
-    pub twist: i32,
-    pub pointer_type: String,
-    pub is_primary: bool,
-    // pub get_modifier_state: bool,
+    inner: Box<dyn HasPointerData>,
+}
+
+impl PointerData {
+    /// Create a new PointerData
+    pub fn new(data: impl HasPointerData + 'static) -> Self {
+        Self::from(data)
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+impl<E: HasPointerData + 'static> From<E> for PointerData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for PointerData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("PointerData")
+            .field("pointer_id", &self.pointer_id())
+            .field("width", &self.width())
+            .field("height", &self.height())
+            .field("pressure", &self.pressure())
+            .field("tangential_pressure", &self.tangential_pressure())
+            .field("tilt_x", &self.tilt_x())
+            .field("tilt_y", &self.tilt_y())
+            .field("twist", &self.twist())
+            .field("pointer_type", &self.pointer_type())
+            .field("is_primary", &self.is_primary())
+            .field("coordinates", &self.coordinates())
+            .field("modifiers", &self.modifiers())
+            .field("held_buttons", &self.held_buttons())
+            .field("trigger_button", &self.trigger_button())
+            .finish()
+    }
+}
+
+impl PartialEq for PointerData {
+    fn eq(&self, other: &Self) -> bool {
+        self.pointer_id() == other.pointer_id()
+            && self.width() == other.width()
+            && self.height() == other.height()
+            && self.pressure() == other.pressure()
+            && self.tangential_pressure() == other.tangential_pressure()
+            && self.tilt_x() == other.tilt_x()
+            && self.tilt_y() == other.tilt_y()
+            && self.twist() == other.twist()
+            && self.pointer_type() == other.pointer_type()
+            && self.is_primary() == other.is_primary()
+            && self.coordinates() == other.coordinates()
+            && self.modifiers() == other.modifiers()
+            && self.held_buttons() == other.held_buttons()
+            && self.trigger_button() == other.trigger_button()
+    }
+}
+
+/// A trait for any object that has the data for a pointer event
+pub trait HasPointerData: PointerInteraction {
+    /// Gets the unique identifier of the pointer causing the event.
+    fn pointer_id(&self) -> i32;
+
+    /// Gets the width (magnitude on the X axis), in CSS pixels, of the contact geometry of the pointer.
+    fn width(&self) -> i32;
+
+    /// Gets the height (magnitude on the Y axis), in CSS pixels, of the contact geometry of the pointer.
+    fn height(&self) -> i32;
+
+    /// Gets the normalized pressure of the pointer input in the range of 0 to 1,
+    fn pressure(&self) -> f32;
+
+    /// Gets the normalized tangential pressure of the pointer input (also known as barrel pressure or cylinder stress) in the range -1 to 1,
+    fn tangential_pressure(&self) -> f32;
+
+    /// Gets the plane angle (in degrees, in the range of -90 to 90) between the Y-Z plane and the plane containing both the transducer (e.g. pen stylus) axis and the Y axis.
+    fn tilt_x(&self) -> i32;
+
+    /// Gets the plane angle (in degrees, in the range of -90 to 90) between the X-Z plane and the plane containing both the transducer (e.g. pen stylus) axis and the X axis.
+    fn tilt_y(&self) -> i32;
+
+    /// Gets the clockwise rotation of the pointer (e.g. pen stylus) around its major axis in degrees, with a value in the range 0 to 359.The clockwise rotation of the pointer (e.g. pen stylus) around its major axis in degrees, with a value in the range 0 to 359.
+    fn twist(&self) -> i32;
+
+    /// Gets the device type that caused the event (mouse, pen, touch, etc.).
+    fn pointer_type(&self) -> String;
+
+    /// Gets if the pointer represents the primary pointer of this pointer type.
+    fn is_primary(&self) -> bool;
+
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
 }
 
 impl_event![
@@ -62,3 +136,253 @@ impl_event![
     /// pointerout
     onpointerout
 ];
+
+impl PointerData {
+    /// Gets the unique identifier of the pointer causing the event.
+    pub fn pointer_id(&self) -> i32 {
+        self.inner.pointer_id()
+    }
+
+    /// Gets the width (magnitude on the X axis), in CSS pixels, of the contact geometry of the pointer.
+    pub fn width(&self) -> i32 {
+        self.inner.width()
+    }
+
+    /// Gets the height (magnitude on the Y axis), in CSS pixels, of the contact geometry of the pointer.
+    pub fn height(&self) -> i32 {
+        self.inner.height()
+    }
+
+    /// Gets the normalized pressure of the pointer input in the range of 0 to 1,
+    pub fn pressure(&self) -> f32 {
+        self.inner.pressure()
+    }
+
+    /// Gets the normalized tangential pressure of the pointer input (also known as barrel pressure or cylinder stress) in the range -1 to 1,
+    pub fn tangential_pressure(&self) -> f32 {
+        self.inner.tangential_pressure()
+    }
+
+    /// Gets the plane angle (in degrees, in the range of -90 to 90) between the Y-Z plane and the plane containing both the transducer (e.g. pen stylus) axis and the Y axis.
+    pub fn tilt_x(&self) -> i32 {
+        self.inner.tilt_x()
+    }
+
+    /// Gets the plane angle (in degrees, in the range of -90 to 90) between the X-Z plane and the plane containing both the transducer (e.g. pen stylus) axis and the X axis.
+    pub fn tilt_y(&self) -> i32 {
+        self.inner.tilt_y()
+    }
+
+    /// Gets the clockwise rotation of the pointer (e.g. pen stylus) around its major axis in degrees, with a value in the range 0 to 359.The clockwise rotation of the pointer (e.g. pen stylus) around its major axis in degrees, with a value in the range 0 to 359.
+    pub fn twist(&self) -> i32 {
+        self.inner.twist()
+    }
+
+    /// Gets the device type that caused the event (mouse, pen, touch, etc.).
+    pub fn pointer_type(&self) -> String {
+        self.inner.pointer_type()
+    }
+
+    /// Gets if the pointer represents the primary pointer of this pointer type.
+    pub fn is_primary(&self) -> bool {
+        self.inner.is_primary()
+    }
+}
+
+impl InteractionLocation for PointerData {
+    fn client_coordinates(&self) -> ClientPoint {
+        self.inner.client_coordinates()
+    }
+
+    fn screen_coordinates(&self) -> ScreenPoint {
+        self.inner.screen_coordinates()
+    }
+
+    fn page_coordinates(&self) -> PagePoint {
+        self.inner.page_coordinates()
+    }
+}
+
+impl InteractionElementOffset for PointerData {
+    fn element_coordinates(&self) -> ElementPoint {
+        self.inner.element_coordinates()
+    }
+}
+
+impl ModifiersInteraction for PointerData {
+    fn modifiers(&self) -> Modifiers {
+        self.inner.modifiers()
+    }
+}
+
+impl PointerInteraction for PointerData {
+    fn held_buttons(&self) -> MouseButtonSet {
+        self.inner.held_buttons()
+    }
+
+    fn trigger_button(&self) -> Option<MouseButton> {
+        self.inner.trigger_button()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of PointerData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedPointerData {
+    /// Common data for all pointer/mouse events
+    #[serde(flatten)]
+    point_data: crate::point_interaction::SerializedPointInteraction,
+
+    /// The unique identifier of the pointer causing the event.
+    pointer_id: i32,
+
+    /// The width (magnitude on the X axis), in CSS pixels, of the contact geometry of the pointer.
+    width: i32,
+
+    /// The height (magnitude on the Y axis), in CSS pixels, of the contact geometry of the pointer.
+    height: i32,
+
+    /// The normalized pressure of the pointer input in the range of 0 to 1,
+    pressure: f32,
+
+    /// The normalized tangential pressure of the pointer input (also known as barrel pressure or cylinder stress) in the range -1 to 1,
+    tangential_pressure: f32,
+
+    /// The plane angle (in degrees, in the range of -90 to 90) between the Y-Z plane and the plane containing both the transducer (e.g. pen stylus) axis and the Y axis.
+    tilt_x: i32,
+
+    /// The plane angle (in degrees, in the range of -90 to 90) between the X-Z plane and the plane containing both the transducer (e.g. pen stylus) axis and the X axis.
+    tilt_y: i32,
+
+    /// The clockwise rotation of the pointer (e.g. pen stylus) around its major axis in degrees, with a value in the range 0 to 359.The clockwise rotation of the pointer (e.g. pen stylus) around its major axis in degrees, with a value in the range 0 to 359.
+    twist: i32,
+
+    /// Indicates the device type that caused the event (mouse, pen, touch, etc.).
+    pointer_type: String,
+
+    /// Indicates if the pointer represents the primary pointer of this pointer type.
+    is_primary: bool,
+}
+
+#[cfg(feature = "serialize")]
+impl HasPointerData for SerializedPointerData {
+    fn pointer_id(&self) -> i32 {
+        self.pointer_id
+    }
+
+    fn width(&self) -> i32 {
+        self.width
+    }
+
+    fn height(&self) -> i32 {
+        self.height
+    }
+
+    fn pressure(&self) -> f32 {
+        self.pressure
+    }
+
+    fn tangential_pressure(&self) -> f32 {
+        self.tangential_pressure
+    }
+
+    fn tilt_x(&self) -> i32 {
+        self.tilt_x
+    }
+
+    fn tilt_y(&self) -> i32 {
+        self.tilt_y
+    }
+
+    fn twist(&self) -> i32 {
+        self.twist
+    }
+
+    fn pointer_type(&self) -> String {
+        self.pointer_type.clone()
+    }
+
+    fn is_primary(&self) -> bool {
+        self.is_primary
+    }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl InteractionLocation for SerializedPointerData {
+    fn client_coordinates(&self) -> ClientPoint {
+        self.point_data.client_coordinates()
+    }
+
+    fn screen_coordinates(&self) -> ScreenPoint {
+        self.point_data.screen_coordinates()
+    }
+
+    fn page_coordinates(&self) -> PagePoint {
+        self.point_data.page_coordinates()
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl InteractionElementOffset for SerializedPointerData {
+    fn element_coordinates(&self) -> ElementPoint {
+        self.point_data.element_coordinates()
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl ModifiersInteraction for SerializedPointerData {
+    fn modifiers(&self) -> Modifiers {
+        self.point_data.modifiers()
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl PointerInteraction for SerializedPointerData {
+    fn held_buttons(&self) -> MouseButtonSet {
+        self.point_data.held_buttons()
+    }
+
+    fn trigger_button(&self) -> Option<MouseButton> {
+        self.point_data.trigger_button()
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl From<&PointerData> for SerializedPointerData {
+    fn from(data: &PointerData) -> Self {
+        Self {
+            point_data: data.into(),
+            pointer_id: data.pointer_id(),
+            width: data.width(),
+            height: data.height(),
+            pressure: data.pressure(),
+            tangential_pressure: data.tangential_pressure(),
+            tilt_x: data.tilt_x(),
+            tilt_y: data.tilt_y(),
+            twist: data.twist(),
+            pointer_type: data.pointer_type().to_string(),
+            is_primary: data.is_primary(),
+        }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for PointerData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedPointerData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for PointerData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedPointerData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}

packages/html/src/events/scroll.rs

@@ -1,9 +1,83 @@
 use dioxus_core::Event;
 
 pub type ScrollEvent = Event<ScrollData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ScrollData {}
+
+pub struct ScrollData {
+    inner: Box<dyn HasScrollData>,
+}
+
+impl<E: HasScrollData> From<E> for ScrollData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl ScrollData {
+    /// Create a new ScrollData
+    pub fn new(inner: impl HasScrollData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+impl std::fmt::Debug for ScrollData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ScrollData").finish()
+    }
+}
+
+impl PartialEq for ScrollData {
+    fn eq(&self, _other: &Self) -> bool {
+        true
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of ScrollData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedScrollData {}
+
+#[cfg(feature = "serialize")]
+impl From<&ScrollData> for SerializedScrollData {
+    fn from(_: &ScrollData) -> Self {
+        Self {}
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasScrollData for SerializedScrollData {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for ScrollData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedScrollData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for ScrollData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedScrollData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+pub trait HasScrollData: std::any::Any {
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
+}
 
 impl_event! {
     ScrollData;

packages/html/src/events/selection.rs

@@ -1,9 +1,83 @@
 use dioxus_core::Event;
 
 pub type SelectionEvent = Event<SelectionData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SelectionData {}
+
+pub struct SelectionData {
+    inner: Box<dyn HasSelectionData>,
+}
+
+impl SelectionData {
+    /// Create a new SelectionData
+    pub fn new(inner: impl HasSelectionData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+impl<E: HasSelectionData> From<E> for SelectionData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for SelectionData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("SelectionData").finish()
+    }
+}
+
+impl PartialEq for SelectionData {
+    fn eq(&self, _other: &Self) -> bool {
+        true
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of SelectionData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedSelectionData {}
+
+#[cfg(feature = "serialize")]
+impl From<&SelectionData> for SerializedSelectionData {
+    fn from(_: &SelectionData) -> Self {
+        Self {}
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasSelectionData for SerializedSelectionData {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for SelectionData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedSelectionData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for SelectionData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedSelectionData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+pub trait HasSelectionData: std::any::Any {
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
+}
 
 impl_event! [
     SelectionData;

packages/html/src/events/toggle.rs

@@ -1,9 +1,83 @@
 use dioxus_core::Event;
 
 pub type ToggleEvent = Event<ToggleData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ToggleData {}
+
+pub struct ToggleData {
+    inner: Box<dyn HasToggleData>,
+}
+
+impl<E: HasToggleData> From<E> for ToggleData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for ToggleData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ToggleData").finish()
+    }
+}
+
+impl PartialEq for ToggleData {
+    fn eq(&self, _other: &Self) -> bool {
+        true
+    }
+}
+
+impl ToggleData {
+    /// Create a new ToggleData
+    pub fn new(inner: impl HasToggleData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of ToggleData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedToggleData {}
+
+#[cfg(feature = "serialize")]
+impl From<&ToggleData> for SerializedToggleData {
+    fn from(_: &ToggleData) -> Self {
+        Self {}
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasToggleData for SerializedToggleData {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for ToggleData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedToggleData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for ToggleData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedToggleData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+pub trait HasToggleData: std::any::Any {
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
+}
 
 impl_event! {
     ToggleData;

packages/html/src/events/touch.rs

@@ -1,17 +1,353 @@
 use dioxus_core::Event;
+use keyboard_types::Modifiers;
+
+use crate::geometry::*;
+use crate::prelude::{InteractionLocation, ModifiersInteraction};
 
 pub type TouchEvent = Event<TouchData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct TouchData {
-    pub alt_key: bool,
-    pub ctrl_key: bool,
-    pub meta_key: bool,
-    pub shift_key: bool,
-    // get_modifier_state: bool,
-    // changedTouches: DOMTouchList,
-    // targetTouches: DOMTouchList,
-    // touches: DOMTouchList,
+    inner: Box<dyn HasTouchData>,
+}
+
+impl<E: HasTouchData> From<E> for TouchData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for TouchData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("TouchData")
+            .field("modifiers", &self.modifiers())
+            .field("touches", &self.touches())
+            .field("touches_changed", &self.touches_changed())
+            .field("target_touches", &self.target_touches())
+            .finish()
+    }
+}
+
+impl PartialEq for TouchData {
+    fn eq(&self, other: &Self) -> bool {
+        self.modifiers() == other.modifiers()
+    }
+}
+
+impl TouchData {
+    /// Create a new TouchData
+    pub fn new(inner: impl HasTouchData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// Get the pointers that are currently down
+    pub fn touches(&self) -> Vec<TouchPoint> {
+        self.inner.touches()
+    }
+
+    /// Get the touches that have changed since the last event
+    pub fn touches_changed(&self) -> Vec<TouchPoint> {
+        self.inner.touches_changed()
+    }
+
+    /// Get the touches that started and stayed on the element that triggered this event
+    pub fn target_touches(&self) -> Vec<TouchPoint> {
+        self.inner.target_touches()
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+impl ModifiersInteraction for TouchData {
+    fn modifiers(&self) -> Modifiers {
+        self.inner.modifiers()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of TouchData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedTouchData {
+    alt_key: bool,
+    ctrl_key: bool,
+    meta_key: bool,
+    shift_key: bool,
+    touches: Vec<SerializedTouchPoint>,
+    changed_touches: Vec<SerializedTouchPoint>,
+    target_touches: Vec<SerializedTouchPoint>,
+}
+
+#[cfg(feature = "serialize")]
+impl From<&TouchData> for SerializedTouchData {
+    fn from(data: &TouchData) -> Self {
+        let modifiers = data.modifiers();
+        Self {
+            alt_key: modifiers.contains(Modifiers::ALT),
+            ctrl_key: modifiers.contains(Modifiers::CONTROL),
+            meta_key: modifiers.contains(Modifiers::META),
+            shift_key: modifiers.contains(Modifiers::SHIFT),
+            touches: data.touches().iter().map(|t| t.into()).collect(),
+            changed_touches: data.touches_changed().iter().map(|t| t.into()).collect(),
+            target_touches: data.target_touches().iter().map(|t| t.into()).collect(),
+        }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl ModifiersInteraction for SerializedTouchData {
+    fn modifiers(&self) -> Modifiers {
+        let mut modifiers = Modifiers::default();
+        if self.alt_key {
+            modifiers.insert(Modifiers::ALT);
+        }
+        if self.ctrl_key {
+            modifiers.insert(Modifiers::CONTROL);
+        }
+        if self.meta_key {
+            modifiers.insert(Modifiers::META);
+        }
+        if self.shift_key {
+            modifiers.insert(Modifiers::SHIFT);
+        }
+        modifiers
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasTouchData for SerializedTouchData {
+    fn touches(&self) -> Vec<TouchPoint> {
+        self.touches.clone().into_iter().map(Into::into).collect()
+    }
+
+    fn touches_changed(&self) -> Vec<TouchPoint> {
+        self.changed_touches
+            .clone()
+            .into_iter()
+            .map(Into::into)
+            .collect()
+    }
+
+    fn target_touches(&self) -> Vec<TouchPoint> {
+        self.target_touches
+            .clone()
+            .into_iter()
+            .map(Into::into)
+            .collect()
+    }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for TouchData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedTouchData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for TouchData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedTouchData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+pub trait HasTouchData: ModifiersInteraction + std::any::Any {
+    /// Get the touches that are currently down
+    fn touches(&self) -> Vec<TouchPoint>;
+
+    /// Get the touches that have changed since the last event
+    fn touches_changed(&self) -> Vec<TouchPoint>;
+
+    /// Get the touches that started and stayed on the element that triggered this event
+    fn target_touches(&self) -> Vec<TouchPoint>;
+
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
+}
+
+pub struct TouchPoint {
+    inner: Box<dyn HasTouchPointData>,
+}
+
+impl<E: HasTouchPointData> From<E> for TouchPoint {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl TouchPoint {
+    /// Create a new TouchPoint
+    pub fn new(inner: impl HasTouchPointData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// A unique identifier for this touch point that will be the same for the duration of the touch
+    fn identifier(&self) -> i32 {
+        self.inner.identifier()
+    }
+
+    /// the pressure of the touch
+    fn force(&self) -> f64 {
+        self.inner.force()
+    }
+
+    /// the radius of the touch
+    fn radius(&self) -> ScreenPoint {
+        self.inner.radius()
+    }
+
+    /// the rotation of the touch in degrees between 0 and 90
+    fn rotation(&self) -> f64 {
+        self.inner.rotation()
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+impl std::fmt::Debug for TouchPoint {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("TouchPoint")
+            .field("client_coordinates", &self.client_coordinates())
+            .field("page_coordinates", &self.page_coordinates())
+            .field("screen_coordinates", &self.screen_coordinates())
+            .field("identifier", &self.identifier())
+            .field("force", &self.force())
+            .field("radius", &self.radius())
+            .field("rotation", &self.rotation())
+            .finish()
+    }
+}
+
+impl InteractionLocation for TouchPoint {
+    fn client_coordinates(&self) -> ClientPoint {
+        self.inner.client_coordinates()
+    }
+
+    fn page_coordinates(&self) -> PagePoint {
+        self.inner.page_coordinates()
+    }
+
+    fn screen_coordinates(&self) -> ScreenPoint {
+        self.inner.screen_coordinates()
+    }
+}
+
+/// A trait for touch point data
+pub trait HasTouchPointData: InteractionLocation + std::any::Any {
+    /// A unique identifier for this touch point that will be the same for the duration of the touch
+    fn identifier(&self) -> i32;
+
+    /// the pressure of the touch
+    fn force(&self) -> f64;
+
+    /// the radius of the touch
+    fn radius(&self) -> ScreenPoint;
+
+    /// the rotation of the touch in degrees between 0 and 90
+    fn rotation(&self) -> f64;
+
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of TouchPoint
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+struct SerializedTouchPoint {
+    identifier: i32,
+    client_x: f64,
+    client_y: f64,
+    page_x: f64,
+    page_y: f64,
+    screen_x: f64,
+    screen_y: f64,
+    force: f64,
+    radius_x: f64,
+    radius_y: f64,
+    rotation_angle: f64,
+}
+
+#[cfg(feature = "serialize")]
+impl From<&TouchPoint> for SerializedTouchPoint {
+    fn from(point: &TouchPoint) -> Self {
+        let client_coordinates = point.client_coordinates();
+
+        let page_coordinates = point.page_coordinates();
+        let screen_coordinates = point.screen_coordinates();
+        Self {
+            identifier: point.identifier(),
+            client_x: client_coordinates.x,
+            client_y: client_coordinates.y,
+            page_x: page_coordinates.x,
+            page_y: page_coordinates.y,
+            screen_x: screen_coordinates.x,
+            screen_y: screen_coordinates.y,
+            force: point.force(),
+            radius_x: point.radius().x,
+            radius_y: point.radius().y,
+            rotation_angle: point.rotation(),
+        }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasTouchPointData for SerializedTouchPoint {
+    /// A unique identifier for this touch point that will be the same for the duration of the touch
+    fn identifier(&self) -> i32 {
+        self.identifier
+    }
+
+    /// the pressure of the touch
+    fn force(&self) -> f64 {
+        self.force
+    }
+
+    /// the radius of the touch
+    fn radius(&self) -> ScreenPoint {
+        ScreenPoint::new(self.radius_x, self.radius_y)
+    }
+
+    /// the rotation of the touch in degrees between 0 and 90
+    fn rotation(&self) -> f64 {
+        self.rotation_angle
+    }
+
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl InteractionLocation for SerializedTouchPoint {
+    /// Gets the coordinates of the event relative to the browser viewport.
+    fn client_coordinates(&self) -> ClientPoint {
+        ClientPoint::new(self.client_x, self.client_y)
+    }
+
+    /// Gets the coordinates of the event relative to the screen.
+    fn screen_coordinates(&self) -> ScreenPoint {
+        ScreenPoint::new(self.screen_x, self.screen_y)
+    }
+
+    /// Gets the coordinates of the event relative to the page.
+    fn page_coordinates(&self) -> PagePoint {
+        PagePoint::new(self.page_x, self.page_y)
+    }
 }
 
 impl_event! {

packages/html/src/events/transition.rs

@@ -1,12 +1,111 @@
 use dioxus_core::Event;
 
 pub type TransitionEvent = Event<TransitionData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq)]
+
 pub struct TransitionData {
-    pub property_name: String,
-    pub pseudo_element: String,
-    pub elapsed_time: f32,
+    inner: Box<dyn HasTransitionData>,
+}
+
+impl<E: HasTransitionData> From<E> for TransitionData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for TransitionData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("TransitionData")
+            .field("property_name", &self.inner.property_name())
+            .field("pseudo_element", &self.inner.pseudo_element())
+            .field("elapsed_time", &self.inner.elapsed_time())
+            .finish()
+    }
+}
+
+impl PartialEq for TransitionData {
+    fn eq(&self, other: &Self) -> bool {
+        self.inner.property_name() == other.inner.property_name()
+            && self.inner.pseudo_element() == other.inner.pseudo_element()
+            && self.inner.elapsed_time() == other.inner.elapsed_time()
+    }
+}
+
+impl TransitionData {
+    /// Create a new TransitionData
+    pub fn new(inner: impl HasTransitionData + 'static) -> Self {
+        Self {
+            inner: Box::new(inner),
+        }
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of TransitionData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedTransitionData {
+    property_name: String,
+    pseudo_element: String,
+    elapsed_time: f32,
+}
+
+#[cfg(feature = "serialize")]
+impl From<&TransitionData> for SerializedTransitionData {
+    fn from(data: &TransitionData) -> Self {
+        Self {
+            property_name: data.inner.property_name(),
+            pseudo_element: data.inner.pseudo_element(),
+            elapsed_time: data.inner.elapsed_time(),
+        }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasTransitionData for SerializedTransitionData {
+    fn property_name(&self) -> String {
+        self.property_name.clone()
+    }
+
+    fn pseudo_element(&self) -> String {
+        self.pseudo_element.clone()
+    }
+
+    fn elapsed_time(&self) -> f32 {
+        self.elapsed_time
+    }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for TransitionData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedTransitionData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for TransitionData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedTransitionData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+pub trait HasTransitionData: std::any::Any {
+    fn property_name(&self) -> String;
+    fn pseudo_element(&self) -> String;
+    fn elapsed_time(&self) -> f32;
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
 }
 
 impl_event! {

packages/html/src/events/wheel.rs

@@ -1,78 +1,129 @@
 use dioxus_core::Event;
-use euclid::UnknownUnit;
-use std::fmt::{Debug, Formatter};
+use std::fmt::Formatter;
 
-use crate::geometry::{LinesVector, PagesVector, PixelsVector, WheelDelta};
+use crate::geometry::WheelDelta;
 
 pub type WheelEvent = Event<WheelData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, PartialEq, Default)]
+
 pub struct WheelData {
-    #[deprecated(since = "0.3.0", note = "use delta() instead")]
-    pub delta_mode: u32,
-    #[deprecated(since = "0.3.0", note = "use delta() instead")]
-    pub delta_x: f64,
-    #[deprecated(since = "0.3.0", note = "use delta() instead")]
-    pub delta_y: f64,
-    #[deprecated(since = "0.3.0", note = "use delta() instead")]
-    pub delta_z: f64,
+    inner: Box<dyn HasWheelData>,
 }
 
-impl_event![
-    WheelData;
-
-    /// Called when the mouse wheel is rotated over an element.
-    onwheel
-];
+impl<E: HasWheelData> From<E> for WheelData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
 
-impl WheelData {
-    /// Construct a new WheelData with the specified wheel movement delta
-    pub fn new(delta: WheelDelta) -> Self {
-        let (delta_mode, vector) = match delta {
-            WheelDelta::Pixels(v) => (0, v.cast_unit::<UnknownUnit>()),
-            WheelDelta::Lines(v) => (1, v.cast_unit::<UnknownUnit>()),
-            WheelDelta::Pages(v) => (2, v.cast_unit::<UnknownUnit>()),
-        };
+impl std::fmt::Debug for WheelData {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("WheelData")
+            .field("delta", &self.delta())
+            .finish()
+    }
+}
 
-        #[allow(deprecated)]
-        WheelData {
-            delta_mode,
-            delta_x: vector.x,
-            delta_y: vector.y,
-            delta_z: vector.z,
-        }
+impl PartialEq for WheelData {
+    fn eq(&self, other: &Self) -> bool {
+        self.inner.delta() == other.inner.delta()
     }
+}
 
-    /// Construct from the attributes of the web wheel event
-    pub fn from_web_attributes(delta_mode: u32, delta_x: f64, delta_y: f64, delta_z: f64) -> Self {
-        #[allow(deprecated)]
+impl WheelData {
+    /// Create a new WheelData
+    pub fn new(inner: impl HasWheelData + 'static) -> Self {
         Self {
-            delta_mode,
-            delta_x,
-            delta_y,
-            delta_z,
+            inner: Box::new(inner),
         }
     }
 
     /// The amount of wheel movement
     #[allow(deprecated)]
     pub fn delta(&self) -> WheelDelta {
-        let x = self.delta_x;
-        let y = self.delta_y;
-        let z = self.delta_z;
-        match self.delta_mode {
-            0 => WheelDelta::Pixels(PixelsVector::new(x, y, z)),
-            1 => WheelDelta::Lines(LinesVector::new(x, y, z)),
-            2 => WheelDelta::Pages(PagesVector::new(x, y, z)),
-            _ => panic!("Invalid delta mode, {:?}", self.delta_mode),
+        self.inner.delta()
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+#[cfg(feature = "serialize")]
+/// A serialized version of WheelData
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+pub struct SerializedWheelData {
+    pub delta_mode: u32,
+    pub delta_x: f64,
+    pub delta_y: f64,
+    pub delta_z: f64,
+}
+
+#[cfg(feature = "serialize")]
+impl SerializedWheelData {
+    /// Create a new SerializedWheelData
+    pub fn new(delta: WheelDelta) -> Self {
+        let delta_mode = match delta {
+            WheelDelta::Pixels(_) => 0,
+            WheelDelta::Lines(_) => 1,
+            WheelDelta::Pages(_) => 2,
+        };
+        let delta_raw = delta.strip_units();
+        Self {
+            delta_mode,
+            delta_x: delta_raw.x,
+            delta_y: delta_raw.y,
+            delta_z: delta_raw.z,
         }
     }
 }
 
-impl Debug for WheelData {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("WheelData")
-            .field("delta", &self.delta())
-            .finish()
+#[cfg(feature = "serialize")]
+impl From<&WheelData> for SerializedWheelData {
+    fn from(data: &WheelData) -> Self {
+        Self::new(data.delta())
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasWheelData for SerializedWheelData {
+    fn delta(&self) -> WheelDelta {
+        WheelDelta::from_web_attributes(self.delta_mode, self.delta_x, self.delta_y, self.delta_z)
+    }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
     }
 }
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for WheelData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedWheelData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for WheelData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedWheelData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
+}
+
+impl_event![
+    WheelData;
+
+    /// Called when the mouse wheel is rotated over an element.
+    onwheel
+];
+
+pub trait HasWheelData: std::any::Any {
+    /// The amount of wheel movement
+    fn delta(&self) -> WheelDelta;
+
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
+}

packages/html/src/geometry.rs

@@ -47,7 +47,7 @@ pub type PagesVector = Vector3D<f64, Pages>;
 /// A vector representing the amount the mouse wheel was moved
 ///
 /// This may be expressed in Pixels, Lines or Pages
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub enum WheelDelta {
     /// Movement in Pixels
@@ -59,6 +59,16 @@ pub enum WheelDelta {
 }
 
 impl WheelDelta {
+    /// Construct from the attributes of the web wheel event
+    pub fn from_web_attributes(delta_mode: u32, delta_x: f64, delta_y: f64, delta_z: f64) -> Self {
+        match delta_mode {
+            0 => WheelDelta::Pixels(PixelsVector::new(delta_x, delta_y, delta_z)),
+            1 => WheelDelta::Lines(LinesVector::new(delta_x, delta_y, delta_z)),
+            2 => WheelDelta::Pages(PagesVector::new(delta_x, delta_y, delta_z)),
+            _ => panic!("Invalid delta mode, {:?}", delta_mode),
+        }
+    }
+
     /// Convenience function for constructing a WheelDelta with pixel units
     pub fn pixels(x: f64, y: f64, z: f64) -> Self {
         WheelDelta::Pixels(PixelsVector::new(x, y, z))
@@ -96,7 +106,7 @@ impl WheelDelta {
 }
 
 /// Coordinates of a point in the app's interface
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 pub struct Coordinates {
     screen: ScreenPoint,
     client: ClientPoint,

packages/html/src/input_data.rs

@@ -8,9 +8,10 @@ use keyboard_types::Location;
 /// A mouse button type (such as Primary/Secondary)
 // note: EnumSetType also derives Copy and Clone for some reason
 #[allow(clippy::unused_unit)]
-#[derive(EnumSetType, Debug)]
+#[derive(EnumSetType, Debug, Default)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub enum MouseButton {
+    #[default]
     /// Primary button (typically the left button)
     Primary,
     /// Secondary button (typically the right button)

packages/html/src/lib.rs

@@ -27,6 +27,7 @@ mod global_attributes;
 pub mod input_data;
 #[cfg(feature = "native-bind")]
 pub mod native_bind;
+pub mod point_interaction;
 mod render_template;
 #[cfg(feature = "wasm-bind")]
 mod web_sys_bind;
@@ -42,9 +43,13 @@ pub use events::*;
 pub use global_attributes::*;
 pub use render_template::*;
 
-mod eval;
+#[cfg(feature = "eval")]
+pub mod eval;
 
 pub mod prelude {
+    #[cfg(feature = "eval")]
     pub use crate::eval::*;
     pub use crate::events::*;
+    pub use crate::point_interaction::*;
+    pub use keyboard_types::{self, Code, Key, Location, Modifiers};
 }

packages/html/src/point_interaction.rs

@@ -0,0 +1,214 @@
+use keyboard_types::Modifiers;
+
+use crate::{
+    geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint},
+    input_data::{MouseButton, MouseButtonSet},
+};
+
+/// A interaction that contains data about the location of the event.
+pub trait InteractionLocation {
+    /// Gets the coordinates of the event relative to the browser viewport.
+    fn client_coordinates(&self) -> ClientPoint;
+
+    /// Gets the coordinates of the event relative to the screen.
+    fn screen_coordinates(&self) -> ScreenPoint;
+
+    /// Gets the coordinates of the event relative to the page.
+    fn page_coordinates(&self) -> PagePoint;
+}
+
+/// A interaction that contains data about the location of the event.
+pub trait InteractionElementOffset: InteractionLocation {
+    /// Gets the coordinates of the event.
+    fn coordinates(&self) -> Coordinates {
+        Coordinates::new(
+            self.screen_coordinates(),
+            self.client_coordinates(),
+            self.element_coordinates(),
+            self.page_coordinates(),
+        )
+    }
+
+    /// Gets the coordinates of the event relative to the target element.
+    fn element_coordinates(&self) -> ElementPoint;
+}
+
+/// A interaction that contains data about the pointer button(s) that triggered the event.
+pub trait PointerInteraction: InteractionElementOffset + ModifiersInteraction {
+    /// Gets the button that triggered the event.
+    fn trigger_button(&self) -> Option<MouseButton>;
+
+    /// Gets the buttons that are currently held down.
+    fn held_buttons(&self) -> MouseButtonSet;
+}
+
+/// A interaction that contains data about the current state of the keyboard modifiers.
+pub trait ModifiersInteraction {
+    /// Gets the modifiers of the pointer event.
+    fn modifiers(&self) -> Modifiers;
+}
+
+#[cfg(feature = "serialize")]
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone, Default)]
+pub(crate) struct SerializedPointInteraction {
+    pub alt_key: bool,
+
+    /// The button number that was pressed (if applicable) when the mouse event was fired.
+    pub button: i16,
+
+    /// Indicates which buttons are pressed on the mouse (or other input device) when a mouse event is triggered.
+    ///
+    /// Each button that can be pressed is represented by a given number (see below). If more than one button is pressed, the button values are added together to produce a new number. For example, if the secondary (2) and auxiliary (4) buttons are pressed simultaneously, the value is 6 (i.e., 2 + 4).
+    ///
+    /// - 1: Primary button (usually the left button)
+    /// - 2: Secondary button (usually the right button)
+    /// - 4: Auxiliary button (usually the mouse wheel button or middle button)
+    /// - 8: 4th button (typically the "Browser Back" button)
+    /// - 16 : 5th button (typically the "Browser Forward" button)
+    pub buttons: u16,
+
+    /// The horizontal coordinate within the application's viewport at which the event occurred (as opposed to the coordinate within the page).
+    ///
+    /// For example, clicking on the left edge of the viewport will always result in a mouse event with a clientX value of 0, regardless of whether the page is scrolled horizontally.
+    pub client_x: i32,
+
+    /// The vertical coordinate within the application's viewport at which the event occurred (as opposed to the coordinate within the page).
+    ///
+    /// For example, clicking on the top edge of the viewport will always result in a mouse event with a clientY value of 0, regardless of whether the page is scrolled vertically.
+    pub client_y: i32,
+
+    /// True if the control key was down when the mouse event was fired.
+    pub ctrl_key: bool,
+
+    /// True if the meta key was down when the mouse event was fired.
+    pub meta_key: bool,
+
+    /// The offset in the X coordinate of the mouse pointer between that event and the padding edge of the target node.
+    pub offset_x: i32,
+
+    /// The offset in the Y coordinate of the mouse pointer between that event and the padding edge of the target node.
+    pub offset_y: i32,
+
+    /// The X (horizontal) coordinate (in pixels) of the mouse, relative to the left edge of the entire document. This includes any portion of the document not currently visible.
+    ///
+    /// Being based on the edge of the document as it is, this property takes into account any horizontal scrolling of the page. For example, if the page is scrolled such that 200 pixels of the left side of the document are scrolled out of view, and the mouse is clicked 100 pixels inward from the left edge of the view, the value returned by pageX will be 300.
+    pub page_x: i32,
+
+    /// The Y (vertical) coordinate in pixels of the event relative to the whole document.
+    ///
+    /// See `page_x`.
+    pub page_y: i32,
+
+    /// The X coordinate of the mouse pointer in global (screen) coordinates.
+    pub screen_x: i32,
+
+    /// The Y coordinate of the mouse pointer in global (screen) coordinates.
+    pub screen_y: i32,
+
+    /// True if the shift key was down when the mouse event was fired.
+    pub shift_key: bool,
+}
+
+#[cfg(feature = "serialize")]
+impl SerializedPointInteraction {
+    pub fn new(
+        trigger_button: Option<MouseButton>,
+        held_buttons: MouseButtonSet,
+        coordinates: Coordinates,
+        modifiers: Modifiers,
+    ) -> Self {
+        let alt_key = modifiers.contains(Modifiers::ALT);
+        let ctrl_key = modifiers.contains(Modifiers::CONTROL);
+        let meta_key = modifiers.contains(Modifiers::META);
+        let shift_key = modifiers.contains(Modifiers::SHIFT);
+
+        let [client_x, client_y]: [i32; 2] = coordinates.client().cast().into();
+        let [offset_x, offset_y]: [i32; 2] = coordinates.element().cast().into();
+        let [page_x, page_y]: [i32; 2] = coordinates.page().cast().into();
+        let [screen_x, screen_y]: [i32; 2] = coordinates.screen().cast().into();
+        Self {
+            button: trigger_button
+                .map_or(MouseButton::default(), |b| b)
+                .into_web_code(),
+            buttons: crate::input_data::encode_mouse_button_set(held_buttons),
+            meta_key,
+            ctrl_key,
+            shift_key,
+            alt_key,
+            client_x,
+            client_y,
+            screen_x,
+            screen_y,
+            offset_x,
+            offset_y,
+            page_x,
+            page_y,
+        }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<E: PointerInteraction> From<&E> for SerializedPointInteraction {
+    fn from(data: &E) -> Self {
+        let trigger_button = data.trigger_button();
+        let held_buttons = data.held_buttons();
+        let coordinates = data.coordinates();
+        let modifiers = data.modifiers();
+        Self::new(trigger_button, held_buttons, coordinates, modifiers)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl PointerInteraction for SerializedPointInteraction {
+    fn held_buttons(&self) -> MouseButtonSet {
+        crate::input_data::decode_mouse_button_set(self.buttons)
+    }
+
+    fn trigger_button(&self) -> Option<MouseButton> {
+        Some(MouseButton::from_web_code(self.button))
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl ModifiersInteraction for SerializedPointInteraction {
+    fn modifiers(&self) -> Modifiers {
+        let mut modifiers = Modifiers::empty();
+
+        if self.alt_key {
+            modifiers.insert(Modifiers::ALT);
+        }
+        if self.ctrl_key {
+            modifiers.insert(Modifiers::CONTROL);
+        }
+        if self.meta_key {
+            modifiers.insert(Modifiers::META);
+        }
+        if self.shift_key {
+            modifiers.insert(Modifiers::SHIFT);
+        }
+
+        modifiers
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl InteractionLocation for SerializedPointInteraction {
+    fn client_coordinates(&self) -> ClientPoint {
+        ClientPoint::new(self.client_x.into(), self.client_y.into())
+    }
+
+    fn screen_coordinates(&self) -> ScreenPoint {
+        ScreenPoint::new(self.screen_x.into(), self.screen_y.into())
+    }
+
+    fn page_coordinates(&self) -> PagePoint {
+        PagePoint::new(self.page_x.into(), self.page_y.into())
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl InteractionElementOffset for SerializedPointInteraction {
+    fn element_coordinates(&self) -> ElementPoint {
+        ElementPoint::new(self.offset_x.into(), self.offset_y.into())
+    }
+}

packages/html/src/transit.rs

@@ -4,7 +4,8 @@ use crate::events::*;
 use dioxus_core::ElementId;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Debug, Clone, PartialEq)]
+#[cfg(feature = "serialize")]
+#[derive(Serialize, Debug, PartialEq)]
 pub struct HtmlEvent {
     pub element: ElementId,
     pub name: String,
@@ -12,6 +13,7 @@ pub struct HtmlEvent {
     pub data: EventData,
 }
 
+#[cfg(feature = "serialize")]
 impl<'de> Deserialize<'de> for HtmlEvent {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -41,6 +43,7 @@ impl<'de> Deserialize<'de> for HtmlEvent {
     }
 }
 
+#[cfg(feature = "serialize")]
 fn fun_name(
     name: &str,
     data: serde_value::Value,
@@ -130,57 +133,90 @@ fn fun_name(
     Ok(data)
 }
 
+#[cfg(feature = "serialize")]
 impl HtmlEvent {
     pub fn bubbles(&self) -> bool {
         event_bubbles(&self.name)
     }
 }
 
-#[derive(Deserialize, Serialize, Debug, Clone, PartialEq)]
+#[derive(Deserialize, Serialize, Debug, PartialEq)]
 #[serde(untagged)]
 #[non_exhaustive]
 pub enum EventData {
-    Mouse(MouseData),
-    Clipboard(ClipboardData),
-    Composition(CompositionData),
-    Keyboard(KeyboardData),
-    Focus(FocusData),
-    Form(FormData),
-    Drag(DragData),
-    Pointer(PointerData),
-    Selection(SelectionData),
-    Touch(TouchData),
-    Scroll(ScrollData),
-    Wheel(WheelData),
-    Media(MediaData),
-    Animation(AnimationData),
-    Transition(TransitionData),
-    Toggle(ToggleData),
-    Image(ImageData),
+    Mouse(SerializedMouseData),
+    Clipboard(SerializedClipboardData),
+    Composition(SerializedCompositionData),
+    Keyboard(SerializedKeyboardData),
+    Focus(SerializedFocusData),
+    Form(SerializedFormData),
+    Drag(SerializedDragData),
+    Pointer(SerializedPointerData),
+    Selection(SerializedSelectionData),
+    Touch(SerializedTouchData),
+    Scroll(SerializedScrollData),
+    Wheel(SerializedWheelData),
+    Media(SerializedMediaData),
+    Animation(SerializedAnimationData),
+    Transition(SerializedTransitionData),
+    Toggle(SerializedToggleData),
+    Image(SerializedImageData),
     Mounted,
 }
 
 impl EventData {
     pub fn into_any(self) -> Rc<dyn Any> {
         match self {
-            EventData::Mouse(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Clipboard(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Composition(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Keyboard(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Focus(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Form(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Drag(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Pointer(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Selection(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Touch(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Scroll(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Wheel(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Media(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Animation(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Transition(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Toggle(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Image(data) => Rc::new(data) as Rc<dyn Any>,
-            EventData::Mounted => Rc::new(MountedData::new(())) as Rc<dyn Any>,
+            EventData::Mouse(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Clipboard(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Composition(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Keyboard(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Focus(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Form(data) => Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>,
+            EventData::Drag(data) => Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>,
+            EventData::Pointer(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Selection(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Touch(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Scroll(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Wheel(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Media(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Animation(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Transition(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Toggle(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Image(data) => {
+                Rc::new(PlatformEventData::new(Box::new(data))) as Rc<dyn Any>
+            }
+            EventData::Mounted => {
+                Rc::new(PlatformEventData::new(Box::new(MountedData::new(())))) as Rc<dyn Any>
+            }
         }
     }
 }
@@ -189,7 +225,7 @@ impl EventData {
 fn test_back_and_forth() {
     let data = HtmlEvent {
         element: ElementId(0),
-        data: EventData::Mouse(MouseData::default()),
+        data: EventData::Mouse(SerializedMouseData::default()),
         name: "click".to_string(),
         bubbles: true,
     };
@@ -224,3 +260,148 @@ fn test_back_and_forth() {
 
     assert_eq!(data, p);
 }
+
+/// A trait for converting from a serialized event to a concrete event type.
+pub struct SerializedHtmlEventConverter;
+
+impl HtmlEventConverter for SerializedHtmlEventConverter {
+    fn convert_animation_data(&self, event: &PlatformEventData) -> AnimationData {
+        event
+            .downcast::<SerializedAnimationData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_clipboard_data(&self, event: &PlatformEventData) -> ClipboardData {
+        event
+            .downcast::<SerializedClipboardData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_composition_data(&self, event: &PlatformEventData) -> CompositionData {
+        event
+            .downcast::<SerializedCompositionData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_drag_data(&self, event: &PlatformEventData) -> DragData {
+        event
+            .downcast::<SerializedDragData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_focus_data(&self, event: &PlatformEventData) -> FocusData {
+        event
+            .downcast::<SerializedFocusData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_form_data(&self, event: &PlatformEventData) -> FormData {
+        event
+            .downcast::<SerializedFormData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_image_data(&self, event: &PlatformEventData) -> ImageData {
+        event
+            .downcast::<SerializedImageData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_keyboard_data(&self, event: &PlatformEventData) -> KeyboardData {
+        event
+            .downcast::<SerializedKeyboardData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_media_data(&self, event: &PlatformEventData) -> MediaData {
+        event
+            .downcast::<SerializedMediaData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_mounted_data(&self, _: &PlatformEventData) -> MountedData {
+        MountedData::from(())
+    }
+
+    fn convert_mouse_data(&self, event: &PlatformEventData) -> MouseData {
+        event
+            .downcast::<SerializedMouseData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_pointer_data(&self, event: &PlatformEventData) -> PointerData {
+        event
+            .downcast::<SerializedPointerData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_scroll_data(&self, event: &PlatformEventData) -> ScrollData {
+        event
+            .downcast::<SerializedScrollData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_selection_data(&self, event: &PlatformEventData) -> SelectionData {
+        event
+            .downcast::<SerializedSelectionData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_toggle_data(&self, event: &PlatformEventData) -> ToggleData {
+        event
+            .downcast::<SerializedToggleData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_touch_data(&self, event: &PlatformEventData) -> TouchData {
+        event
+            .downcast::<SerializedTouchData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_transition_data(&self, event: &PlatformEventData) -> TransitionData {
+        event
+            .downcast::<SerializedTransitionData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+
+    fn convert_wheel_data(&self, event: &PlatformEventData) -> WheelData {
+        event
+            .downcast::<SerializedWheelData>()
+            .cloned()
+            .unwrap()
+            .into()
+    }
+}