post merge fixes

packages/core/src/diff.rs

@@ -750,7 +750,7 @@ impl<'b> VirtualDom {
 
     fn remove_node(&mut self, node: &'b VNode<'b>, gen_muts: bool) {
         // Clean up the roots, assuming we need to generate mutations for these
-        for (idx, _) in node.template.roots.iter().enumerate() {
+        for (idx, _) in node.template.get().roots.iter().enumerate() {
             if let Some(dy) = node.dynamic_root(idx) {
                 self.remove_dynamic_node(dy, gen_muts);
             } else {
@@ -764,7 +764,7 @@ impl<'b> VirtualDom {
 
         for (idx, dyn_node) in node.dynamic_nodes.iter().enumerate() {
             // Roots are cleaned up automatically above
-            if node.template.node_paths[idx].len() == 1 {
+            if node.template.get().node_paths[idx].len() == 1 {
                 continue;
             }
 
@@ -775,7 +775,7 @@ impl<'b> VirtualDom {
         let mut id = None;
         for (idx, attr) in node.dynamic_attrs.iter().enumerate() {
             // We'll clean up the root nodes either way, so don't worry
-            if node.template.attr_paths[idx].len() == 1 {
+            if node.template.get().attr_paths[idx].len() == 1 {
                 continue;
             }
 

packages/desktop/src/controller.rs

@@ -1,8 +1,7 @@
 use crate::desktop_context::{DesktopContext, UserWindowEvent};
-use dioxus_html::HtmlEvent;
-use futures_channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
 use crate::events::{decode_event, EventMessage};
 use dioxus_core::*;
+use futures_channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
 use futures_util::StreamExt;
 #[cfg(target_os = "ios")]
 use objc::runtime::Object;

packages/desktop/src/events.rs

@@ -1,6 +1,10 @@
 //! Convert a serialized event to an event trigger
 
+use dioxus_html::*;
 use serde::{Deserialize, Serialize};
+use serde_json::from_value;
+use std::any::Any;
+use std::rc::Rc;
 
 #[derive(Deserialize, Serialize)]
 pub(crate) struct IpcMessage {

packages/html/src/events/drag.rs

@@ -13,7 +13,7 @@ pub struct DragData {
     pub mouse: MouseData,
 
     /// And then add the rest of the drag data
-    pub data: Box<dyn Any>,
+    pub data: Box<dyn std::any::Any>,
 }
 
 impl_event! {

packages/html/src/events/form.rs

@@ -13,7 +13,7 @@ pub struct FormData {
     pub values: HashMap<String, String>,
 
     #[cfg_attr(feature = "serialize", serde(skip))]
-    pub files: Option<Arc<dyn FileEngine>>,
+    pub files: Option<std::sync::Arc<dyn FileEngine>>,
 }
 
 impl Debug for FormData {