From 520d6d3fa821a6f0a2d539c3b8101354169991f2 Mon Sep 17 00:00:00 2001
From: PiEgg <marksz@teamsz.xyz>
Date: Wed, 11 Jan 2023 16:17:20 +0800
Subject: [PATCH] :sparkles: Feature: support dragging any type of file to
 upload

ISSUES CLOSED: #1052
---
 src/renderer/pages/MiniPage.vue | 27 ++++++++++++++++-----------
 src/renderer/pages/Upload.vue   | 27 ++++++++++++++++-----------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/renderer/pages/MiniPage.vue b/src/renderer/pages/MiniPage.vue
index 68cdd94..3189350 100644
--- 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
index 2f66fe4..ec4ed0f 100644
--- 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'))
+      }
+    }
   }
 }