Merge branch 'upstream' into fix-hot-reloading

packages/desktop/src/controller.rs

@@ -1,7 +1,8 @@
 use crate::desktop_context::{DesktopContext, UserWindowEvent};
-use dioxus_core::*;
 use dioxus_html::HtmlEvent;
 use futures_channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
+use crate::events::{decode_event, EventMessage};
+use dioxus_core::*;
 use futures_util::StreamExt;
 #[cfg(target_os = "ios")]
 use objc::runtime::Object;
@@ -25,7 +26,8 @@ pub(super) struct DesktopController {
     pub(super) quit_app_on_close: bool,
     pub(super) is_ready: Arc<AtomicBool>,
     pub(super) proxy: EventLoopProxy<UserWindowEvent>,
-    pub(super) event_tx: UnboundedSender<HtmlEvent>,
+
+    pub(super) event_tx: UnboundedSender<serde_json::Value>,
     #[cfg(debug_assertions)]
     pub(super) templates_tx: UnboundedSender<Template<'static>>,
 
@@ -42,7 +44,7 @@ impl DesktopController {
         proxy: EventLoopProxy<UserWindowEvent>,
     ) -> Self {
         let edit_queue = Arc::new(Mutex::new(Vec::new()));
-        let (event_tx, mut event_rx) = unbounded::<HtmlEvent>();
+        let (event_tx, mut event_rx) = unbounded();
         let (templates_tx, mut templates_rx) = unbounded();
         let proxy2 = proxy.clone();
 
@@ -83,8 +85,14 @@ impl DesktopController {
                             dom.replace_template(template);
                         }
                         _ = dom.wait_for_work() => {}
-                        Some(value) = event_rx.next() => {
-                            dom.handle_event(&value.name,  value.data.into_any(), value.element,  dioxus_html::events::event_bubbles(&value.name));
+                        Some(json_value) = event_rx.next() => {
+                            if let Ok(value) = serde_json::from_value::<EventMessage>(json_value) {
+                                let name = value.event.clone();
+                                let el_id = ElementId(value.mounted_dom_id);
+                                if let Some(evt) = decode_event(value) {
+                                    dom.handle_event(&name,  evt, el_id,  dioxus_html::events::event_bubbles(&name));
+                                }
+                            }
                         }
                     }