Merge branch 'upstream' into fix-hot-reloading

packages/desktop/src/lib.rs

@@ -18,7 +18,6 @@ use std::sync::Arc;
 
 use desktop_context::UserWindowEvent;
 pub use desktop_context::{use_eval, use_window, DesktopContext, EvalResult};
-use dioxus_html::HtmlEvent;
 use futures_channel::mpsc::UnboundedSender;
 pub use wry;
 pub use wry::application as tao;
@@ -160,7 +159,7 @@ fn build_webview(
     is_ready: Arc<AtomicBool>,
     proxy: tao::event_loop::EventLoopProxy<UserWindowEvent>,
     eval_sender: tokio::sync::mpsc::UnboundedSender<serde_json::Value>,
-    event_tx: UnboundedSender<HtmlEvent>,
+    event_tx: UnboundedSender<serde_json::Value>,
 ) -> wry::webview::WebView {
     let builder = cfg.window.clone();
     let window = builder.build(event_loop).unwrap();
@@ -194,9 +193,7 @@ fn build_webview(
                         eval_sender.send(result).unwrap();
                     }
                     "user_event" => {
-                        if let Ok(evt) = serde_json::from_value(message.params()) {
-                            _ = event_tx.unbounded_send(evt);
-                        }
+                        _ = event_tx.unbounded_send(message.params());
                     }
                     "initialize" => {
                         is_ready.store(true, std::sync::atomic::Ordering::Relaxed);
@@ -243,16 +240,16 @@ fn build_webview(
         // in release mode, we don't want to show the dev tool or reload menus
         webview = webview.with_initialization_script(
             r#"
-        if (document.addEventListener) {
-            document.addEventListener('contextmenu', function(e) {
-                e.preventDefault();
-            }, false);
-        } else {
-            document.attachEvent('oncontextmenu', function() {
-                window.event.returnValue = false;
-            });
-        }
-    "#,
+                        if (document.addEventListener) {
+                        document.addEventListener('contextmenu', function(e) {
+                            e.preventDefault();
+                        }, false);
+                        } else {
+                        document.attachEvent('oncontextmenu', function() {
+                            window.event.returnValue = false;
+                        });
+                        }
+                    "#,
         )
     } else {
         // in debug, we are okay with the reload menu showing and dev tool