From f0495cccca7a2649a8c07d33cd7fffb8ab7f78ec Mon Sep 17 00:00:00 2001 From: litruv Date: Tue, 13 Oct 2026 14:34:25 +1100 Subject: [PATCH] Report the activity bar against the message in the viewport. --- src/app/features/room/RoomTimeline.tsx | 32 ++++++++++++++++++++- src/app/features/room/RoomView.tsx | 6 ++-- src/app/features/room/RoomViewFollowing.tsx | 14 +++++---- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx index 57fd31e4..8565543a 100644 --- a/src/app/features/room/RoomTimeline.tsx +++ b/src/app/features/room/RoomTimeline.tsx @@ -362,6 +362,7 @@ type RoomTimelineProps = { eventId?: string; roomInputRef: RefObject; editor: Editor; + onViewportAnchorChange?: (eventId?: string) => void; }; const PAGINATION_LIMIT = 80; @@ -564,7 +565,13 @@ const getRoomUnreadInfo = (room: Room, scrollTo = false) => { }; }; -export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimelineProps) { +export function RoomTimeline({ + room, + eventId, + roomInputRef, + editor, + onViewportAnchorChange, +}: RoomTimelineProps) { const mx = useMatrixClient(); const useAuthentication = useMediaAuthentication(); const [hideActivity] = useSetting(settingsAtom, 'hideActivity'); @@ -1189,6 +1196,29 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli }; }, [room.roomId, eventId, persistTimelineScroll]); + // Report the message the user is actually looking at, so the activity bar + // reflects the shown message instead of the newest event in the room. + useEffect(() => { + if (!onViewportAnchorChange) return undefined; + const scrollEl = scrollRef.current; + if (!scrollEl) return undefined; + + let raf = 0; + const report = () => { + window.cancelAnimationFrame(raf); + raf = window.requestAnimationFrame(() => { + onViewportAnchorChange(eventId ?? getViewportAnchorEventId() ?? getRangeCenterEventId()); + }); + }; + + report(); + scrollEl.addEventListener('scroll', report, { passive: true }); + return () => { + window.cancelAnimationFrame(raf); + scrollEl.removeEventListener('scroll', report); + }; + }, [onViewportAnchorChange, eventId, getViewportAnchorEventId, getRangeCenterEventId]); + // Restore saved scroll or default to bottom on first open. useLayoutEffect(() => { const scrollEl = scrollRef.current; diff --git a/src/app/features/room/RoomView.tsx b/src/app/features/room/RoomView.tsx index 034754dd..704e8949 100644 --- a/src/app/features/room/RoomView.tsx +++ b/src/app/features/room/RoomView.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useRef } from 'react'; +import React, { useCallback, useRef, useState } from 'react'; import { Box, Text, config } from 'folds'; import { EventType, Room } from 'matrix-js-sdk'; import { ReactEditor } from 'slate-react'; @@ -65,6 +65,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) { const roomViewRef = useRef(null); const [hideActivity] = useSetting(settingsAtom, 'hideActivity'); + const [viewportEventId, setViewportEventId] = useState(); const { roomId } = room; const editor = useEditor(); @@ -117,10 +118,11 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) { eventId={eventId} roomInputRef={roomInputRef} editor={editor} + onViewportAnchorChange={setViewportEventId} />
- {!hideActivity && } + {!hideActivity && }
diff --git a/src/app/features/room/RoomViewFollowing.tsx b/src/app/features/room/RoomViewFollowing.tsx index 9a7a9bcf..fb005c5b 100644 --- a/src/app/features/room/RoomViewFollowing.tsx +++ b/src/app/features/room/RoomViewFollowing.tsx @@ -21,16 +21,18 @@ export function RoomViewFollowingPlaceholder() { export type RoomViewFollowingProps = { room: Room; + /** Message the user is looking at. Falls back to the latest rendered event. */ + eventId?: string; }; export const RoomViewFollowing = as<'div', RoomViewFollowingProps>( - ({ className, room, ...props }, ref) => { + ({ className, room, eventId, ...props }, ref) => { const mx = useMatrixClient(); const myUserId = mx.getUserId(); const [open, setOpen] = useState(false); const latestEvent = useRoomLatestRenderedEvent(room); - const eventId = latestEvent?.getId(); - const latestEventReaders = useRoomEventReaders(room, eventId); - const received = useRoomEventDelivery(room, eventId, myUserId); + const shownEventId = eventId ?? latestEvent?.getId(); + const latestEventReaders = useRoomEventReaders(room, shownEventId); + const received = useRoomEventDelivery(room, shownEventId, myUserId); // Received but not read shows a single tick, read shows the double tick. const receivedOnly = received && !latestEventReaders.includes(myUserId); @@ -49,7 +51,7 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>( return ( <> - {eventId && ( + {shownEventId && ( }> ( }} > - setOpen(false)} /> + setOpen(false)} />