fix merge

packages/desktop/src/app.rs

@@ -12,7 +12,7 @@ use crate::{
 use crossbeam_channel::Receiver;
 use dioxus_core::{Component, ElementId, VirtualDom};
 use dioxus_html::{
-    native_bind::NativeFileEngine, FileEngine, HasFormData, HtmlEvent, MountedData,
+    native_bind::NativeFileEngine, FileEngine, HasFileData, HasFormData, HtmlEvent, MountedData,
     PlatformEventData, SerializedHtmlEventConverter,
 };
 use std::{
@@ -280,11 +280,13 @@ impl<P: 'static> App<P> {
             files: Arc<NativeFileEngine>,
         }
 
-        impl HasFormData for DesktopFileUploadForm {
+        impl HasFileData for DesktopFileUploadForm {
             fn files(&self) -> Option<Arc<dyn FileEngine>> {
                 Some(self.files.clone())
             }
+        }
 
+        impl HasFormData for DesktopFileUploadForm {
             fn as_any(&self) -> &dyn std::any::Any {
                 self
             }

packages/desktop/src/webview.rs

@@ -94,11 +94,10 @@ impl WebviewInstance {
             .unwrap()
             .with_ipc_handler(ipc_handler)
             .with_asynchronous_custom_protocol(String::from("dioxus"), request_handler)
-            .with_file_drop_handler(file_drop_handler)
             .with_web_context(&mut web_context);
 
         if let Some(handler) = file_handler {
-            webview = webview.with_file_drop_handler(handler)
+            webview = webview.with_file_drop_handler(move |evt| handler(window_id, evt))
         }
 
         // This was removed from wry, I'm not sure what replaced it