✨ Feature: support dragging any type of file to upload

ISSUES CLOSED: #1052
Molunerfinn · Jan 11, 2023 · 520d6d3 · 520d6d3
1 parent 911e34e
commit 520d6d3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 22 deletions.
diff --git a/src/renderer/pages/MiniPage.vue b/src/renderer/pages/MiniPage.vue
@@ -84,18 +84,23 @@ watch(progress, (val) => {
 
 function onDrop (e: DragEvent) {
   dragover.value = false
-  const items = e.dataTransfer!.items
-  if (items.length === 2 && items[0].type === 'text/uri-list') {
-    handleURLDrag(items, e.dataTransfer!)
-  } else if (items[0].type === 'text/plain') {
-    const str = e.dataTransfer!.getData(items[0].type)
-    if (isUrl(str)) {
-      sendToMain('uploadChoosedFiles', [{ path: str }])
-    } else {
-      $message.error($T('TIPS_DRAG_VALID_PICTURE_OR_URL'))
-    }
+  const items = e.dataTransfer?.items!
+  const files = e.dataTransfer?.files!
+
+  // send files first
+  if (files?.length) {
+    ipcSendFiles(e.dataTransfer?.files!)
   } else {
-    ipcSendFiles(e.dataTransfer!.files)
+    if (items.length === 2 && items[0].type === 'text/uri-list') {
+      handleURLDrag(items, e.dataTransfer!)
+    } else if (items[0].type === 'text/plain') {
+      const str = e.dataTransfer!.getData(items[0].type)
+      if (isUrl(str)) {
+        sendToMain('uploadChoosedFiles', [{ path: str }])
+      } else {
+        $message.error($T('TIPS_DRAG_VALID_PICTURE_OR_URL'))
+      }
+    }
   }
 }
 

diff --git a/src/renderer/pages/Upload.vue b/src/renderer/pages/Upload.vue
@@ -169,18 +169,23 @@ onBeforeUnmount(() => {
 
 function onDrop (e: DragEvent) {
   dragover.value = false
-  const items = e.dataTransfer!.items
-  if (items.length === 2 && items[0].type === 'text/uri-list') {
-    handleURLDrag(items, e.dataTransfer!)
-  } else if (items[0].type === 'text/plain') {
-    const str = e.dataTransfer!.getData(items[0].type)
-    if (isUrl(str)) {
-      sendToMain('uploadChoosedFiles', [{ path: str }])
-    } else {
-      $message.error($T('TIPS_DRAG_VALID_PICTURE_OR_URL'))
-    }
+  const items = e.dataTransfer?.items!
+  const files = e.dataTransfer?.files!
+
+  // send files first
+  if (files?.length) {
+    ipcSendFiles(e.dataTransfer?.files!)
   } else {
-    ipcSendFiles(e.dataTransfer!.files)
+    if (items.length === 2 && items[0].type === 'text/uri-list') {
+      handleURLDrag(items, e.dataTransfer!)
+    } else if (items[0].type === 'text/plain') {
+      const str = e.dataTransfer!.getData(items[0].type)
+      if (isUrl(str)) {
+        sendToMain('uploadChoosedFiles', [{ path: str }])
+      } else {
+        $message.error($T('TIPS_DRAG_VALID_PICTURE_OR_URL'))
+      }
+    }
   }
 }