diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx index c5021c54..683b15d0 100644 --- a/src/app/features/room/RoomTimeline.tsx +++ b/src/app/features/room/RoomTimeline.tsx @@ -202,10 +202,13 @@ export function RoomTimeline({ const hasInitialScrolledRef = useRef(false); const currentRoomIdRef = useRef(room.roomId); + const [isReady, setIsReady] = useState(false); + if (currentRoomIdRef.current !== room.roomId) { hasInitialScrolledRef.current = false; mountScrollWindowRef.current = Date.now() + 3000; currentRoomIdRef.current = room.roomId; + setIsReady(false); } const processedEventsRef = useRef([]); @@ -275,6 +278,7 @@ export function RoomTimeline({ vListRef.current.scrollToIndex(processedEventsRef.current.length - 1, { align: 'end' }); const t = setTimeout(() => { vListRef.current?.scrollToIndex(processedEventsRef.current.length - 1, { align: 'end' }); + setIsReady(true); }, 80); hasInitialScrolledRef.current = true; return () => clearTimeout(t); @@ -694,7 +698,7 @@ export function RoomTimeline({ return ( - {unreadInfo?.readUptoEventId && !unreadInfo?.inLiveTimeline && ( + {unreadInfo?.readUptoEventId && !unreadInfo?.inLiveTimeline && isReady && ( ref={vListRef} @@ -832,7 +842,7 @@ export function RoomTimeline({ {frontPaginationJSX} - {!atBottomState && ( + {!atBottomState && isReady && (