fix(desktop): MessageList anchors via direct scrollTop + flex-1 height

scrollToIndex raced the virtualizer's own layout effect and depended on size estimates, leaving the list pinned at the top on open (and flickering as it settled). Drive scrollTop = scrollHeight directly for the bottom case (order-independent, true bottom) and re-pin on measure; switch the scroll root from h-full to flex-1 min-h-0 so it always has a bounded, scrollable height.
This commit is contained in:
byGalax
2026-06-02 21:00:19 +02:00
parent 30d00194be
commit b4ed3aced0
+46 -25
View File
@@ -9,7 +9,7 @@ import {
type ReactNode, type ReactNode,
} from 'react'; } from 'react';
import { isNearBottom, isNearTop, type Anchor } from '../lib/scrollController'; import { isNearBottom, isNearTop } from '../lib/scrollController';
import type { VirtuosoRow } from '../pages/ConversationPage'; import type { VirtuosoRow } from '../pages/ConversationPage';
export interface MessageListHandle { export interface MessageListHandle {
@@ -71,36 +71,57 @@ export const MessageList = forwardRef<MessageListHandle, MessageListProps>(funct
: { scrollTop: 0, scrollHeight: 0, clientHeight: 0 }; : { scrollTop: 0, scrollHeight: 0, clientHeight: 0 };
}, []); }, []);
const applyAnchor = useCallback( const pinToBottom = useCallback(() => {
(anchor: Anchor) => { const el = scrollElRef.current;
virtualizer.scrollToIndex(anchor.index, { align: anchor.align }); if (el) el.scrollTop = el.scrollHeight;
// Re-apply next frame: dynamic measurement settles after first paint, so a }, []);
// single scrollToIndex can land a few px off. Still hidden here → invisible.
requestAnimationFrame(() => virtualizer.scrollToIndex(anchor.index, { align: anchor.align }));
},
[virtualizer],
);
// Deferred reveal: when ready, anchor (before paint) then reveal. // Deferred reveal: when ready, position at the anchor (before paint), let one
// measure cycle settle (just-rendered rows get their real heights), re-pin,
// then reveal — so what appears is already final.
//
// For the bottom case we drive scrollTop = scrollHeight DIRECTLY rather than
// virtualizer.scrollToIndex: scrollToIndex depends on the virtualizer's own
// layout effect having run first (effect ordering is not guaranteed) and on its
// size estimates — when it lost that race the list stayed pinned at the TOP.
// Driving the DOM scrollTop is order-independent and always lands at the true
// bottom; the stick-to-bottom effect re-pins as the heights settle.
useLayoutEffect(() => { useLayoutEffect(() => {
if (!ready || revealed || rows.length === 0) return; if (!ready || revealed || rows.length === 0) return;
const anchor: Anchor = const el = scrollElRef.current;
initialAnchor.type === 'bottom' if (!el) return;
? { index: rows.length - 1, align: 'end' } if (initialAnchor.type === 'bottom') {
: { index: Math.max(0, Math.min(initialAnchor.index, rows.length - 1)), align: 'start' }; pinToBottom();
applyAnchor(anchor); atBottomRef.current = true;
atBottomRef.current = initialAnchor.type === 'bottom'; } else {
virtualizer.scrollToIndex(Math.max(0, Math.min(initialAnchor.index, rows.length - 1)), {
align: 'start',
});
atBottomRef.current = false;
}
onAtBottomChange?.(atBottomRef.current); onAtBottomChange?.(atBottomRef.current);
requestAnimationFrame(() => setRevealed(true)); requestAnimationFrame(() => {
if (atBottomRef.current) {
pinToBottom();
} else if (initialAnchor.type === 'row') {
// Re-apply after the virtualizer's own layout effect has run + measured,
// so the saved scrolled-up row lands accurately (same ordering caveat as
// the bottom case, handled here by deferring a frame).
virtualizer.scrollToIndex(Math.max(0, Math.min(initialAnchor.index, rows.length - 1)), {
align: 'start',
});
}
requestAnimationFrame(() => setRevealed(true));
});
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [ready, rows.length]); }, [ready, rows.length]);
// Stick-to-bottom: when content grows and we were at the bottom, re-pin. // Stick-to-bottom: whenever content grows (new row OR a measured row got
// taller) and we were at the bottom, re-pin to the true bottom. Runs while
// hidden too, so the list stays pinned through the initial measure settle.
useLayoutEffect(() => { useLayoutEffect(() => {
if (!revealed) return; if (!atBottomRef.current) return;
if (atBottomRef.current) { pinToBottom();
virtualizer.scrollToIndex(rows.length - 1, { align: 'end' });
}
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [rows.length, virtualizer.getTotalSize()]); }, [rows.length, virtualizer.getTotalSize()]);
@@ -138,7 +159,7 @@ export const MessageList = forwardRef<MessageListHandle, MessageListProps>(funct
() => ({ () => ({
scrollToBottom: () => { scrollToBottom: () => {
atBottomRef.current = true; atBottomRef.current = true;
virtualizer.scrollToIndex(rows.length - 1, { align: 'end' }); pinToBottom();
}, },
scrollToRow: (index, align = 'center') => { scrollToRow: (index, align = 'center') => {
virtualizer.scrollToIndex(index, { align }); virtualizer.scrollToIndex(index, { align });
@@ -154,7 +175,7 @@ export const MessageList = forwardRef<MessageListHandle, MessageListProps>(funct
<div <div
ref={scrollElRef} ref={scrollElRef}
onScroll={handleScroll} onScroll={handleScroll}
className="h-full overflow-y-auto" className="min-h-0 flex-1 overflow-y-auto"
style={{ opacity: revealed ? 1 : 0, position: 'relative' }} style={{ opacity: revealed ? 1 : 0, position: 'relative' }}
> >
<div style={{ height: virtualizer.getTotalSize(), position: 'relative', width: '100%' }}> <div style={{ height: virtualizer.getTotalSize(), position: 'relative', width: '100%' }}>