Skip to content

Commit d9b7356

Browse files
committed
perf(web): remember the median row size when leaving a thread
1 parent 32c4342 commit d9b7356

4 files changed

Lines changed: 122 additions & 31 deletions

File tree

‎apps/web/src/components/chat/MessagesTimeline.test.tsx‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,75 @@ describe("MessagesTimeline", () => {
669669
},
670670
);
671671

672+
it("remembers the median row size of the thread it leaves", async () => {
673+
const { ChatCanvasContext } = await import("./ChatCanvasContext");
674+
const { readTimelinePosition, rememberTimelinePosition } =
675+
await import("./timelineScrollAnchoring");
676+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
677+
vi.stubGlobal(
678+
"ResizeObserver",
679+
class {
680+
observe() {}
681+
disconnect() {}
682+
},
683+
);
684+
const props = { ...buildProps(), routeThreadKey: "environment-local:measured-departure" };
685+
const entries = ["short", "code-block", "medium"].map((id) => {
686+
const entry = buildUserTimelineEntry(id);
687+
return { ...entry, id, message: { ...entry.message, id: MessageId.make(id) } };
688+
});
689+
const sizes = new Map([
690+
["short", 60],
691+
["code-block", 3000],
692+
["medium", 80],
693+
["row-from-another-thread", 20],
694+
]);
695+
props.listRef.current = {
696+
getScrollableNode: () => null,
697+
getState: () => ({ sizes }),
698+
} as unknown as LegendListRef;
699+
rememberTimelinePosition(props.routeThreadKey, {
700+
rowId: "medium",
701+
offsetWithinRow: 0,
702+
scrollOffset: 0,
703+
atEnd: true,
704+
});
705+
const canvas = {
706+
container: { width: 801, height: 900 },
707+
registerTimeline: () => {},
708+
} as unknown as NonNullable<React.ContextType<typeof ChatCanvasContext>>;
709+
const element = {
710+
addEventListener: () => {},
711+
removeEventListener: () => {},
712+
getBoundingClientRect: () => ({ top: 0, width: 800.5, height: 900 }),
713+
querySelector: () => null,
714+
ownerDocument: { addEventListener: () => {}, removeEventListener: () => {} },
715+
};
716+
let renderer: ReactTestRenderer | undefined;
717+
try {
718+
await act(() => {
719+
renderer = create(
720+
<ChatCanvasContext value={canvas}>
721+
<MessagesTimeline {...props} timelineEntries={entries} />
722+
</ChatCanvasContext>,
723+
{
724+
createNodeMock: (node) =>
725+
(node.props as { onScrollCapture?: unknown }).onScrollCapture ? element : null,
726+
},
727+
);
728+
});
729+
await act(() => renderer?.unmount());
730+
renderer = undefined;
731+
732+
expect(readTimelinePosition(props.routeThreadKey)?.itemSize).toEqual({
733+
viewportWidth: 801,
734+
median: 80,
735+
});
736+
} finally {
737+
await act(() => renderer?.unmount());
738+
}
739+
});
740+
672741
it("preserves arbitrary XML-like tags and comparisons in rendered user messages", async () => {
673742
const { MessagesTimeline } = await import("./MessagesTimeline");
674743
const markup = renderToStaticMarkup(

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

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,10 @@ import { ChangedFilesCard } from "./ChangedFilesTree";
179179
import { useFileContextMenuHandler } from "../../fileContextMenu";
180180
import { useProject, useThreadShell } from "../../state/entities";
181181
import {
182-
averageMeasuredRowSize,
183182
CHAT_TIMELINE_ANCHOR_OFFSET,
183+
medianMeasuredRowSize,
184184
readTimelinePosition,
185+
rememberTimelineItemSize,
185186
rememberTimelinePosition,
186187
timelineContentOverflowsViewport,
187188
} from "./timelineScrollAnchoring";
@@ -648,7 +649,7 @@ const ConversationTimeline = memo(function ConversationTimeline({
648649
canvas.container.width > 0;
649650
const estimatedItemSize =
650651
rememberedItemSize && rememberedItemSize.viewportWidth === canvas?.container.width
651-
? rememberedItemSize.average
652+
? rememberedItemSize.median
652653
: 90;
653654
const [expandedRunIds, setExpandedRunIds] = useState<ReadonlySet<RunId>>(
654655
() => rememberedPosition?.disclosures?.runs ?? new Set(),
@@ -1204,22 +1205,12 @@ const ConversationTimeline = memo(function ConversationTimeline({
12041205
const row = index === undefined ? undefined : state.elementAtIndex(index);
12051206
const element = listRef.current?.getScrollableNode();
12061207
if (row && element) {
1207-
const viewportRect = element.getBoundingClientRect();
1208-
const measuredItemSize = averageMeasuredRowSize(rows, state.sizes);
12091208
rememberTimelinePosition(listIdentityKey, {
12101209
...position,
12111210
// DOM geometry includes the header and the virtualizer's layout adjustment.
1212-
offsetWithinRow: viewportRect.top - row.getBoundingClientRect().top,
1211+
offsetWithinRow: element.getBoundingClientRect().top - row.getBoundingClientRect().top,
12131212
scrollOffset: element.scrollTop,
12141213
atEnd: isAtEnd,
1215-
...(measuredItemSize !== undefined
1216-
? {
1217-
itemSize: {
1218-
viewportWidth: Math.round(viewportRect.width),
1219-
average: measuredItemSize,
1220-
},
1221-
}
1222-
: {}),
12231214
disclosures: {
12241215
runs: paintedExpandedRunIds,
12251216
workGroups: paintedExpandedWorkGroupIds,
@@ -1291,6 +1282,24 @@ const ConversationTimeline = memo(function ConversationTimeline({
12911282
return () => cancelAnimationFrame(frame);
12921283
}, [handleScroll, rows.length]);
12931284

1285+
const canvasWidth = canvas?.container.width;
1286+
const departingTimelineRef = useRef({ rows, canvasWidth });
1287+
useLayoutEffect(() => {
1288+
departingTimelineRef.current = { rows, canvasWidth };
1289+
});
1290+
useLayoutEffect(() => {
1291+
const list = listRef.current;
1292+
if (!timelineViewportElement || !list) return;
1293+
return () => {
1294+
const { rows: departingRows, canvasWidth: viewportWidth } = departingTimelineRef.current;
1295+
const sizes = list.getState?.()?.sizes;
1296+
const median = sizes && medianMeasuredRowSize(departingRows, sizes);
1297+
if (viewportWidth && median !== undefined) {
1298+
rememberTimelineItemSize(listIdentityKey, { viewportWidth, median });
1299+
}
1300+
};
1301+
}, [listIdentityKey, listRef, timelineViewportElement]);
1302+
12941303
useEffect(() => {
12951304
if (!timelineViewportElement) {
12961305
return;

‎apps/web/src/components/chat/timelineScrollAnchoring.test.tsx‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MessageId, RunId } from "@t3tools/contracts";
22
import { describe, expect, it } from "vite-plus/test";
33
import {
4-
averageMeasuredRowSize,
4+
medianMeasuredRowSize,
55
observeTimelineRun,
66
getAnchoredTurnMetrics,
77
getRowBottom,
@@ -284,21 +284,31 @@ describe("remembered timeline positions", () => {
284284
});
285285
});
286286

287-
describe("averageMeasuredRowSize", () => {
287+
describe("medianMeasuredRowSize", () => {
288288
it("ignores measurements the retained list kept from previously visited threads", () => {
289289
const compactRows = Array.from({ length: 255 }, (_, index) => ({ id: `fold-${index}` }));
290290
const longRows = Array.from({ length: 160 }, (_, index) => ({ id: `assistant-${index}` }));
291291
const measuredSizes = new Map([
292292
...compactRows.map((row) => [row.id, 30] as const),
293293
...longRows.slice(0, 17).map((row) => [row.id, 300] as const),
294294
]);
295-
expect(averageMeasuredRowSize(longRows, measuredSizes)).toBe(300);
296-
expect(averageMeasuredRowSize(compactRows, measuredSizes)).toBe(30);
295+
expect(medianMeasuredRowSize(longRows, measuredSizes)).toBe(300);
296+
expect(medianMeasuredRowSize(compactRows, measuredSizes)).toBe(30);
297+
});
298+
299+
it("is not inflated by a few very tall rows", () => {
300+
const rows = ["a", "b", "c", "d", "e"].map((id) => ({ id }));
301+
const measuredSizes = new Map([
302+
["a", 60],
303+
["b", 3000],
304+
["c", 64],
305+
["d", 2400],
306+
["e", 58],
307+
]);
308+
expect(medianMeasuredRowSize(rows, measuredSizes)).toBe(64);
297309
});
298310

299311
it("reports nothing until a current row has been measured", () => {
300-
expect(averageMeasuredRowSize([{ id: "unmeasured" }], new Map([["other", 40]]))).toBe(
301-
undefined,
302-
);
312+
expect(medianMeasuredRowSize([{ id: "unmeasured" }], new Map([["other", 40]]))).toBe(undefined);
303313
});
304314
});

‎apps/web/src/components/chat/timelineScrollAnchoring.ts‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export interface RememberedTimelinePosition {
149149
readonly atEnd: boolean;
150150
readonly itemSize?: {
151151
readonly viewportWidth: number;
152-
readonly average: number;
152+
readonly median: number;
153153
};
154154
readonly disclosures?: {
155155
readonly runs: ReadonlySet<RunId>;
@@ -162,19 +162,14 @@ export interface RememberedTimelinePosition {
162162
};
163163
}
164164

165-
export function averageMeasuredRowSize(
165+
export function medianMeasuredRowSize(
166166
rows: ReadonlyArray<{ readonly id: string }>,
167167
measuredSizes: ReadonlyMap<string, number>,
168168
) {
169-
let total = 0;
170-
let count = 0;
171-
for (const row of rows) {
172-
const size = measuredSizes.get(row.id);
173-
if (size === undefined) continue;
174-
total += size;
175-
count++;
176-
}
177-
return count > 0 ? total / count : undefined;
169+
const sizes = rows
170+
.flatMap((row) => measuredSizes.get(row.id) ?? [])
171+
.toSorted((left, right) => left - right);
172+
return sizes[Math.floor(sizes.length / 2)];
178173
}
179174

180175
// Scoped thread keys keep separate environments independent. Bound the session cache.
@@ -192,3 +187,11 @@ export function rememberTimelinePosition(threadKey: string, position: Remembered
192187
if (oldest !== undefined) rememberedTimelinePositions.delete(oldest);
193188
}
194189
}
190+
191+
export function rememberTimelineItemSize(
192+
threadKey: string,
193+
itemSize: NonNullable<RememberedTimelinePosition["itemSize"]>,
194+
) {
195+
const position = rememberedTimelinePositions.get(threadKey);
196+
if (position) rememberedTimelinePositions.set(threadKey, { ...position, itemSize });
197+
}

0 commit comments

Comments
 (0)