Skip to content

Commit 30a409e

Browse files
committed
fix(web): scope remembered row size to the current thread's rows
1 parent 7004cbb commit 30a409e

3 files changed

Lines changed: 40 additions & 5 deletions

File tree

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ import { ChangedFilesCard } from "./ChangedFilesTree";
179179
import { useFileContextMenuHandler } from "../../fileContextMenu";
180180
import { useProject, useThreadShell } from "../../state/entities";
181181
import {
182+
averageMeasuredRowSize,
182183
CHAT_TIMELINE_ANCHOR_OFFSET,
183184
readTimelinePosition,
184185
rememberTimelinePosition,
@@ -1204,17 +1205,14 @@ const ConversationTimeline = memo(function ConversationTimeline({
12041205
const element = listRef.current?.getScrollableNode();
12051206
if (row && element) {
12061207
const viewportRect = element.getBoundingClientRect();
1207-
const itemSizes = Object.values(state.getAverageItemSizes());
1208-
const measuredItemCount = itemSizes.reduce((sum, item) => sum + item.count, 0);
1209-
const measuredItemSize =
1210-
itemSizes.reduce((sum, item) => sum + item.average * item.count, 0) / measuredItemCount;
1208+
const measuredItemSize = averageMeasuredRowSize(rows, state.sizes);
12111209
rememberTimelinePosition(listIdentityKey, {
12121210
...position,
12131211
// DOM geometry includes the header and the virtualizer's layout adjustment.
12141212
offsetWithinRow: viewportRect.top - row.getBoundingClientRect().top,
12151213
scrollOffset: element.scrollTop,
12161214
atEnd: isAtEnd,
1217-
...(measuredItemCount > 0
1215+
...(measuredItemSize !== undefined
12181216
? {
12191217
itemSize: {
12201218
viewportWidth: Math.round(viewportRect.width),

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { MessageId, RunId } from "@t3tools/contracts";
22
import { describe, expect, it } from "vite-plus/test";
33
import {
4+
averageMeasuredRowSize,
45
observeTimelineRun,
56
getAnchoredTurnMetrics,
67
getRowBottom,
@@ -282,3 +283,22 @@ describe("remembered timeline positions", () => {
282283
expect(readTimelinePosition("scroll-test-a:thread-1")).toEqual(following);
283284
});
284285
});
286+
287+
describe("averageMeasuredRowSize", () => {
288+
it("ignores measurements the retained list kept from previously visited threads", () => {
289+
const compactRows = Array.from({ length: 255 }, (_, index) => ({ id: `fold-${index}` }));
290+
const longRows = Array.from({ length: 160 }, (_, index) => ({ id: `assistant-${index}` }));
291+
const measuredSizes = new Map([
292+
...compactRows.map((row) => [row.id, 30] as const),
293+
...longRows.slice(0, 17).map((row) => [row.id, 300] as const),
294+
]);
295+
expect(averageMeasuredRowSize(longRows, measuredSizes)).toBe(300);
296+
expect(averageMeasuredRowSize(compactRows, measuredSizes)).toBe(30);
297+
});
298+
299+
it("reports nothing until a current row has been measured", () => {
300+
expect(averageMeasuredRowSize([{ id: "unmeasured" }], new Map([["other", 40]]))).toBe(
301+
undefined,
302+
);
303+
});
304+
});

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,23 @@ export interface RememberedTimelinePosition {
162162
};
163163
}
164164

165+
// LegendList keeps measurements from every thread the mounted list has shown,
166+
// so only the given rows count toward this thread's estimate.
167+
export function averageMeasuredRowSize(
168+
rows: ReadonlyArray<{ readonly id: string }>,
169+
measuredSizes: ReadonlyMap<string, number>,
170+
) {
171+
let total = 0;
172+
let count = 0;
173+
for (const row of rows) {
174+
const size = measuredSizes.get(row.id);
175+
if (size === undefined) continue;
176+
total += size;
177+
count++;
178+
}
179+
return count > 0 ? total / count : undefined;
180+
}
181+
165182
// Scoped thread keys keep separate environments independent. Bound the session cache.
166183
const rememberedTimelinePositions = new Map<string, RememberedTimelinePosition>();
167184

0 commit comments

Comments
 (0)