From 95ea34d27a9e80bf2e5ac1b19d27d22336b12858 Mon Sep 17 00:00:00 2001
From: Anna No <anna.no@xored.com>
Date: Wed, 13 Apr 2022 21:14:37 +0700
Subject: [PATCH] Fix card & file drop issues

Signed-off-by: Anna No <anna.no@xored.com>
---
 .../src/components/AttachmentDroppable.svelte        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/attachment-resources/src/components/AttachmentDroppable.svelte b/plugins/attachment-resources/src/components/AttachmentDroppable.svelte
index 5209455200..a4b6d834e1 100644
--- a/plugins/attachment-resources/src/components/AttachmentDroppable.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentDroppable.svelte
@@ -31,12 +31,19 @@
 
   async function fileDrop(e: DragEvent) {
     dragover = false
+
+    if (canDrop && !canDrop(e)) {
+      return
+    }
+
     const list = e.dataTransfer?.files
     if (list === undefined || list.length === 0) return
 
     loading++
     try {
       await createAttachments(client, list, { objectClass, objectId, space })
+      e.preventDefault()
+      e.stopPropagation()
     } finally {
       loading--
     }
@@ -44,15 +51,16 @@
 </script>
 
 <div
-  on:dragover|preventDefault={(e) => {
+  on:dragover={(e) => {
     if (canDrop?.(e) ?? true) {
       dragover = true
+      e.preventDefault()
     }
   }}
   on:dragleave={() => {
     dragover = false
   }}
-  on:drop|preventDefault|stopPropagation={fileDrop}
+  on:drop={fileDrop}
 >
   <slot />
 </div>