@devries-cameron20 / t3code-1 / commits / 6b3b3b75bd
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(web): chat text can be cited while file search is open (#27131)

Co-authored-by: maria-rcks <maria@kuuro.net>

Abhijeet Singh committed Nov 2, 2026 at 03:11 UTC 6b3b3b75bdcba996bb0bd5c38970feb577f57625
3 files changed +85 -6
apps/web/src/components/files/fileEditorDismissal.browser.test.tsx new
+68
@@ -0,0 +1,68 @@
1 +import { Editor, type EditorFactory } from "@pierre/diffs/edit";
2 +import { EditProvider, File } from "@pierre/diffs/react";
3 +import { describe, expect, it, vi } from "vite-plus/test";
4 +
5 +import { render } from "../../../test/render";
6 +
7 +import { isMacPlatform } from "~/lib/utils";
8 +import { installFileEditorDismissal } from "./fileEditorDismissal";
9 +
10 +describe("installFileEditorDismissal", () => {
11 + it("keeps a text selection made outside the file while its search is open", async () => {
12 + let editor: Editor<"file" | "file-diff", undefined, undefined> | undefined;
13 + const createEditor: EditorFactory<undefined, undefined> = (...args) =>
14 + (editor = new Editor(...args));
15 + await using screen = await render(
16 + <>
17 + <p>Assistant reply</p>
18 + <div data-testid="file-surface">
19 + <EditProvider createEditor={createEditor}>
20 + <File file={{ name: "server.ts", contents: "const server = 1;\n" }} edit />
21 + </EditProvider>
22 + </div>
23 + </>,
24 + );
25 + const shadowRoot = () => screen.container.querySelector("diffs-container")?.shadowRoot;
26 + const content = await vi.waitFor(() => {
27 + const element = shadowRoot()?.querySelector<HTMLElement>("[data-content]");
28 + expect(element).toBeTruthy();
29 + return element!;
30 + });
31 +
32 + editor!.setSelections([
33 + { start: { line: 0, character: 8 }, end: { line: 0, character: 8 }, direction: "none" },
34 + ]);
35 + const isMac = isMacPlatform(navigator.platform);
36 + content.dispatchEvent(
37 + new KeyboardEvent("keydown", {
38 + key: "f",
39 + code: "KeyF",
40 + metaKey: isMac,
41 + ctrlKey: !isMac,
42 + bubbles: true,
43 + composed: true,
44 + cancelable: true,
45 + }),
46 + );
47 + await vi.waitFor(() =>
48 + expect(shadowRoot()?.querySelectorAll("[data-match-range]")).toHaveLength(1),
49 + );
50 +
51 + using _dismissal = {
52 + [Symbol.dispose]: installFileEditorDismissal({
53 + root: screen.getByTestId("file-surface").element() as HTMLElement,
54 + editor: editor!,
55 + isBlocked: () => false,
56 + onDismiss: () => {},
57 + }),
58 + };
59 + const reply = screen.getByText("Assistant reply").element();
60 + const range = document.createRange();
61 + range.selectNodeContents(reply);
62 + window.getSelection()!.removeAllRanges();
63 + window.getSelection()!.addRange(range);
64 + reply.dispatchEvent(new PointerEvent("pointerdown", { bubbles: true, composed: true }));
65 +
66 + expect(window.getSelection()?.toString()).toBe("Assistant reply");
67 + });
68 +});
patches/@pierre%2Fdiffs@1.6.1.patch
+12 -1
@@ -882,7 +882,18 @@ diff --git a/dist/editor/editor.js b/dist/editor/editor.js
882 index bf17cea32f..671e77b8cd 100644
883 --- a/dist/editor/editor.js
884 +++ b/dist/editor/editor.js
885 -@@ -1903,7 +1903,11 @@ var Editor = class {
885 +@@ -436,7 +436,9 @@ var Editor = class {
886 + this.#canMountSelectionAction = false;
887 + this.#updateSelections(resolvedSelections);
888 + const primarySelection = resolvedSelections.at(-1);
889 +- if (primarySelection !== void 0) this.#revealLineIfCollapsed(getCaretPosition(primarySelection).line);
890 ++ // Clearing keeps the selection while search matches or markers exist; scrolling to it steals focus.
891 ++ if (primarySelection === void 0) return;
892 ++ this.#revealLineIfCollapsed(getCaretPosition(primarySelection).line);
893 + this.#scrollToPrimaryCaret();
894 + }
895 + setMarkers(markers) {
896 +@@ -1903,7 +1905,11 @@ var Editor = class {
897 changedDocumentLines: this.#isDiff && !didLineCountChange ? getChangedDocumentLines(textDocument, change) : void 0,
898 documentLineCount: textDocument.lineCount
899 });
pnpm-lock.yaml
+5 -5
@@ -367,7 +367,7 @@ patchedDependencies:
367 '@ff-labs/fff-node@0.11.0': cc71fcec015f4d39bc96ae2e2bf6b0ca678124c722c66a7841efce9d34b5983c
368 '@legendapp/list@3.3.5': 6cbdacd8c380d9a5afb9f73d4198dc2cc44be6ef28a955b1183c781469307896
369 '@muse-code/sdk@1.4.6': 7b495b607fc5d76b444c7c4d58821e839726a30e6f3c53564f0d59f2d5b42101
370 - '@pierre/diffs@1.6.1': 4645364ddf113e48e8827f3b4966b3b1ff745317011e5a3d904e2d8672dee7dc
370 + '@pierre/diffs@1.6.1': 322ac5f5db8b5715189c010802047f8235c3a45d8ed5ca0ba60fac266e2eba34
371 '@react-native-ai/apple@0.12.0': 2d09870c2848d185cb05b53ed823a46e12dba519324d8dd8e584e28731990f9d
372 '@react-native-menu/menu@2.0.0': 910ec1bf22aa85a96fcf12299cd823bc30f702dd9b2d77b564d10b9ed709f7f6
373 '@react-navigation/native-stack@7.21.0': 990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42
@@ -557,7 +557,7 @@ importers:
557 version: 1.9.1
558 '@pierre/diffs':
559 specifier: 1.6.1
560 - version: 1.6.1(patch_hash=4645364ddf113e48e8827f3b4966b3b1ff745317011e5a3d904e2d8672dee7dc)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
560 + version: 1.6.1(patch_hash=322ac5f5db8b5715189c010802047f8235c3a45d8ed5ca0ba60fac266e2eba34)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
561 '@pierre/highlights':
562 specifier: 'catalog:'
563 version: 0.2.0
@@ -1063,7 +1063,7 @@ importers:
1063 version: 1.8.0
1064 '@pierre/diffs':
1065 specifier: 1.6.1
1066 - version: 1.6.1(patch_hash=4645364ddf113e48e8827f3b4966b3b1ff745317011e5a3d904e2d8672dee7dc)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1066 + version: 1.6.1(patch_hash=322ac5f5db8b5715189c010802047f8235c3a45d8ed5ca0ba60fac266e2eba34)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1067 '@pierre/trees':
1068 specifier: 1.0.0-beta.6
1069 version: 1.0.0-beta.6(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
@@ -1485,7 +1485,7 @@ importers:
1485 dependencies:
1486 '@pierre/diffs':
1487 specifier: 1.6.1
1488 - version: 1.6.1(patch_hash=4645364ddf113e48e8827f3b4966b3b1ff745317011e5a3d904e2d8672dee7dc)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1488 + version: 1.6.1(patch_hash=322ac5f5db8b5715189c010802047f8235c3a45d8ed5ca0ba60fac266e2eba34)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1489 '@t3tools/contracts':
1490 specifier: workspace:*
1491 version: link:../contracts
@@ -15575,7 +15575,7 @@ snapshots:
15575 tslib: 2.8.1
15576 webcrypto-core: 1.9.2
15577
15578 - '@pierre/diffs@1.6.1(patch_hash=4645364ddf113e48e8827f3b4966b3b1ff745317011e5a3d904e2d8672dee7dc)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
15578 + '@pierre/diffs@1.6.1(patch_hash=322ac5f5db8b5715189c010802047f8235c3a45d8ed5ca0ba60fac266e2eba34)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
15579 dependencies:
15580 '@pierre/highlights': 0.2.0
15581 '@pierre/theme': 2.0.0