fix(app): preserve terminal selection copy

Author: skulidropek

packages/app/src/web/terminal-copy-interaction.ts

@@ -208,6 +208,11 @@ const suppressOriginalTerminalMouseUp = (event: TerminalCopyMouseEvent): void =>
   event.stopImmediatePropagation?.()
 }
 
+const suppressTerminalMouseReport = (event: TerminalCopyMouseEvent): void => {
+  event.stopPropagation?.()
+  event.stopImmediatePropagation?.()
+}
+
 const replayForcedTerminalMouseUp = (
   target: TerminalSelectionDragTarget,
   event: TerminalCopyMouseEvent
@@ -283,6 +288,10 @@ export const attachTerminalCopyInteraction = (
       return
     }
     forceTerminalSelectionModifier(event)
+    if (forceSelectionContext) {
+      suppressTerminalMouseReport(event)
+      return
+    }
     if (forceBrowserSelection) {
       selectionDrag.start()
     }

packages/app/tests/docker-git/fixtures/terminal-copy-interaction.ts

@@ -135,6 +135,24 @@ export class FakeTerminalCopyMouseEvent extends Event {
   }
 }
 
+export class FakeTerminalCopyClipboardEvent {
+  readonly clipboardData: TerminalCopyTestClipboardData | null
+  preventDefaultCalls = 0
+  stopPropagationCalls = 0
+
+  constructor(clipboardData: TerminalCopyTestClipboardData | null) {
+    this.clipboardData = clipboardData
+  }
+
+  preventDefault(): void {
+    this.preventDefaultCalls += 1
+  }
+
+  stopPropagation(): void {
+    this.stopPropagationCalls += 1
+  }
+}
+
 const isPropagationStopped = (event: TerminalCopyTestMouseEvent): boolean =>
   event instanceof FakeTerminalCopyMouseEvent &&
   (event.stopPropagationCalls > 0 || event.stopImmediatePropagationCalls > 0)
@@ -199,6 +217,14 @@ export class FakeTerminalCopyEventTarget {
     this.dispatchMousePhase(type, event, "bubble")
   }
 
+  dispatchCopy(event: TerminalCopyTestClipboardEvent): void {
+    for (const entry of this.listeners) {
+      if (entry.type === "copy") {
+        entry.listener(event)
+      }
+    }
+  }
+
   dispatchEvent(event: Event): boolean {
     this.dispatchedEvents.push(event)
     if (isMouseTestEventType(event.type) && isTerminalCopyTestMouseEvent(event)) {
@@ -247,6 +273,10 @@ export const mouseEvent = (
   >
 ): FakeTerminalCopyMouseEvent => new FakeTerminalCopyMouseEvent(type, button, options)
 
+export const copyEvent = (
+  clipboardData: TerminalCopyTestClipboardData | null
+): FakeTerminalCopyClipboardEvent => new FakeTerminalCopyClipboardEvent(clipboardData)
+
 export const expectNoDragListeners = (target: FakeTerminalCopyEventTarget): void => {
   expect(target.captureListenerCount("mousemove")).toBe(0)
   expect(target.captureListenerCount("mouseup")).toBe(0)

packages/app/tests/docker-git/terminal-copy-interaction.test.ts

@@ -10,6 +10,7 @@ import {
   writeTerminalSelectionToClipboardData
 } from "../../src/web/terminal-copy-interaction.js"
 import {
+  copyEvent,
   expectNoDragListeners,
   expectSingleMouseEvent,
   FakeTerminalCopyEventTarget,
@@ -204,6 +205,48 @@ describe("terminal copy interaction", () => {
     disposable.dispose()
   })
 
+  it("keeps selected terminal text copyable after right-click while mouse tracking is active", () => {
+    const documentTarget = new FakeTerminalCopyEventTarget()
+    const host = new FakeTerminalCopyHost(documentTarget)
+    const selectedText = "line one\nline two"
+    let terminalSelection = selectedText
+    const terminal: TerminalCopyInteractionTerminal = {
+      getSelection: () => terminalSelection,
+      hasSelection: () => terminalSelection.length > 0,
+      modes: { mouseTrackingMode: "any" }
+    }
+    const terminalMouseReports: Array<TerminalCopyTestMouseEvent> = []
+    const clipboardWrites: Array<{ readonly data: string; readonly format: string }> = []
+    const disposable = attachTerminalCopyInteraction({ host, terminal })
+    host.addBubbleMouseListener("mousedown", (event) => {
+      terminalMouseReports.push(event)
+      terminalSelection = ""
+    })
+    const rightClick = mouseEvent(2)
+    const clipboardData = {
+      setData: (format: string, data: string) => {
+        clipboardWrites.push({ data, format })
+      }
+    }
+    const copy = copyEvent(clipboardData)
+
+    host.dispatchMouse("mousedown", rightClick)
+    host.dispatchCopy(copy)
+
+    expect(rightClick.shiftKey).toBe(true)
+    expect(rightClick.preventDefaultCalls).toBe(0)
+    expect(rightClick.stopImmediatePropagationCalls).toBe(1)
+    expect(rightClick.stopPropagationCalls).toBeGreaterThanOrEqual(1)
+    expect(terminalMouseReports).toEqual([])
+    expect(terminalSelection).toBe(selectedText)
+    expectNoDragListeners(documentTarget)
+    expect(clipboardWrites).toEqual([{ data: selectedText, format: "text/plain" }])
+    expect(copy.preventDefaultCalls).toBe(1)
+    expect(copy.stopPropagationCalls).toBe(1)
+
+    disposable.dispose()
+  })
+
   it("falls back to host drag listeners when ownerDocument is unavailable", () => {
     const host = new FakeTerminalCopyHost(null)
     const disposable = attachTerminalCopyInteraction({ host, terminal: terminalWithSelection("drag", "") })