Skip to content

[V32] Fix drag & drop upload to nested folders #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
memurats wants to merge 3 commits into
base: stable32
Choose a base branch
from
+12 −12
Open

[V32] Fix drag & drop upload to nested folders #312

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1a7e73
Refactor file handling to use currentView
memurats Apr 20, 2026
9ba1cd3
Fix target path for batch upload in FileEntryMixin
memurats Apr 21, 2026
32d79cf
Merge branch 'stable32' into nmc/5822/fix-drop-on-folder
memurats May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions apps/files/src/components/FileEntryMixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,19 +473,19 @@ export default defineComponent({

if (selection.length === 0 && items.some((item) => item.kind === 'file')) {
const files = items.filter((item) => item.kind === 'file')
.map((item) => 'webkitGetAsEntry' in item ? item.webkitGetAsEntry() : item.getAsFile())
.filter(Boolean) as (FileSystemEntry | File)[]
.map((item) => item.getAsFile()).filter((file): file is File => !!file)
.filter(Boolean) as (FileSystemEntry | File)[],
const uploader = getUploader()
const root = uploader.destination.path
const relativePath = relative(root, this.source.path)
logger.debug('Start uploading dropped files', { target: this.source.path, root, relativePath, files: files.map((file) => file.name) })

let targetPath = this.source.path.replace(this.currentDir || '', '')
if (!targetPath.startsWith('/')) {
targetPath = '/' + targetPath
}
await uploader.batchUpload(
relativePath,
targetPath,
files,
async (nodes, path) => {
try {
const { contents, folder } = await this.activeView!.getContents(path)
const { contents, folder } = await this.currentView!.getContents(path)
const conflicts = getConflicts(nodes, contents)
if (conflicts.length === 0) {
return nodes
Expand Down Expand Up @@ -517,17 +517,17 @@ export default defineComponent({
}

// We might not have the target directory fetched yet
const cachedContents = this.filesStore.getNodesByPath(this.activeView.id, this.source.path)
const cachedContents = this.filesStore.getNodesByPath(this.currentView.id, this.source.path)
const contents = cachedContents.length === 0
? (await this.activeView!.getContents(this.source.path)).contents
? (await this.currentView!.getContents(this.source.path)).contents
: cachedContents

const isCopy = event.ctrlKey
this.dragover = false

logger.debug('Dropped', { event, folder: this.source, selection })
logger.debug('Dropped', { event, folder: this.source, selection, contents })

const nodes = selection.map((source) => this.filesStore.getNode(source)) as Node[]
const nodes = selection.map((source) => this.filesStore.getNode(source)).filter((node): node is Node => !!node)
await onDropInternalFiles(nodes, this.source, contents, isCopy)

// Reset selection after we dropped the files
Expand Down
Loading