The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 10:45 UTC
fix(web): preserve PDF scroll and zoom across autoreloads (#25555)
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Erik Demaine committed
Oct 30, 2026 at 19:07 UTC
78f1ba8285898d50af82a49c98364197d330db6a
4 files changed
+308
-13
apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx
+202
@@ -2411,6 +2411,208 @@ it("keeps a workspace PDF open across URL renewals and reloads it when the file
2411
URL.revokeObjectURL(edited);
2412
}
2413
});
2414
+function planningPdf(
2415
+ titles = ["Quarterly outlook", "Delivery milestones", "Budget and risks"],
2416
+ firstHeight = 140,
2417
+ pageHeight = 792,
2418
+) {
2419
+ const objects = [
2420
+ "<< /Type /Catalog /Pages 2 0 R >>",
2421
+ `<< /Type /Pages /Count ${titles.length} /Kids [${titles.map((_, index) => `${3 + index * 2} 0 R`).join(" ")}] >>`,
2422
+ ];
2423
+ const font = 3 + titles.length * 2;
2424
+ for (const [index, title] of titles.entries()) {
2425
+ const text = `/GS1 gs BT /F1 24 Tf 30 ${index === 0 ? 70 : 700} Td ${index === 0 ? "(Quarter) Tj /F2 24 Tf (ly outlook) Tj" : `(${title}) Tj`} ET`;
2426
+ objects.push(
2427
+ `<< /Type /Page /Parent 2 0 R /MediaBox [0 0 612 ${index === 0 ? firstHeight : pageHeight}] /Rotate ${index === 2 ? 90 : 0} /Resources << /Font << /F1 ${font} 0 R /F2 ${font + 1} 0 R >> /ExtGState << /GS1 << /TR << /FunctionType 2 /Domain [0 1] /C0 [0] /C1 [1] /N 2 >> >> >> >> /Contents ${4 + index * 2} 0 R >>`,
2428
+ `<< /Length ${text.length} >>\nstream\n${text}\nendstream`,
2429
+ );
2430
+ }
2431
+ objects.push("<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>");
2432
+ objects.push("<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica-Bold >>");
2433
+ let source = "%PDF-1.4\n";
2434
+ const offsets = [0];
2435
+ for (const [index, object] of objects.entries()) {
2436
+ offsets.push(source.length);
2437
+ source += `${index + 1} 0 obj\n${object}\nendobj\n`;
2438
+ }
2439
+ const xref = source.length;
2440
+ source += `xref\n0 ${objects.length + 1}\n0000000000 65535 f \n${offsets
2441
+ .slice(1)
2442
+ .map((offset) => `${String(offset).padStart(10, "0")} 00000 n \n`)
2443
+ .join("")}trailer\n<< /Size ${objects.length + 1} /Root 1 0 R >>\nstartxref\n${xref}\n%%EOF`;
2444
+ return new Blob([source], { type: "application/pdf" });
2445
+}
2446
+
2447
+async function workspacePdfPreview() {
2448
+ assetUrlState.mockReset();
2449
+ const { WorkspaceBrowserPreview } = await import("./FilePreviewPanel");
2450
+ const native = vi.spyOn(navigator, "pdfViewerEnabled", "get").mockReturnValue(false);
2451
+ const urls = (() => {
2452
+ const original = URL.createObjectURL(planningPdf());
2453
+ const updated = URL.createObjectURL(
2454
+ planningPdf(["Quarterly outlook", "Delivery milestones", "Updated budget"], 500),
2455
+ );
2456
+ const shorter = URL.createObjectURL(planningPdf(["Quarterly outlook", "Updated milestones"]));
2457
+ const shrunk = URL.createObjectURL(
2458
+ planningPdf(["Quarterly outlook", "Small page", "Budget and risks"], 500, 200),
2459
+ );
2460
+ const single = URL.createObjectURL(planningPdf(["Quarterly outlook"]));
2461
+ return {
2462
+ original,
2463
+ updated,
2464
+ shorter,
2465
+ shrunk,
2466
+ single,
2467
+ [Symbol.dispose]: () =>
2468
+ [original, updated, shorter, shrunk, single].forEach(URL.revokeObjectURL),
2469
+ };
2470
+ })();
2471
+ const preview = (src: string, mutation: string, path = "/repo/planning.pdf") => {
2472
+ assetUrlState.mockReturnValue({
2473
+ _tag: "Success",
2474
+ url: `${src}#preview`,
2475
+ expiresAt: Date.now() + 3_600_000,
2476
+ });
2477
+ return (
2478
+ <div className="flex h-[600px] w-[320px]">
2479
+ <WorkspaceBrowserPreview
2480
+ environmentId={EnvironmentId.make("test")}
2481
+ threadRef={{ environmentId: EnvironmentId.make("test"), threadId: ThreadId.make("test") }}
2482
+ draft={false}
2483
+ absolutePath={path}
2484
+ workspaceRoot="/repo"
2485
+ title="Planning PDF"
2486
+ workspaceMutationId={mutation}
2487
+ />
2488
+ </div>
2489
+ );
2490
+ };
2491
+ return {
2492
+ preview,
2493
+ urls,
2494
+ [Symbol.dispose]() {
2495
+ native.mockRestore();
2496
+ urls[Symbol.dispose]();
2497
+ },
2498
+ };
2499
+}
2500
+
2501
+function pdfScroll(screen: Screen) {
2502
+ const region = () => screen.container.querySelector<HTMLElement>('[role="region"]')!;
2503
+ const canvas = (page: number) =>
2504
+ region().querySelector<HTMLCanvasElement>(`canvas[aria-label="Page ${page}"]`)!;
2505
+ const offset = (page: number) =>
2506
+ region().getBoundingClientRect().top - canvas(page).getBoundingClientRect().top;
2507
+ const scrollTo = (options: ScrollToOptions) =>
2508
+ act(async () => {
2509
+ const node = region();
2510
+ const scrolled = new Promise<void>((resolve) =>
2511
+ node.addEventListener("scroll", () => resolve(), { once: true }),
2512
+ );
2513
+ node.scrollTo(options);
2514
+ await scrolled;
2515
+ });
2516
+ return { region, canvas, offset, scrollTo };
2517
+}
2518
+
2519
+it("keeps workspace PDF scroll and zoom after reloads", async () => {
2520
+ using fixture = await workspacePdfPreview();
2521
+ const { preview, urls } = fixture;
2522
+ await using screen = await render(preview(urls.original, "one"));
2523
+ await expect.element(screen.getByText("1 / 3 pages", { exact: true })).toBeVisible();
2524
+ await screen.getByRole("button", { name: "Next page", exact: true }).click();
2525
+ await vi.waitFor(() => expect(screen.container.textContent).toContain("2 / 3 pages"));
2526
+ await screen.getByRole("button", { name: "Next page", exact: true }).click();
2527
+ await vi.waitFor(() => expect(screen.container.textContent).toContain("3 / 3 pages"));
2528
+ for (let index = 0; index < 4; index++) {
2529
+ await screen.getByRole("button", { name: "Zoom in", exact: true }).click();
2530
+ }
2531
+ const { region, offset, scrollTo } = pdfScroll(screen);
2532
+ const zoom = screen.container.textContent!.match(/\d+%/)![0];
2533
+ const top = region().scrollTop;
2534
+ await scrollTo({ top: top + 100, left: 80 });
2535
+ await vi.waitFor(() => {
2536
+ expect(region().scrollTop).toBeCloseTo(top + 100, 0);
2537
+ expect(region().scrollLeft).toBe(80);
2538
+ });
2539
+ const savedOffset = offset(3);
2540
+ await screen.rerender(preview(urls.updated, "two"));
2541
+ await expect.element(screen.getByText("3 / 3 pages", { exact: true })).toBeVisible();
2542
+ await vi.waitFor(() => {
2543
+ expect(screen.container.querySelector('[role="region"]')?.textContent).toContain(
2544
+ "Updated budget",
2545
+ );
2546
+ expect(screen.container.textContent).toContain(zoom);
2547
+ expect(region().scrollLeft).toBe(80);
2548
+ expect(offset(3)).toBeCloseTo(savedOffset, 0);
2549
+ });
2550
+ await screen.getByRole("button", { name: "Previous page", exact: true }).click();
2551
+ await vi.waitFor(() => expect(screen.container.textContent).toContain("2 / 3 pages"));
2552
+ await screen.getByRole("button", { name: "Fit width", exact: true }).click();
2553
+ await scrollTo({ top: region().scrollTop + 30 });
2554
+ const fitOffset = offset(2);
2555
+ await screen.rerender(preview(urls.original, "fit-width"));
2556
+ await expect.element(screen.getByText("2 / 3 pages", { exact: true })).toBeVisible();
2557
+ await vi.waitFor(() => {
2558
+ expect(screen.container.textContent).toContain("Fit width");
2559
+ expect(region().scrollLeft).toBe(0);
2560
+ expect(offset(2)).toBeCloseTo(fitOffset, 0);
2561
+ });
2562
+ await screen.getByRole("button", { name: "Previous page", exact: true }).click();
2563
+ await vi.waitFor(() => expect(screen.container.textContent).toContain("1 / 3 pages"));
2564
+ await screen.getByRole("button", { name: "Zoom in", exact: true }).click();
2565
+ const firstPageZoom = screen.container.textContent!.match(/\d+%/)![0];
2566
+ await screen.rerender(preview(urls.original, "first-page"));
2567
+ await expect.element(screen.getByText("1 / 3 pages", { exact: true })).toBeVisible();
2568
+ await vi.waitFor(() => expect(screen.container.textContent).toContain(firstPageZoom));
2569
+ await screen.getByRole("button", { name: "Next page", exact: true }).click();
2570
+ await vi.waitFor(() => expect(screen.container.textContent).toContain("2 / 3 pages"));
2571
+ await screen.rerender(preview(urls.original, "one", "/repo/another.pdf"));
2572
+ await expect.element(screen.getByText("1 / 3 pages", { exact: true })).toBeVisible();
2573
+ await vi.waitFor(() => {
2574
+ expect(screen.container.textContent).toContain("Fit width");
2575
+ expect(region().scrollTop).toBe(0);
2576
+ expect(region().scrollLeft).toBe(0);
2577
+ });
2578
+});
2579
+
2580
+it("clamps workspace PDF scroll when pages shrink or disappear", async () => {
2581
+ using fixture = await workspacePdfPreview();
2582
+ const { preview, urls } = fixture;
2583
+ await using screen = await render(preview(urls.original, "one"));
2584
+ await expect.element(screen.getByText("1 / 3 pages", { exact: true })).toBeVisible();
2585
+ await screen.getByRole("button", { name: "Next page", exact: true }).click();
2586
+ await expect.element(screen.getByText("2 / 3 pages", { exact: true })).toBeVisible();
2587
+ for (let index = 0; index < 4; index++) {
2588
+ await screen.getByRole("button", { name: "Zoom in", exact: true }).click();
2589
+ }
2590
+ const { region, canvas, offset, scrollTo } = pdfScroll(screen);
2591
+ const zoom = screen.container.textContent!.match(/\d+%/)![0];
2592
+ const secondPageTop = region().scrollTop;
2593
+ await scrollTo({ top: secondPageTop + 600, left: 80 });
2594
+ await vi.waitFor(() => expect(region().scrollTop).toBeCloseTo(secondPageTop + 600, 0));
2595
+ await screen.rerender(preview(urls.shrunk, "smaller-page"));
2596
+ await expect.element(screen.getByText("2 / 3 pages", { exact: true })).toBeVisible();
2597
+ await vi.waitFor(() => {
2598
+ expect(screen.container.textContent).toContain(zoom);
2599
+ expect(region().scrollLeft).toBe(80);
2600
+ expect(offset(2)).toBeGreaterThan(0);
2601
+ expect(offset(2)).toBeLessThan(canvas(2).getBoundingClientRect().height);
2602
+ });
2603
+ await screen.rerender(preview(urls.shorter, "three"));
2604
+ await expect.element(screen.getByText("2 / 2 pages", { exact: true })).toBeVisible();
2605
+ await vi.waitFor(() => {
2606
+ expect(screen.container.querySelector('[role="region"]')?.textContent).toContain(
2607
+ "Updated milestones",
2608
+ );
2609
+ });
2610
+ await screen.rerender(preview(urls.single, "four"));
2611
+ await expect.element(screen.getByText("1 / 1 pages", { exact: true })).toBeVisible();
2612
+ await screen.rerender(preview(urls.original, "five"));
2613
+ await expect.element(screen.getByText("1 / 3 pages", { exact: true })).toBeVisible();
2614
+});
2615
+
2616
it("unwraps one text attachment without turning off the word wrap setting", async () => {
2617
const file = new Blob(["a long line"], { type: "text/plain" });
2618
await using screen = await render(
apps/web/src/components/files/BrowserDocumentFrame.tsx
+36
-3
@@ -33,6 +33,7 @@ import {
33
} from "react";
34
import { isElectron } from "~/env";
35
import { FileSurfaceLoading } from "./fileSurfaceChrome";
36
+import type { PdfViewState } from "./PdfViewer";
37
38
import { useOpenLink } from "~/browser/useOpenLink";
39
import { ExpandedImageDialog } from "~/components/chat/ExpandedImageDialog";
@@ -73,7 +74,27 @@ export const isPdfPreviewFile = (path: string): boolean =>
74
75
const PdfViewer = lazy(() => import("./PdfViewer"));
76
76
-function PdfDocument(props: { src: string; title: string }) {
77
+// The document stays mounted while each revision gets a fresh PDF.js document.
78
+function PdfDocument(props: { src: string; title: string; documentKey: string }) {
79
+ const [view, setView] = useState<PdfViewState>({ page: 0, offset: 0, zoom: null, left: 0 });
80
+ return (
81
+ <PdfDocumentRevision
82
+ key={props.documentKey}
83
+ src={props.src}
84
+ title={props.title}
85
+ initialView={view}
86
+ onViewChange={setView}
87
+ />
88
+ );
89
+}
90
+
91
+// Keep signed URL renewals from reloading the same revision.
92
+function PdfDocumentRevision(props: {
93
+ src: string;
94
+ title: string;
95
+ initialView: PdfViewState;
96
+ onViewChange: (view: PdfViewState) => void;
97
+}) {
98
const [src] = useState(props.src);
99
// The Electron shell does not enable PDF plugins. WebKit embeds on iOS
100
// expose only the first page, even when pdfViewerEnabled reports support.
@@ -91,7 +112,12 @@ function PdfDocument(props: { src: string; title: string }) {
112
/>
113
) : (
114
<Suspense fallback={<FileSurfaceLoading />}>
94
- <PdfViewer src={src} title={props.title} />
115
+ <PdfViewer
116
+ src={src}
117
+ title={props.title}
118
+ initialView={props.initialView}
119
+ onViewChange={props.onViewChange}
120
+ />
121
</Suspense>
122
);
123
}
@@ -108,10 +134,17 @@ export function BrowserDocumentFrame(props: {
134
readonly threadRef?: ScopedThreadRef | undefined;
135
/** Stable resource identity and revision; defaults to src for callers that reload on URL changes. */
136
readonly documentKey?: string | undefined;
137
+ /** Resource identity without its revision, so PDF reloads can retain the reading position. */
138
+ readonly documentId?: string | undefined;
139
}) {
140
const key = props.documentKey ?? props.src;
141
return props.pdf ? (
114
- <PdfDocument key={key} src={props.src} title={props.title} />
142
+ <PdfDocument
143
+ key={props.documentId ?? key}
144
+ documentKey={key}
145
+ src={props.src}
146
+ title={props.title}
147
+ />
148
) : props.htmlRender ? (
149
<HtmlRenderDocument
150
key={key}
apps/web/src/components/files/FilePreviewPanel.tsx
+1
@@ -272,6 +272,7 @@ export function WorkspaceBrowserPreview(props: {
272
<BrowserDocumentFrame
273
src={`${assetUrl.url}${revisionSuffix}`}
274
documentKey={`${props.environmentId}:${resource._tag}:${props.threadRef.threadId}:${props.absolutePath}:${revision}`}
275
+ documentId={`${props.environmentId}:${resource._tag}:${props.threadRef.threadId}:${props.absolutePath}`}
276
title={props.title}
277
pdf={pdf}
278
/>
apps/web/src/components/files/PdfViewer.tsx
+69
-10
@@ -31,6 +31,13 @@ import "./pdfViewer.css";
31
const MAX_PAGES = 2000;
32
const MAX_FIND_TEXT = 4 * 1024 * 1024;
33
34
+export type PdfViewState = {
35
+ page: number;
36
+ offset: number;
37
+ zoom: number | null;
38
+ left: number;
39
+};
40
+
41
function PdfPage(props: {
42
document: PDFDocumentProxy;
43
index: number;
@@ -116,12 +123,20 @@ function PdfPage(props: {
123
);
124
}
125
119
-export default function PdfViewer(props: { src: string; title: string }) {
126
+export default function PdfViewer(props: {
127
+ src: string;
128
+ title: string;
129
+ initialView?: PdfViewState;
130
+ onViewChange?: (view: PdfViewState) => void;
131
+}) {
132
+ const [initialView] = useState<PdfViewState>(
133
+ () => props.initialView ?? { page: 0, offset: 0, zoom: null, left: 0 },
134
+ );
135
const [pdf, setPdf] = useState<PDFDocumentProxy | null>(null);
136
const [error, setError] = useState<string | null>(null);
137
const [revision, setRevision] = useState(0);
138
const [ratios, setRatios] = useState<number[]>([]);
124
- const [zoom, setZoom] = useState<number | null>(null);
139
+ const [zoom, setZoom] = useState(initialView.zoom);
140
const [pageWidth, setPageWidth] = useState(612);
141
const [viewport, setViewport] = useState({ width: 600, height: 800 });
142
const [scrollTop, setScrollTop] = useState(0);
@@ -133,6 +148,7 @@ export default function PdfViewer(props: { src: string; title: string }) {
148
const scroll = useRef<HTMLDivElement>(null);
149
const find = useRef<HTMLInputElement>(null);
150
const zoomAnchor = useRef<{ page: number; offset: number; width: number } | null>(null);
151
+ const initialPage = initialView.page;
152
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Own the PDF fetch, load timeout, and pdf.js document task across source changes, retries, and unmounts.
153
useEffect(() => {
154
const controller = new AbortController();
@@ -156,9 +172,20 @@ export default function PdfViewer(props: { src: string; title: string }) {
172
if (document.numPages > MAX_PAGES)
173
throw new Error("Preview limited to 2,000 pages. Save this PDF to read it in full.");
174
const first = (await document.getPage(1)).getViewport({ scale: 1 });
175
+ const sizes = await Promise.all(
176
+ Array.from({ length: Math.min(initialPage + 1, document.numPages) }, async (_, index) => {
177
+ const size = (await document.getPage(index + 1)).getViewport({ scale: 1 });
178
+ return size.height / size.width;
179
+ }),
180
+ );
181
if (controller.signal.aborted) return;
182
setPageWidth(first.width);
161
- setRatios(Array.from({ length: document.numPages }, () => first.height / first.width));
183
+ setRatios(
184
+ Array.from(
185
+ { length: document.numPages },
186
+ (_, index) => sizes[index] ?? first.height / first.width,
187
+ ),
188
+ );
189
setPdf(document);
190
})
191
.catch((cause: unknown) => {
@@ -172,7 +199,7 @@ export default function PdfViewer(props: { src: string; title: string }) {
199
clearTimeout(timeout);
200
void task?.destroy();
201
};
175
- }, [props.src, revision]);
202
+ }, [props.src, revision, initialPage]);
203
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Measure the PDF viewport before paint and observe resizes for fit-width sizing and visible-page selection.
204
useLayoutEffect(() => {
205
const node = scroll.current;
@@ -195,6 +222,30 @@ export default function PdfViewer(props: { src: string; title: string }) {
222
const jumpToPage = useEffectEvent((index: number) => {
223
scroll.current?.scrollTo({ top: pdfPageScrollTop(offsets, index) });
224
});
225
+ const saveView = (node: HTMLDivElement) => {
226
+ const page = currentPdfPage(offsets, ratios.length, node.scrollTop);
227
+ props.onViewChange?.({
228
+ page,
229
+ offset: Math.max(0, node.scrollTop - (offsets[page]! - 16)),
230
+ zoom,
231
+ left: node.scrollLeft,
232
+ });
233
+ };
234
+ const restoreView = useEffectEvent(() => {
235
+ const node = scroll.current;
236
+ if (!pdf || !node) return;
237
+ const page = Math.min(initialPage, pdf.numPages - 1);
238
+ node.scrollTo({
239
+ top:
240
+ offsets[page]! - 16 + Math.min(initialView.offset, Math.max(0, width * ratios[page]! - 1)),
241
+ left: initialView.left,
242
+ });
243
+ saveView(node);
244
+ });
245
+ // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Restore the saved PDF scroll position after the loaded document's page layout commits.
246
+ useLayoutEffect(() => {
247
+ if (pdf) restoreView();
248
+ }, [pdf]);
249
const showPage = (index: number) => {
250
scroll.current?.scrollTo({ top: pdfPageScrollTop(offsets, index) });
251
};
@@ -210,10 +261,14 @@ export default function PdfViewer(props: { src: string; title: string }) {
261
useLayoutEffect(() => {
262
const anchor = zoomAnchor.current;
263
zoomAnchor.current = null;
213
- if (!anchor || anchor.width === width) return;
214
- scroll.current?.scrollTo({
215
- top: offsets[anchor.page]! - 16 + (anchor.offset * width) / anchor.width,
216
- });
264
+ const node = scroll.current;
265
+ if (!anchor || !node) return;
266
+ if (anchor.width !== width) {
267
+ node.scrollTo({
268
+ top: offsets[anchor.page]! - 16 + (anchor.offset * width) / anchor.width,
269
+ });
270
+ }
271
+ saveView(node);
272
});
273
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Scroll to the first asynchronous search result after its measured page offsets have committed.
274
useLayoutEffect(() => {
@@ -354,8 +409,12 @@ export default function PdfViewer(props: { src: string; title: string }) {
409
role="region"
410
aria-label={props.title}
411
tabIndex={0}
357
- className="relative min-h-0 min-w-0 w-full flex-1 overflow-auto bg-muted/40"
358
- onScroll={(event) => setScrollTop(event.currentTarget.scrollTop)}
412
+ className="relative min-h-0 min-w-0 w-full flex-1 overflow-auto scrollbar-gutter-stable bg-muted/40"
413
+ onScroll={(event) => {
414
+ const top = event.currentTarget.scrollTop;
415
+ setScrollTop(top);
416
+ saveView(event.currentTarget);
417
+ }}
418
onKeyDown={(event) => {
419
if ((event.ctrlKey || event.metaKey) && event.key === "f") {
420
event.preventDefault();