From 7ffb204eacebcabc5dcd52497b1fb8b5d3f1a1d6 Mon Sep 17 00:00:00 2001
From: Evan Almloff <evanalmloff@gmail.com>
Date: Thu, 4 Jan 2024 19:36:10 -0600
Subject: [PATCH] fix event tests in core

---
 examples/compose.rs                      |  2 +-
 packages/core/tests/event_propagation.rs | 18 ++++++++----------
 packages/ssr/Cargo.toml                  |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/examples/compose.rs b/examples/compose.rs
index 23f703bd2..133192281 100644
--- a/examples/compose.rs
+++ b/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"
             }
diff --git a/packages/core/tests/event_propagation.rs b/packages/core/tests/event_propagation.rs
index d694b1ff1..d9d96ac32 100644
--- a/packages/core/tests/event_propagation.rs
+++ b/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;
                 }
-            }
-        }
+            } }
     }
 }
diff --git a/packages/ssr/Cargo.toml b/packages/ssr/Cargo.toml
index 71f5b26a0..1a8d475ee 100644
--- a/packages/ssr/Cargo.toml
+++ b/packages/ssr/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["dom", "ui", "gui", "react", "ssr"]
 
 [dependencies]
 dioxus-core = { workspace = true, features = ["serialize"] }
-dioxus-html = { workspace = true }
+dioxus-html = { workspace = true, features = ["eval"]}
 askama_escape = "0.10.3"
 thiserror = "1.0.23"
 rustc-hash = "1.1.0"