Skip to content

Commit 2fae0f9

Browse files
perf(web): opening an image preview no longer re-renders the chat view (pingdotgg#20845)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent efef7cb commit 2fae0f9

4 files changed

Lines changed: 136 additions & 24 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
387387
import { createPageScrollController, type PageScrollKey } from "./chat/pageScrollController";
388388
import { isTimelineScrollTarget } from "./chat/timelineScrollTarget";
389389
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
390-
import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
390+
import { ExpandedImageDialogHost, openExpandedImagePreview } from "./chat/ExpandedImageDialog";
391391
import {
392392
BranchRestoreConfirmHost,
393393
DeviceSetupDialogHost,
@@ -417,7 +417,7 @@ import {
417417
type PanelLayoutControlsProps,
418418
RightPanelMaximizeControl,
419419
} from "./chat/PanelLayoutControls";
420-
import { expandedImageKey, type ExpandedImagePreview } from "./chat/ExpandedImagePreview";
420+
import type { ExpandedImagePreview } from "./chat/ExpandedImagePreview";
421421
import { ThreadDetailsPanel, type ThreadDetailsPanelProps } from "./chat/ThreadDetailsPanel";
422422
import { NoActiveThreadState } from "./NoActiveThreadState";
423423
import {
@@ -1275,13 +1275,6 @@ export default function ChatView(props: ChatViewProps) {
12751275
const citeAssistantTextStable = useStableCallback(citeAssistantText);
12761276
const [showScrollToBottom, setShowScrollToBottom] = useState(false);
12771277
const [isWorkspaceFileDragActive, setIsWorkspaceFileDragActive] = useState(false);
1278-
const [expandedImage, setExpandedImage] = useState<ExpandedImagePreview | null>(null);
1279-
useEffect(() => {
1280-
const item = expandedImage?.images[expandedImage.index];
1281-
if (item?.type !== "video" || item.src === null || !item.src.startsWith("blob:")) return;
1282-
const src = item.src;
1283-
return () => revokeBlobPreviewUrl(src);
1284-
}, [expandedImage]);
12851278
const [optimisticUserMessages, setOptimisticUserMessages] = useState<ChatMessage[]>([]);
12861279
// Set by "Work locally": the draft whose restored message should be resent
12871280
// once the cancelled dispatch has settled and the draft is in local mode.
@@ -4657,19 +4650,13 @@ export default function ChatView(props: ChatViewProps) {
46574650
setRetiredOptimisticMessages(optimisticUserMessages);
46584651
setOptimisticUserMessages([]);
46594652
resetLocalDispatch();
4660-
setExpandedImage(null);
46614653
}
46624654
useEffect(() => {
46634655
for (const message of retiredOptimisticMessages) {
46644656
revokeUserMessagePreviewUrls(message);
46654657
}
46664658
}, [retiredOptimisticMessages]);
46674659

4668-
const closeExpandedImage = () => {
4669-
setExpandedImage(null);
4670-
};
4671-
const closeExpandedImageStable = useStableCallback(closeExpandedImage);
4672-
46734660
const activeWorktreePath = activeThread?.worktreePath ?? null;
46744661
const derivedEnvMode: DraftThreadEnvMode = resolveEffectiveEnvMode({
46754662
activeWorktreePath,
@@ -7695,7 +7682,7 @@ export default function ChatView(props: ChatViewProps) {
76957682
};
76967683

76977684
const onExpandTimelineImage = (preview: ExpandedImagePreview) => {
7698-
setExpandedImage(preview);
7685+
openExpandedImagePreview(routeThreadKey, preview);
76997686
};
77007687
const onExpandTimelineImageStable = useStableCallback(onExpandTimelineImage);
77017688
const onOpenTurnDiff = (runId: RunId, filePath?: string) => {
@@ -8672,13 +8659,7 @@ export default function ChatView(props: ChatViewProps) {
86728659

86738660
<RevertConfirmHost threadKey={routeThreadKey} onConfirm={onConfirmRevertStable} />
86748661
<LinkPullRequestDialogHost />
8675-
{expandedImage && (
8676-
<ExpandedImageDialog
8677-
key={expandedImageKey(expandedImage)}
8678-
preview={expandedImage}
8679-
onClose={closeExpandedImageStable}
8680-
/>
8681-
)}
8662+
<ExpandedImageDialogHost threadKey={routeThreadKey} />
86828663
</div>
86838664
);
86848665
return (
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
import { act } from "react";
2+
import { createRoot, type Root } from "react-dom/client";
3+
import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
4+
5+
import { AppAtomRegistryProvider } from "~/rpc/atomRegistry";
6+
import { ExpandedImageDialogHost, openExpandedImagePreview } from "./ExpandedImageDialog";
7+
8+
let root: Root;
9+
let container: HTMLDivElement;
10+
11+
const preview = {
12+
images: [
13+
{ src: "data:image/gif;base64,R0lGODlhAQABAAAAACw=", name: "one.png" },
14+
{ src: "data:image/gif;base64,R0lGODlhAQABAAAAACw=", name: "two.png" },
15+
],
16+
index: 0,
17+
};
18+
19+
beforeEach(() => {
20+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
21+
container = document.createElement("div");
22+
document.body.append(container);
23+
root = createRoot(container);
24+
});
25+
26+
afterEach(async () => {
27+
await act(() => root.unmount());
28+
container.remove();
29+
vi.unstubAllGlobals();
30+
});
31+
32+
const host = (threadKey: string) => (
33+
<AppAtomRegistryProvider>
34+
<ExpandedImageDialogHost threadKey={threadKey} />
35+
</AppAtomRegistryProvider>
36+
);
37+
38+
const dialog = () => document.querySelector('[role="dialog"]');
39+
40+
describe("ExpandedImageDialogHost", () => {
41+
it("opens for its thread, steps with arrows, and closes on Escape with focus back on the opener", async () => {
42+
const opener = document.createElement("button");
43+
document.body.append(opener);
44+
await act(() => root.render(host("env:a")));
45+
opener.focus();
46+
47+
await act(() => openExpandedImagePreview("env:a", preview));
48+
expect(dialog()?.textContent).toContain("one.png (1/2)");
49+
50+
await act(() => {
51+
dialog()?.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowRight", bubbles: true }));
52+
});
53+
expect(dialog()?.textContent).toContain("two.png (2/2)");
54+
55+
await act(() => {
56+
window.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true }));
57+
});
58+
await vi.waitFor(() => expect(dialog()).toBeNull());
59+
expect(document.activeElement).toBe(opener);
60+
opener.remove();
61+
});
62+
63+
it("ignores another thread's preview and drops its own when the thread changes", async () => {
64+
await act(() => root.render(host("env:a")));
65+
await act(() => openExpandedImagePreview("env:b", preview));
66+
expect(dialog()).toBeNull();
67+
68+
await act(() => openExpandedImagePreview("env:a", preview));
69+
expect(dialog()).not.toBeNull();
70+
71+
await act(() => root.render(host("env:b")));
72+
await vi.waitFor(() => expect(dialog()).toBeNull());
73+
});
74+
});

‎apps/web/src/components/chat/ExpandedImageDialog.tsx‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ import {
1919
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
2020
import { ZoomableImage, type ZoomableImageHandle } from "./ZoomableImage";
2121
import { composerFloatingLayerProps } from "./composerEventScope";
22+
import { useAtomValue } from "@effect/atom-react";
23+
import { Atom } from "effect/reactivity";
24+
import { appAtomRegistry } from "~/rpc/atomRegistry";
25+
import { expandedImageKey } from "./ExpandedImagePreview";
2226

2327
interface ExpandedImageDialogProps {
2428
preview: ExpandedImagePreview;
@@ -282,3 +286,47 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
282286
</Dialog>
283287
);
284288
});
289+
290+
/**
291+
* The chat view's open media preview. It lives outside ChatView so opening or
292+
* closing it renders only the dialog host, not the whole chat chrome.
293+
*/
294+
const expandedImagePreviewAtom = Atom.make<{
295+
readonly threadKey: string;
296+
readonly preview: ExpandedImagePreview;
297+
} | null>(null).pipe(Atom.keepAlive, Atom.withLabel("chat:expanded-image-preview"));
298+
299+
export function openExpandedImagePreview(threadKey: string, preview: ExpandedImagePreview): void {
300+
appAtomRegistry.set(expandedImagePreviewAtom, { threadKey, preview });
301+
}
302+
303+
function closeExpandedImagePreview(): void {
304+
appAtomRegistry.set(expandedImagePreviewAtom, null);
305+
}
306+
307+
function closeExpandedImagePreviewFor(threadKey: string): void {
308+
if (appAtomRegistry.get(expandedImagePreviewAtom)?.threadKey === threadKey) {
309+
closeExpandedImagePreview();
310+
}
311+
}
312+
313+
export function ExpandedImageDialogHost({ threadKey }: { readonly threadKey: string }) {
314+
const state = useAtomValue(expandedImagePreviewAtom);
315+
const preview = state?.threadKey === threadKey ? state.preview : null;
316+
const item = preview?.images[preview.index];
317+
const ownedSrc = item?.ownsSrc === true ? item.src : null;
318+
useEffect(() => {
319+
if (ownedSrc === null) return;
320+
return () => URL.revokeObjectURL(ownedSrc);
321+
}, [ownedSrc]);
322+
// Leaving the thread (or the chat view) drops its preview.
323+
useEffect(() => () => closeExpandedImagePreviewFor(threadKey), [threadKey]);
324+
if (preview === null) return null;
325+
return (
326+
<ExpandedImageDialog
327+
key={expandedImageKey(preview)}
328+
preview={preview}
329+
onClose={closeExpandedImagePreview}
330+
/>
331+
);
332+
}

‎apps/web/src/components/chat/ExpandedImagePreview.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ export interface ExpandedImageItem {
2323
src: string | null;
2424
name: string;
2525
type?: "video";
26+
/** The preview created this object URL and must revoke it; other blob URLs belong to the timeline. */
27+
ownsSrc?: boolean;
2628
source?: SnapShotSource;
2729
autoPlay?: boolean;
2830
originalUrl?: string;
@@ -167,7 +169,14 @@ export function buildExpandedImagePreview(
167169
const selected = images.find((image) => image.id === selectedImageId);
168170
if (selected?.type === "file" && selected.file && isVideoAttachment(selected)) {
169171
return {
170-
images: [{ src: URL.createObjectURL(selected.file), name: selected.name, type: "video" }],
172+
images: [
173+
{
174+
src: URL.createObjectURL(selected.file),
175+
name: selected.name,
176+
type: "video",
177+
ownsSrc: true,
178+
},
179+
],
171180
index: 0,
172181
};
173182
}

0 commit comments

Comments
 (0)