Implement DataTransfer::items()

packages/html/src/data_transfer.rs

@@ -1,7 +1,20 @@
+#[cfg(feature = "serialize")]
+pub use ser::*;
+#[cfg(feature = "serialize")]
+use serde::{Deserialize, Serialize};
+
 pub struct DataTransfer {
     inner: Box<dyn NativeDataTransfer>,
 }
 
+#[derive(Debug, PartialEq, Clone)]
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+pub struct DataTransferItem {
+    pub kind: String,
+    pub type_: String,
+    pub data: String,
+}
+
 impl DataTransfer {
     pub fn new(inner: impl NativeDataTransfer + 'static) -> Self {
         Self {
@@ -57,6 +70,10 @@ impl DataTransfer {
         self.inner.set_drop_effect(effect)
     }
 
+    pub fn items(&self) -> Vec<DataTransferItem> {
+        self.inner.items()
+    }
+
     pub fn files(&self) -> Vec<crate::file_data::FileData> {
         self.inner.files()
     }
@@ -70,24 +87,24 @@ pub trait NativeDataTransfer: Send + Sync {
     fn set_effect_allowed(&self, effect: &str);
     fn drop_effect(&self) -> String;
     fn set_drop_effect(&self, effect: &str);
+    fn items(&self) -> Vec<DataTransferItem> {
+        //TODO: Good for back compatibility, but this can probably be lost for 0.8
+        Vec::new()
+    }
     fn files(&self) -> Vec<crate::file_data::FileData>;
 }
 
 pub trait HasDataTransferData {
     fn data_transfer(&self) -> DataTransfer;
 }
 
-#[cfg(feature = "serialize")]
-pub use ser::*;
-#[cfg(feature = "serialize")]
-use serde::Serialize;
-
 #[cfg(feature = "serialize")]
 mod ser {
     use crate::DragData;
 
     use super::*;
-    use serde::{Deserialize, Serialize};
+
+    type SerializedDataTransferItem = DataTransferItem;
 
     /// A serialized version of DataTransfer
     #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
@@ -98,13 +115,6 @@ mod ser {
         pub drop_effect: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
-    pub struct SerializedDataTransferItem {
-        pub kind: String,
-        pub type_: String,
-        pub data: String,
-    }
-
     impl NativeDataTransfer for SerializedDataTransfer {
         fn get_data(&self, format: &str) -> Option<String> {
             self.items
@@ -141,6 +151,10 @@ mod ser {
             // No-op
         }
 
+        fn items(&self) -> Vec<DataTransferItem> {
+            self.items.clone()
+        }
+
         fn files(&self) -> Vec<crate::file_data::FileData> {
             self.files
                 .iter()