Merge branch 'upstream' into fix-hot-reloading

packages/html/src/events/drag.rs

@@ -8,11 +8,12 @@ pub type DragEvent = Event<DragData>;
 /// placing a pointer device (such as a mouse) on the touch surface and then dragging the pointer to a new location
 /// (such as another DOM element). Applications are free to interpret a drag and drop interaction in an
 /// application-specific way.
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone)]
 pub struct DragData {
     /// Inherit mouse data
     pub mouse: MouseData,
+
+    /// And then add the rest of the drag data
+    pub data: Box<dyn Any>,
 }
 
 impl_event! {

packages/html/src/events/form.rs

@@ -11,8 +11,9 @@ pub struct FormData {
     pub value: String,
 
     pub values: HashMap<String, String>,
-    // #[cfg_attr(feature = "serialize", serde(skip))]
-    // pub files: Option<Arc<dyn FileEngine>>,
+
+    #[cfg_attr(feature = "serialize", serde(skip))]
+    pub files: Option<Arc<dyn FileEngine>>,
 }
 
 impl Debug for FormData {