Fix compilation errors with the latest version of dioxus

Cargo.toml

@@ -9,20 +9,20 @@ members = [
 ]
 
 [workspace.package]
-version = "0.5.0-alpha.0"
+version = "0.5.0-alpha.2"
 
 [workspace.dependencies]
-blitz = { path = "packages/blitz", version = "0.5.0-alpha.0" }
-blitz-core = { path = "packages/blitz-core", version = "0.5.0-alpha.0" }
-dioxus-tui = { path = "packages/dioxus-tui", version = "0.5.0-alpha.0" }
-dioxus-native-core = { path = "packages/native-core", version = "0.5.0-alpha.0" }
-dioxus-native-core-macro = { path = "packages/native-core-macro", version = "0.5.0-alpha.0" }
-plasmo = { path = "packages/plasmo", version = "0.5.0-alpha.0" }
+blitz = { path = "packages/blitz", version = "0.5.0-alpha.2" }
+blitz-core = { path = "packages/blitz-core", version = "0.5.0-alpha.2" }
+dioxus-tui = { path = "packages/dioxus-tui", version = "0.5.0-alpha.2" }
+dioxus-native-core = { path = "packages/native-core", version = "0.5.0-alpha.2" }
+dioxus-native-core-macro = { path = "packages/native-core-macro", version = "0.5.0-alpha.2" }
+plasmo = { path = "packages/plasmo", version = "0.5.0-alpha.2" }
 
-dioxus = { version = "0.5.0-alpha.0" }
-dioxus-core = { version = "0.5.0-alpha.0" }
-dioxus-hot-reload = { version = "0.5.0-alpha.0" }
-dioxus-html = { version = "0.5.0-alpha.0" }
+dioxus = { version = "0.5.0-alpha.2" }
+dioxus-core = { version = "0.5.0-alpha.2" }
+dioxus-hot-reload = { version = "0.5.0-alpha.2" }
+dioxus-html = { version = "0.5.0-alpha.2" }
 
 tracing = "0.1.37"
 tracing-futures = "0.2.5"

packages/blitz-core/Cargo.toml

