Skip to content

Commit 9ba6143

Browse files
perf(web): switching threads no longer re-renders the chat view for an unchanged preview list (pingdotgg#21130)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent d0918f1 commit 9ba6143

2 files changed

Lines changed: 35 additions & 1 deletion

File tree

‎apps/web/src/previewStateStore.test.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,18 @@ describe("previewStateStore (single-tab)", () => {
453453
expect(state.snapshot).toBeNull();
454454
});
455455

456+
it("keeps the state object when a refetched list changes nothing", () => {
457+
reconcilePreviewServerSessions(ref, { sessions: [], serverEpoch, revision: 1 });
458+
const loaded = readThreadPreviewState(ref);
459+
460+
reconcilePreviewServerSessions(ref, { sessions: [], serverEpoch, revision: 1 });
461+
expect(readThreadPreviewState(ref)).toBe(loaded);
462+
463+
const snapshot = makeSnapshot();
464+
reconcilePreviewServerSessions(ref, { sessions: [snapshot], serverEpoch, revision: 2 });
465+
expect(readThreadPreviewState(ref).sessions).toEqual({ [snapshot.tabId]: snapshot });
466+
});
467+
456468
it("ignores a list response older than the latest server event", () => {
457469
const snapshot = makeSnapshot();
458470
applyPreviewServerEvent(ref, {

‎apps/web/src/previewStateStore.ts‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,14 +329,31 @@ export function reconcilePreviewServerSessions(
329329
snapshots.some((snapshot) => snapshot.tabId === tabId),
330330
),
331331
);
332+
const desktopOverlay = activeTabId ? (desktopByTabId[activeTabId] ?? null) : null;
333+
// The list is refetched whenever a thread is opened. Keeping the state
334+
// object when nothing moved spares every subscriber a re-render.
335+
if (
336+
sameServer &&
337+
current.listLoaded &&
338+
current.serverRevision === result.revision &&
339+
current.activeTabId === activeTabId &&
340+
current.snapshot === snapshot &&
341+
current.desktopOverlay === desktopOverlay &&
342+
current.recentlySeenUrls === recentlySeenUrls &&
343+
haveSameValues(current.sessions, sessions) &&
344+
haveSameValues(current.desktopByTabId, desktopByTabId) &&
345+
current.suppressedTabIds.size === suppressedTabIds.size
346+
) {
347+
return current;
348+
}
332349
return {
333350
...current,
334351
sessions,
335352
suppressedTabIds,
336353
activeTabId,
337354
snapshot,
338355
desktopByTabId,
339-
desktopOverlay: activeTabId ? (desktopByTabId[activeTabId] ?? null) : null,
356+
desktopOverlay,
340357
recentlySeenUrls,
341358
listLoaded: true,
342359
serverEpoch: result.serverEpoch,
@@ -345,6 +362,11 @@ export function reconcilePreviewServerSessions(
345362
});
346363
}
347364

365+
function haveSameValues<T>(left: Record<string, T>, right: Record<string, T>): boolean {
366+
const keys = Object.keys(left);
367+
return keys.length === Object.keys(right).length && keys.every((key) => left[key] === right[key]);
368+
}
369+
348370
function isPreviewStateEqual(
349371
previous: DesktopPreviewOverlay | null,
350372
next: DesktopPreviewOverlay | null,

0 commit comments

Comments
 (0)