@@ -179,9 +179,10 @@ import { ChangedFilesCard } from "./ChangedFilesTree";
179179import { useFileContextMenuHandler } from "../../fileContextMenu" ;
180180import { useProject , useThreadShell } from "../../state/entities" ;
181181import {
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 ;
0 commit comments