Skip to content

Commit ef41104

Browse files
authored
Merge pull request #42840 from nextcloud/fix/dnd-files
fix(files): prevent dragging previews and appear as an external files DnD
2 parents 0492e0f + cfe1215 commit ef41104

9 files changed

Lines changed: 13 additions & 13 deletions

apps/files/src/components/DragAndDropNotice.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ export default defineComponent({
115115
event.preventDefault()
116116
117117
const isForeignFile = event.dataTransfer?.types.includes('Files')
118-
119-
logger.debug('Drag over DragAndDropNotice', { isForeignFile, event })
120118
if (isForeignFile) {
121119
// Only handle uploading of outside files (not Nextcloud files)
122120
this.dragover = true

apps/files/src/components/FileEntry.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,10 @@ export default defineComponent({
466466
return
467467
}
468468
469-
logger.debug('Drag started')
469+
logger.debug('Drag started', { event })
470+
471+
// Make sure that we're not dragging a file like the preview
472+
event.dataTransfer?.clearData?.()
470473
471474
// Reset any renaming
472475
this.renamingStore.$reset()

apps/files/src/components/FilesListVirtual.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ export default defineComponent({
266266
onDragOver(event: DragEvent) {
267267
// Detect if we're only dragging existing files or not
268268
const isForeignFile = event.dataTransfer?.types.includes('Files')
269-
270269
if (isForeignFile) {
271270
// Only handle uploading of existing Nextcloud files
272271
// See DragAndDropNotice for handling of foreign files

dist/614-614.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/614-614.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-unsupported-browser.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-unsupported-browser.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)