{
+ if (isInternal(event.dataTransfer.types)) {
+ event.preventDefault()
+ event.dataTransfer.dropEffect = 'copy'
+ }
+ }}
+ onDrop={(event) => {
+ if (!isInternal(event.dataTransfer.types)) {
+ return
+ }
+ event.preventDefault()
+ event.stopPropagation()
+ const manager = destination.managerRef.current
+ if (!manager) {
+ return
+ }
+ void handleInternalTerminalFileDrop({
+ ...destination,
+ manager,
+ paneTransports: destination.paneTransportsRef.current,
+ dataTransfer: event.dataTransfer,
+ paneLeafId: destination.pane.leafId
+ })
+ }}
+ />
+ )
+}
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx
index e9db4adc4bfd..a5444f44715f 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx
@@ -9,8 +9,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
import type { ManagedPane, PaneManager } from '@/lib/pane-manager/pane-manager'
import type { PtyTransport } from './pty-transport'
import TerminalPaneHeaderOverlay from './TerminalPaneHeaderOverlay'
-import { handleTerminalFileDrop } from './terminal-drop-handler'
-import { resolveNativeFileDropPath } from '../../../../shared/native-file-drop'
import { encodeWorkspaceFilePaths, WORKSPACE_FILE_PATHS_MIME } from '@/lib/workspace-file-drag'
vi.mock('@/components/ui/tooltip', () => ({
@@ -170,6 +168,7 @@ function pressInputKey(
}
afterEach(() => {
+ vi.unstubAllGlobals()
for (const { container, root } of mounted.splice(0)) {
act(() => root.unmount())
container.remove()
@@ -304,9 +303,11 @@ describe('TerminalPaneHeaderOverlay', () => {
function dispatchFileDrag(target: Element, type: 'dragover' | 'drop', internal: boolean): void {
const event = new Event(type, { bubbles: true, cancelable: true })
+ Object.defineProperty(event, 'isTrusted', { value: true })
Object.defineProperty(event, 'dataTransfer', {
value: {
types: internal ? [WORKSPACE_FILE_PATHS_MIME] : ['Files'],
+ files: [new File([], 'file.txt')],
getData: () => encodeWorkspaceFilePaths(['/repo/file.txt']),
dropEffect: 'none'
}
@@ -350,47 +351,18 @@ describe('terminal title drop ownership', () => {
if (!title) {
throw new Error('Title A did not render')
}
- const deliveries: Promise
[] = []
- const legacyCapture = (event: Event): void => {
- if (internal) {
- return
+ vi.stubGlobal('api', {
+ fs: {
+ getPathForFile: () => '/repo/file.txt',
+ prepareDroppedPaths: async ({ paths }: { paths: string[] }) => ({ paths, failures: [] })
}
- event.preventDefault()
- event.stopPropagation()
- const entries = event
- .composedPath()
- .filter((entry): entry is HTMLElement => entry instanceof HTMLElement)
- .map((entry) => ({
- nativeFileDropTarget: entry.dataset.nativeFileDropTarget,
- terminalTabId: entry.dataset.terminalTabId,
- terminalPaneLeafId: entry.dataset.terminalPaneLeafId
- }))
- const resolution = resolveNativeFileDropPath(entries)
- if (resolution?.target === 'terminal') {
- deliveries.push(
- handleTerminalFileDrop({
- manager,
- paneTransports: transports,
- worktreeId: 'wt-1',
- tabId: 'tab-1',
- cwd: '/repo',
- data: { paths: ['/repo/file.txt'], ...resolution }
- })
- )
+ })
+ await act(async () => {
+ if (dragover) {
+ dispatchFileDrag(title, 'dragover', internal)
}
- }
- document.addEventListener('drop', legacyCapture, true)
- try {
- await act(async () => {
- if (dragover) {
- dispatchFileDrag(title, 'dragover', internal)
- }
- dispatchFileDrag(title, 'drop', internal)
- await Promise.all(deliveries)
- })
- } finally {
- document.removeEventListener('drop', legacyCapture, true)
- }
+ dispatchFileDrag(title, 'drop', internal)
+ })
expect(sends[0]).toHaveBeenCalledExactlyOnceWith('/repo/file.txt ', 'driving')
expect(sends[1]).not.toHaveBeenCalled()
expect(activate).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx
index f3b405f6b8e5..fef4e48ae591 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx
@@ -11,10 +11,10 @@ import type { ManagedPane, PaneManager } from '@/lib/pane-manager/pane-manager'
import { Button } from '@/components/ui/button'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import { translate } from '@/i18n/i18n'
-import { WORKSPACE_FILE_PATH_MIME, WORKSPACE_FILE_PATHS_MIME } from '@/lib/workspace-file-drag'
import { isImeCompositionKeyDown } from '@/lib/ime-composition-keyboard-event'
import type { PtyTransport } from './pty-transport'
-import { handleInternalTerminalFileDrop } from './terminal-drop-handler'
+import { TerminalPaneHeaderDropSurface } from './TerminalPaneHeaderDropSurface'
+import { makePaneKey } from '../../../../shared/stable-pane-id'
export type PaneTitleOverlayRect = {
left: number
@@ -145,12 +145,11 @@ export default function TerminalPaneHeaderOverlay({
}
return (
- onActivatePaneTitleInteraction(pane.id) : undefined
}
- onDragOver={(event) => {
- if (
- event.dataTransfer.types.includes(WORKSPACE_FILE_PATH_MIME) ||
- event.dataTransfer.types.includes(WORKSPACE_FILE_PATHS_MIME)
- ) {
- event.preventDefault()
- event.dataTransfer.dropEffect = 'copy'
- }
- }}
- onDrop={(event) => {
- if (
- !event.dataTransfer.types.includes(WORKSPACE_FILE_PATH_MIME) &&
- !event.dataTransfer.types.includes(WORKSPACE_FILE_PATHS_MIME)
- ) {
- return
- }
- event.preventDefault()
- event.stopPropagation()
- const manager = managerRef.current
- if (!manager) {
- return
- }
- void handleInternalTerminalFileDrop({
- manager,
- paneTransports: paneTransportsRef.current,
- worktreeId,
- tabId,
- cwd,
- dataTransfer: event.dataTransfer,
- paneLeafId: pane.leafId
- })
- }}
onContextMenuCapture={(event) => onPaneTitleContextMenu(event, pane.id)}
style={{
left: overlayRect.left,
@@ -407,7 +374,7 @@ export default function TerminalPaneHeaderOverlay({
)}
-