Skip to content

Commit 92e4812

Browse files
committed
fix(webview): accept file drag-and-drop into chat input without Shift
1 parent e879f8d commit 92e4812

2 files changed

Lines changed: 79 additions & 2 deletions

File tree

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,22 @@ import { ZooCodeAuthBadge } from "./ZooCodeAuthBadge"
3636
import { usePromptHistory } from "./hooks/usePromptHistory"
3737
import { disabledChatControlClassName, enabledChatControlClassName } from "./chatControlStyles"
3838

39+
// Data transfer types that signal a file-oriented drag rather than an in-webview
40+
// text selection drag. "Files" covers drags from the OS file manager; the
41+
// remaining types are set by VS Code when dragging resources from the Explorer
42+
// or editor tabs, in local and remote workspaces alike (see fillEditorsDragData
43+
// in VS Code's workbench drag-and-drop code).
44+
const FILE_DRAG_DATA_TRANSFER_TYPES = [
45+
"Files",
46+
"text/uri-list",
47+
"ResourceURIs",
48+
"application/vnd.code.files",
49+
"application/vnd.code.uri-list",
50+
]
51+
52+
const isFileDrag = (dataTransfer: DataTransfer): boolean =>
53+
FILE_DRAG_DATA_TRANSFER_TYPES.some((type) => dataTransfer.types.includes(type))
54+
3955
interface ChatTextAreaProps {
4056
inputValue: string
4157
setInputValue: (value: string) => void
@@ -967,8 +983,11 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
967983
className={cn("chat-text-area", !isEditMode && "relative", "flex", "flex-col", "outline-none")}
968984
onDrop={handleDrop}
969985
onDragOver={(e) => {
970-
// Only allowed to drop images/files on shift key pressed.
971-
if (!e.shiftKey) {
986+
// Accept file drags from the OS file manager, the VS Code
987+
// Explorer, and editor tabs without requiring Shift. In-webview
988+
// text drags, such as moving a selection inside the input, keep
989+
// the browser's native drop behavior unless Shift is held.
990+
if (!e.shiftKey && !isFileDrag(e.dataTransfer)) {
972991
setIsDraggingOver(false)
973992
return
974993
}

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,64 @@ describe("ChatTextArea", () => {
521521
expect(setInputValue).not.toHaveBeenCalled()
522522
})
523523

524+
describe("dragover acceptance", () => {
525+
// jsdom has no DragEvent constructor, so build a plain cancelable
526+
// Event and attach the drag payload the React handler expects.
527+
const fireDragOver = (element: Element, types: string[], shiftKey = false) => {
528+
const event = new Event("dragover", { bubbles: true, cancelable: true })
529+
Object.defineProperty(event, "dataTransfer", {
530+
value: { types, files: [], dropEffect: "none" },
531+
})
532+
Object.defineProperty(event, "shiftKey", { value: shiftKey })
533+
fireEvent(element, event)
534+
return event
535+
}
536+
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} />)
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+
})
572+
573+
it("still accepts plain text drags when Shift is held", () => {
574+
const { container } = render(<ChatTextArea {...defaultProps} />)
575+
576+
const event = fireDragOver(container.querySelector(".chat-text-area")!, ["text/plain"], true)
577+
578+
expect(event.defaultPrevented).toBe(true)
579+
})
580+
})
581+
524582
describe("prompt history navigation", () => {
525583
const mockClineMessages = [
526584
{ type: "say", say: "user_feedback", text: "First prompt", ts: 1000 },

0 commit comments

Comments
 (0)