diff --git a/packages/app/e2e/regression/composer.spec.ts b/packages/app/e2e/regression/composer.spec.ts index 8ea8c93d44d..64827e44652 100644 --- a/packages/app/e2e/regression/composer.spec.ts +++ b/packages/app/e2e/regression/composer.spec.ts @@ -1001,6 +1001,50 @@ test("shows the dropzone and attaches a dropped file", async ({ page }) => { await expect(page.locator('[data-component="composer-attachments"]')).toContainText("dropzone.txt") }) +test("keeps one dropzone while a file drag crosses the composer, and none for a text drag", async ({ page }) => { + const editor = await draft(page) + await page.keyboard.type("worktree off the latest dev") + const surface = page.locator('[data-component="new-session"]') + const dropzone = page.locator('[data-component="session-dropzone"]') + + const text = await page.evaluateHandle(() => { + const value = new DataTransfer() + value.setData("text/plain", "worktree off the latest dev") + + return value + }) + + await editor.dispatchEvent("dragenter", { dataTransfer: text }) + await editor.dispatchEvent("dragover", { dataTransfer: text }) + await expect(page.locator("[data-slot='session-dropzone-blur']")).toHaveAttribute("data-visible", "false") + await expect(dropzone).toHaveCount(0) + + const files = await page.evaluateHandle(() => { + const value = new DataTransfer() + value.items.add(new File(["Dropzone fixture"], "dropzone.txt", { type: "text/plain" })) + + return value + }) + + await surface.dispatchEvent("dragover", { dataTransfer: files }) + await expect(dropzone).toHaveAttribute("data-visible", "true") + const shown = await dropzone.elementHandle() + + // Moving onto the editor's own text fires dragleave on the editor before the next dragover. + await editor.evaluate((element, dataTransfer) => { + const inner = element.firstElementChild ?? element + + const fire = (type: string, target: Element, relatedTarget: Element) => + target.dispatchEvent(new DragEvent(type, { bubbles: true, cancelable: true, dataTransfer, relatedTarget })) + + fire("dragenter", inner, element) + fire("dragleave", element, inner) + fire("dragover", inner, element) + }, files) + await expect.poll(() => shown?.evaluate((element) => element.isConnected)).toBe(true) + await expect(dropzone).toHaveAttribute("data-visible", "true") +}) + test("keeps a narrow session composer contained when invoking a built-in", async ({ page }) => { await page.setViewportSize({ width: 800, height: 600 }) const { editor } = await openSession(page, { name: "ComposerCommand", provider: NO_PROVIDER }) diff --git a/packages/app/src/composer/attachments/attachments.ts b/packages/app/src/composer/attachments/attachments.ts index 989275182db..0e1c00e760c 100644 --- a/packages/app/src/composer/attachments/attachments.ts +++ b/packages/app/src/composer/attachments/attachments.ts @@ -235,9 +235,7 @@ export function createComposerAttachments( makeEventListener(document, "dragover", (event) => { if (input.isDialogActive()) return event.preventDefault() - - if (event.dataTransfer?.types.includes("Files")) input.setDraggingType("image") - else if (event.dataTransfer?.types.includes("text/plain")) input.setDraggingType("@mention") + input.setDraggingType(dragType(event.dataTransfer)) }) makeEventListener(document, "dragleave", (event) => { if (!input.isDialogActive() && !event.relatedTarget) clearDrag() @@ -272,6 +270,16 @@ export function createComposerAttachments( } } +// Files from the system and file rows from the workspace tree (which also carry a file URL) drop as attachments. +// A text selection carries neither, so dragging it shows no dropzone. +function dragType(data: DataTransfer | null) { + if (data?.types.includes("Files")) return "image" + + if (data?.types.includes("text/uri-list")) return "@mention" + + return null +} + const imageMimes = new Set(["image/png", "image/jpeg", "image/gif", "image/webp"]) // The server rejects inline attachments above this size, so larger media takes the path route. diff --git a/packages/app/src/composer/editor/editor.tsx b/packages/app/src/composer/editor/editor.tsx index 47061d0ef6b..14c52b32ffb 100644 --- a/packages/app/src/composer/editor/editor.tsx +++ b/packages/app/src/composer/editor/editor.tsx @@ -238,7 +238,6 @@ export function ComposerEditor(props: ComposerEditorProps) { }} onDragEnter={props.controller.onDragEnter} onDragOver={props.controller.onDragOver} - onDragLeave={props.controller.onDragLeave} onDrop={props.controller.onDrop} >
region.showComposer() && !region.child()) // Requests hide the view without disposing its draft or queue edit. - createEffect(on(editable, () => composer.onDragLeave())) + createEffect(on(editable, () => composer.clearDrag())) return { region,