Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion src/cloud/components/Editor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,13 @@ const Editor = ({
? fileUploadHandlerRef.current(file)
: null
},
onUnsupportedFile: () => {
pushMessage({
title: '',
description:
'Folder uploads are not supported. Please drop individual files instead.',
})
},
})
pasteFormatPlugin(editor, {
openMenu: (pos, cb) => {
Expand Down Expand Up @@ -487,7 +494,7 @@ const Editor = ({
)
})
},
[handleCursorShowHintActivity]
[handleCursorShowHintActivity, pushMessage]
)

const onTemplatePickCallback = useCallback(
Expand Down
23 changes: 23 additions & 0 deletions src/cloud/lib/editor/plugins/fileHandler.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { isDirectoryTransferItem } from './fileHandler'

describe('isDirectoryTransferItem', () => {
it('detects directory transfer items', () => {
const item = {
webkitGetAsEntry: () => ({ isDirectory: true }),
} as DataTransferItem

expect(isDirectoryTransferItem(item)).toBe(true)
})

it('ignores file transfer items', () => {
const item = {
webkitGetAsEntry: () => ({ isDirectory: false }),
} as DataTransferItem

expect(isDirectoryTransferItem(item)).toBe(false)
})

it('ignores transfer items without entry support', () => {
expect(isDirectoryTransferItem({} as DataTransferItem)).toBe(false)
})
})
25 changes: 25 additions & 0 deletions src/cloud/lib/editor/plugins/fileHandler.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,42 @@
import { boostHubBaseUrl } from '../../consts'

export type OnFileCallback = (file: File) => Promise<FileNode | null>
export type OnUnsupportedFileCallback = (
file: File,
reason: 'directory'
) => void

type FileNode =
| { type: 'img'; url: string; alt?: string; title?: string }
| { type: 'file'; url: string; title?: string }

interface FileHandlerConfig {
onFile: OnFileCallback
onUnsupportedFile?: OnUnsupportedFileCallback
buildWidget?: (file: File) => HTMLElement
lineClass?: string
}

interface DataTransferItemEntryLike {
webkitGetAsEntry?: () => {
isDirectory: boolean
} | null
}

export const isDirectoryTransferItem = (item: DataTransferItem | undefined) => {
if (item == null) {
return false
}

const entry = (item as DataTransferItemEntryLike).webkitGetAsEntry?.()
return entry != null && entry.isDirectory
}

const attachFileHandlerToCodeMirrorEditor = (
editor: CodeMirror.Editor,
{
onFile,
onUnsupportedFile,
buildWidget = buildDefaultUploadWidget,
lineClass = 'file-loading',
}: FileHandlerConfig
Expand Down Expand Up @@ -49,6 +70,10 @@ const attachFileHandlerToCodeMirrorEditor = (
const pos = instance.coordsChar({ left: event.pageX, top: event.pageY })
const files = event.dataTransfer.files
for (let i = 0; i < files.length; i++) {
if (isDirectoryTransferItem(event.dataTransfer.items[i])) {
onUnsupportedFile?.(files[i], 'directory')
continue
}
await handler(i > 0 ? instance.getCursor() : pos, files[i])
}
}
Expand Down