Skip to content

Commit 993d05b

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

2 files changed

Lines changed: 35 additions & 37 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ 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",
4747
"ResourceURIs",
4848
"application/vnd.code.files",
4949
"application/vnd.code.uri-list",

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

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -526,56 +526,54 @@ 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", () => {
538-
const { container } = render(<ChatTextArea {...defaultProps} />)
539-
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-
)
545-
546-
expect(event.defaultPrevented).toBe(true)
547-
})
548-
549-
it("accepts OS file manager drags without holding Shift", () => {
550-
const { container } = render(<ChatTextArea {...defaultProps} />)
551-
552-
const event = fireDragOver(container.querySelector(".chat-text-area")!, ["Files"], false)
553-
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} />)
536+
it.each(["Files", "ResourceURIs", "application/vnd.code.files", "application/vnd.code.uri-list"])(
537+
"accepts %s drags without Shift",
538+
(type) => {
539+
const { container } = render(<ChatTextArea {...defaultProps} />)
559540

560-
const event = fireDragOver(container.querySelector(".chat-text-area")!, [type], false)
541+
const { event, dataTransfer } = fireDragOver(container.querySelector(".chat-text-area")!, [type])
561542

562-
expect(event.defaultPrevented).toBe(true)
563-
})
543+
expect(event.defaultPrevented).toBe(true)
544+
expect(dataTransfer.dropEffect).toBe("copy")
545+
expect(container.querySelector(".border-dashed")).not.toBeNull()
546+
},
547+
)
564548

565-
it("keeps the browser's native behavior for plain text drags without Shift", () => {
566-
const { container } = render(<ChatTextArea {...defaultProps} />)
549+
it.each([["text/plain"], ["text/uri-list"], ["text/plain", "text/uri-list"]])(
550+
"keeps native behavior and clears the highlight for drag types %j without Shift",
551+
(...types) => {
552+
const { container } = render(<ChatTextArea {...defaultProps} />)
553+
const target = container.querySelector(".chat-text-area")!
554+
fireDragOver(target, ["Files"])
555+
expect(container.querySelector(".border-dashed")).not.toBeNull()
567556

568-
const event = fireDragOver(container.querySelector(".chat-text-area")!, ["text/plain"], false)
557+
const { event, dataTransfer } = fireDragOver(target, types)
569558

570-
expect(event.defaultPrevented).toBe(false)
571-
})
559+
expect(event.defaultPrevented).toBe(false)
560+
expect(dataTransfer.dropEffect).toBe("none")
561+
expect(container.querySelector(".border-dashed")).toBeNull()
562+
},
563+
)
572564

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

576-
const event = fireDragOver(container.querySelector(".chat-text-area")!, ["text/plain"], true)
568+
const { event, dataTransfer } = fireDragOver(
569+
container.querySelector(".chat-text-area")!,
570+
["text/plain"],
571+
true,
572+
)
577573

578574
expect(event.defaultPrevented).toBe(true)
575+
expect(dataTransfer.dropEffect).toBe("copy")
576+
expect(container.querySelector(".border-dashed")).not.toBeNull()
579577
})
580578
})
581579

0 commit comments

Comments
 (0)