@@ -10,11 +10,11 @@ repository = "https://github.com/DioxusLabs/blitz"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-dioxus-native-core = { git = "https://github.com/DioxusLabs/dioxus/", features = [
+dioxus-native-core = { workspace = true, features = [
     "layout-attributes",
 ] }
-dioxus-native-core-macro = { git = "https://github.com/DioxusLabs/dioxus/" }
-dioxus-html = { git = "https://github.com/DioxusLabs/dioxus/" }
+dioxus-native-core-macro = { workspace = true }
+dioxus-html = { version = "0.5.0-alpha.2" }
 taffy = "0.3.12"
 tokio = { version = "1.25.0", features = ["full"] }
 lightningcss = "1.0.0-alpha.39"

packages/blitz-core/src/events.rs

@@ -12,9 +12,7 @@ use tao::event::MouseButton;
 use vello::kurbo::Point;
 
 use dioxus_html::{
-    events::{FocusData, KeyboardData, MouseData, WheelData},
-    geometry::{euclid::Point2D, ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint},
-    input_data::{self, keyboard_types::Modifiers, MouseButtonSet},
+ geometry::{euclid::Point2D, ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint}, input_data::{self, keyboard_types::Modifiers, MouseButtonSet}, SerializedFocusData, SerializedKeyboardData, SerializedMouseData, SerializedWheelData
 };
 use dioxus_native_core::prelude::*;
 
@@ -40,17 +38,17 @@ struct CursorState {
 }
 
 impl CursorState {
-    fn get_event_mouse_data(&self) -> MouseData {
+    fn get_event_mouse_data(&self) -> SerializedMouseData {
         // MouseData::new(coordinates, trigger_button, held_buttons, modifiers)
-        MouseData::new(
+        SerializedMouseData::new(
+            None,
+            self.buttons,
             Coordinates::new(
                 self.position.screen(),
                 self.position.client(),
                 self.position.element(),
                 self.position.page(),
             ),
-            None,
-            self.buttons,
             Modifiers::default(),
         )
     }
@@ -95,10 +93,10 @@ pub struct DomEvent {
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum EventData {
-    Mouse(MouseData),
-    Keyboard(KeyboardData),
-    Focus(FocusData),
-    Wheel(WheelData),
+    Mouse(SerializedMouseData),
+    Keyboard(SerializedKeyboardData),
+    Focus(SerializedFocusData),
+    Wheel(SerializedWheelData),
 }
 
 impl EventData {
@@ -168,7 +166,7 @@ impl BlitzEventHandler {
                         let key = map_key(&event.logical_key);
                         let code = map_code(&event.physical_key);
 
-                        let data = Arc::new(EventData::Keyboard(KeyboardData::new(
+                        let data = Arc::new(EventData::Keyboard(SerializedKeyboardData::new(
                             key,
                             code,
                             match event.location {
@@ -187,7 +185,7 @@ impl BlitzEventHandler {
                                 _ => todo!(),
                             },
                             event.repeat,
-                            self.state.modifier_state,
+                            self.state.modifier_state,true
                         )));
 
                         // keypress events are only triggered when a key that has text is pressed
@@ -259,10 +257,10 @@ impl BlitzEventHandler {
                         let position =
                             Coordinates::new(screen_point, client_point, element_point, page_point);
 
-                        let data = MouseData::new(
-                            Coordinates::new(screen_point, client_point, element_point, page_point),
+                        let data = SerializedMouseData::new(
                             None,
                             self.state.cursor_state.buttons,
+                            Coordinates::new(screen_point, client_point, element_point, page_point),
                             self.state.modifier_state,
                         );
                         match (hovered, self.state.cursor_state.hovered) {
@@ -356,15 +354,15 @@ impl BlitzEventHandler {
 
                             let pos = &self.state.cursor_state.position;
 
-                            let data = Arc::new(EventData::Mouse(MouseData::new(
+                            let data = Arc::new(EventData::Mouse(SerializedMouseData::new(
+                                None,
+                                self.state.cursor_state.buttons,
                                 Coordinates::new(
                                     pos.screen(),
                                     pos.client(),
                                     pos.element(),
                                     pos.page(),
                                 ),
-                                None,
-                                self.state.cursor_state.buttons,
                                 self.state.modifier_state,
                             )));
 

packages/blitz/Cargo.toml

@@ -11,12 +11,12 @@ repository = "https://github.com/DioxusLabs/blitz"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus = { git = "https://github.com/DioxusLabs/dioxus/" }
-dioxus-native-core = { git = "https://github.com/DioxusLabs/dioxus/", features = [
+dioxus = { version = "0.5.0-alpha.2" }
+dioxus-native-core = { workspace = true, features = [
     "dioxus",
 ] }
-dioxus-html = { git = "https://github.com/DioxusLabs/dioxus/" }
-dioxus-hot-reload = { git = "https://github.com/DioxusLabs/dioxus/" }
+dioxus-html = { version = "0.5.0-alpha.2" }
+dioxus-hot-reload = { version = "0.5.0-alpha.2" }
 blitz-core = { path = "../blitz-core" }
 tokio = { version = "1.26.0", features = ["full"] }
 keyboard-types = "0.7.0"

packages/blitz/src/lib.rs

@@ -1,7 +1,7 @@
 use std::ops::Deref;
 use std::sync::Arc;
 
-use dioxus::core::{Component, VirtualDom};
+use dioxus::dioxus_core::{Component, VirtualDom};
 use dioxus_native_core::prelude::*;
 
 use blitz_core::EventData;
@@ -15,18 +15,17 @@ pub async fn launch_cfg(app: Component<()>, cfg: Config) {
     launch_cfg_with_props(app, (), cfg).await
 }
 
-pub async fn launch_cfg_with_props<Props: 'static + Send>(
+pub async fn launch_cfg_with_props<Props: 'static +Clone+ Send>(
     app: Component<Props>,
     props: Props,
     cfg: Config,
 ) {
     render(
         move |rdom, _| {
             let mut vdom = VirtualDom::new_with_props(app, props);
-            let muts = vdom.rebuild();
             let mut rdom = rdom.write().unwrap();
             let mut dioxus_state = DioxusState::create(&mut rdom);
-            dioxus_state.apply_mutations(&mut rdom, muts);
+            vdom.rebuild(&mut dioxus_state.create_mutation_writer(&mut rdom));
             DioxusRenderer {
                 vdom,
                 dioxus_state,
@@ -56,8 +55,7 @@ struct DioxusRenderer {
 impl Driver for DioxusRenderer {
     fn update(&mut self, mut root: NodeMut<()>) {
         let rdom = root.real_dom_mut();
-        let muts = self.vdom.render_immediate();
-        self.dioxus_state.apply_mutations(rdom, muts);
+        self.vdom.render_immediate(&mut self.dioxus_state.create_mutation_writer( rdom));
     }
 
     fn handle_event(
@@ -99,6 +97,7 @@ impl Driver for DioxusRenderer {
                     dioxus_hot_reload::HotReloadMsg::Shutdown => {
                         std::process::exit(0);
                     }
+                    _ => {}
                 }
             }
         });

packages/dioxus-tui/src/lib.rs

@@ -184,6 +184,7 @@ impl Driver for DioxusRenderer {
                     dioxus_hot_reload::HotReloadMsg::Shutdown => {
                         std::process::exit(0);
                     }
+                    dioxus_hot_reload::HotReloadMsg::UpdateAsset(_) => {}
                 }
             }
         });

packages/plasmo/src/hooks.rs

@@ -66,7 +66,7 @@ impl EventData {
 pub struct FormData {
     pub(crate) value: String,
 
-    pub values: HashMap<String, FormValue>,
+    pub values: HashMap<String, String>,
 
     pub(crate) files: Option<Files>,
 }
@@ -76,7 +76,7 @@ impl HasFormData for FormData {
         self.value.clone()
     }
 
-    fn values(&self) -> HashMap<String, FormValue> {
+    fn values(&self) -> HashMap<String, String> {
         self.values.clone()
     }