Skip to content

Commit 43ad496

Browse files
committed
fix(chat): preserve native link drags and strengthen file drag tests
1 parent 92e4812 commit 43ad496

2 files changed

Lines changed: 43 additions & 37 deletions

File tree

‎webview-ui/src/components/chat/ChatTextArea.tsx‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,21 @@ import { disabledChatControlClassName, enabledChatControlClassName } from "./cha
4040
// text selection drag. "Files" covers drags from the OS file manager; the
4141
// remaining types are set by VS Code when dragging resources from the Explorer
4242
// or editor tabs, in local and remote workspaces alike (see fillEditorsDragData
43-
// in VS Code's workbench drag-and-drop code).
43+
// in VS Code's workbench drag-and-drop code). Bare text/uri-list also
44+
// identifies browser link drags, so it must retain native drop behavior.
4445
const FILE_DRAG_DATA_TRANSFER_TYPES = [
4546
"Files",
46-
"text/uri-list",
47-
"ResourceURIs",
48-
"application/vnd.code.files",
47+
"ResourceURLs",
48+
"CodeEditors",
49+
"CodeFiles",
4950
"application/vnd.code.uri-list",
5051
]
5152

53+
// Chromium lowercases custom drag types; compare without relying on casing.
5254
const isFileDrag = (dataTransfer: DataTransfer): boolean =>
53-
FILE_DRAG_DATA_TRANSFER_TYPES.some((type) => dataTransfer.types.includes(type))
55+
dataTransfer.types.some((type) =>
56+
FILE_DRAG_DATA_TRANSFER_TYPES.some((fileType) => fileType.toLowerCase() === type.toLowerCase()),
57+
)
5458

5559
interface ChatTextAreaProps {
5660
inputValue: string

‎webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -526,56 +526,58 @@ describe("ChatTextArea", () => {
526526
// Event and attach the drag payload the React handler expects.
527527
const fireDragOver = (element: Element, types: string[], shiftKey = false) => {
528528
const event = new Event("dragover", { bubbles: true, cancelable: true })
529-
Object.defineProperty(event, "dataTransfer", {
530-
value: { types, files: [], dropEffect: "none" },
531-
})
529+
const dataTransfer = { types, files: [], dropEffect: "none" }
530+
Object.defineProperty(event, "dataTransfer", { value: dataTransfer })
532531
Object.defineProperty(event, "shiftKey", { value: shiftKey })
533532
fireEvent(element, event)
534-
return event
533+
return { event, dataTransfer }
535534
}
536535

537-
it("accepts VS Code Explorer file drags without holding Shift", () => {
536+
it.each([
537+
"Files",
538+
"resourceurls",
539+
"codeeditors",
540+
"codefiles",
541+
"application/vnd.code.uri-list",
542+
"RESOURCEURLS",
543+
])("accepts %s drags without Shift", (type) => {
538544
const { container } = render(<ChatTextArea {...defaultProps} />)
539545

540-
const event = fireDragOver(
541-
container.querySelector(".chat-text-area")!,
542-
["text/plain", "ResourceURIs", "application/vnd.code.uri-list", "text/uri-list"],
543-
false,
544-
)
546+
const { event, dataTransfer } = fireDragOver(container.querySelector(".chat-text-area")!, [type])
545547

546548
expect(event.defaultPrevented).toBe(true)
549+
expect(dataTransfer.dropEffect).toBe("copy")
550+
expect(container.querySelector(".border-dashed")).not.toBeNull()
547551
})
548552

549-
it("accepts OS file manager drags without holding Shift", () => {
550-
const { container } = render(<ChatTextArea {...defaultProps} />)
553+
it.each([["text/plain"], ["text/uri-list"], ["text/plain", "text/uri-list"]])(
554+
"keeps native behavior and clears the highlight for drag types %j without Shift",
555+
(...types) => {
556+
const { container } = render(<ChatTextArea {...defaultProps} />)
557+
const target = container.querySelector(".chat-text-area")!
558+
fireDragOver(target, ["Files"])
559+
expect(container.querySelector(".border-dashed")).not.toBeNull()
551560

552-
const event = fireDragOver(container.querySelector(".chat-text-area")!, ["Files"], false)
561+
const { event, dataTransfer } = fireDragOver(target, types)
553562

554-
expect(event.defaultPrevented).toBe(true)
555-
})
556-
557-
it.each(["text/uri-list", "application/vnd.code.files"])("accepts %s drags without Shift", (type) => {
558-
const { container } = render(<ChatTextArea {...defaultProps} />)
559-
560-
const event = fireDragOver(container.querySelector(".chat-text-area")!, [type], false)
561-
562-
expect(event.defaultPrevented).toBe(true)
563-
})
564-
565-
it("keeps the browser's native behavior for plain text drags without Shift", () => {
566-
const { container } = render(<ChatTextArea {...defaultProps} />)
567-
568-
const event = fireDragOver(container.querySelector(".chat-text-area")!, ["text/plain"], false)
569-
570-
expect(event.defaultPrevented).toBe(false)
571-
})
563+
expect(event.defaultPrevented).toBe(false)
564+
expect(dataTransfer.dropEffect).toBe("none")
565+
expect(container.querySelector(".border-dashed")).toBeNull()
566+
},
567+
)
572568

573569
it("still accepts plain text drags when Shift is held", () => {
574570
const { container } = render(<ChatTextArea {...defaultProps} />)
575571

576-
const event = fireDragOver(container.querySelector(".chat-text-area")!, ["text/plain"], true)
572+
const { event, dataTransfer } = fireDragOver(
573+
container.querySelector(".chat-text-area")!,
574+
["text/plain"],
575+
true,
576+
)
577577

578578
expect(event.defaultPrevented).toBe(true)
579+
expect(dataTransfer.dropEffect).toBe("copy")
580+
expect(container.querySelector(".border-dashed")).not.toBeNull()
579581
})
580582
})
581583

0 commit comments

Comments
 (0)