Skip to content

Commit 33b17f8

Browse files
fix(web): refresh minimap highlights after row measurement
1 parent 277fe43 commit 33b17f8

3 files changed

Lines changed: 43 additions & 4 deletions

File tree

‎apps/web/src/components/chat/MessagesTimeline.logic.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,8 @@ export function resolveTimelineMinimapVisibleRange(state: {
360360
if (
361361
top != null &&
362362
Number.isFinite(top) &&
363-
height != null &&
364-
Number.isFinite(height) &&
365363
top < bottom &&
366-
top + height > state.scroll
364+
top + Math.max(1, height != null && Number.isFinite(height) ? height : 1) > state.scroll
367365
) {
368366
start ??= index;
369367
end = index;

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1099,6 +1099,27 @@ export const MessagesTimeline = memo(function MessagesTimeline({
10991099
reportContentOverflow,
11001100
]);
11011101

1102+
const itemMeasurementFrameRef = useRef<number | null>(null);
1103+
const handleItemSizeChanged = useCallback(() => {
1104+
reportContentOverflow();
1105+
if (itemMeasurementFrameRef.current !== null) return;
1106+
// Read after LegendList has applied all row measurements for this frame.
1107+
itemMeasurementFrameRef.current = requestAnimationFrame(() => {
1108+
itemMeasurementFrameRef.current = null;
1109+
handleScroll();
1110+
});
1111+
}, [handleScroll, reportContentOverflow]);
1112+
1113+
useEffect(
1114+
() => () => {
1115+
if (itemMeasurementFrameRef.current !== null) {
1116+
cancelAnimationFrame(itemMeasurementFrameRef.current);
1117+
itemMeasurementFrameRef.current = null;
1118+
}
1119+
},
1120+
[],
1121+
);
1122+
11021123
useEffect(() => {
11031124
const frame = requestAnimationFrame(handleScroll);
11041125
return () => cancelAnimationFrame(frame);
@@ -1362,7 +1383,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
13621383
}
13631384
maintainScrollAtEndThreshold={1}
13641385
onScroll={handleScroll}
1365-
onItemSizeChanged={reportContentOverflow}
1386+
onItemSizeChanged={handleItemSizeChanged}
13661387
className={cn(
13671388
"messages-timeline-scroll scrollbar-gutter-both h-full min-h-0 overflow-x-hidden overscroll-y-contain [overflow-anchor:none]",
13681389
topFadeEnabled && "topbar-scroll-fade",

‎apps/web/src/components/chat/timelineMinimapVisibility.test.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,23 @@ it("ignores stale offscreen positions outside the rendered buffer", () => {
5656
expect(range).toEqual({ start: 10, end: 11 });
5757
expect(isTimelineMinimapRowVisible(0, range.start, range.end)).toBe(false);
5858
});
59+
60+
it("keeps unmeasured markers visible and includes measured rows crossing the viewport", () => {
61+
const state = {
62+
startBuffered: 0,
63+
endBuffered: 2,
64+
scroll: 100,
65+
scrollLength: 200,
66+
positionAtIndex: (index: number) => [50, 150, 300][index],
67+
sizeAtIndex: (_index: number): number | undefined => undefined,
68+
};
69+
expect(resolveTimelineMinimapVisibleRange(state)).toEqual({ start: 1, end: 1 });
70+
expect(resolveTimelineMinimapVisibleRange({ ...state, sizeAtIndex: () => 100 })).toEqual({
71+
start: 0,
72+
end: 1,
73+
});
74+
expect(resolveTimelineMinimapVisibleRange({ ...state, sizeAtIndex: () => Number.NaN })).toEqual({
75+
start: 1,
76+
end: 1,
77+
});
78+
});

0 commit comments

Comments
 (0)