]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix(files): prevent dragging previews and appear as an external files DnD
authorJohn Molakvoæ <skjnldsv@protonmail.com>
Tue, 16 Jan 2024 11:10:27 +0000 (12:10 +0100)
committerFerdinand Thiessen <opensource@fthiessen.de>
Wed, 17 Jan 2024 15:23:31 +0000 (16:23 +0100)
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
apps/files/src/components/DragAndDropNotice.vue
apps/files/src/components/FileEntry.vue
apps/files/src/components/FilesListVirtual.vue

index df03713601d106a24c616c69d28de14a9d281bd0..22de0f662de41ee0272a2b3b6c45bd7fbcfc410a 100644 (file)
@@ -115,8 +115,6 @@ export default defineComponent({
                        event.preventDefault()
 
                        const isForeignFile = event.dataTransfer?.types.includes('Files')
-
-                       logger.debug('Drag over DragAndDropNotice', { isForeignFile, event })
                        if (isForeignFile) {
                                // Only handle uploading of outside files (not Nextcloud files)
                                this.dragover = true
index 5e5476b08f73d51134119aa9e2e75a38e54bedc6..de598657ac77491efa4d97380c40e4726594b92d 100644 (file)
@@ -466,7 +466,10 @@ export default defineComponent({
                                return
                        }
 
-                       logger.debug('Drag started')
+                       logger.debug('Drag started', { event })
+
+                       // Make sure that we're not dragging a file like the preview
+                       event.dataTransfer?.clearData?.()
 
                        // Reset any renaming
                        this.renamingStore.$reset()
index 6a075a27b4ed13a548e226d8a349eccd1a0da7d5..ed0096e9792d527bdac38f50e4d251d7fb8044a8 100644 (file)
@@ -266,7 +266,6 @@ export default defineComponent({
                onDragOver(event: DragEvent) {
                        // Detect if we're only dragging existing files or not
                        const isForeignFile = event.dataTransfer?.types.includes('Files')
-
                        if (isForeignFile) {
                                // Only handle uploading of existing Nextcloud files
                                // See DragAndDropNotice for handling of foreign files