Report the activity bar against the message in the viewport.
Trigger cinny-mobile / dispatch (push) Successful in 1s

This commit is contained in:
2026-10-13 14:34:25 +11:00
parent 76e5f960d1
commit f0495cccca
3 changed files with 43 additions and 9 deletions
+31 -1
View File
@@ -362,6 +362,7 @@ type RoomTimelineProps = {
eventId?: string; eventId?: string;
roomInputRef: RefObject<HTMLElement>; roomInputRef: RefObject<HTMLElement>;
editor: Editor; editor: Editor;
onViewportAnchorChange?: (eventId?: string) => void;
}; };
const PAGINATION_LIMIT = 80; 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 mx = useMatrixClient();
const useAuthentication = useMediaAuthentication(); const useAuthentication = useMediaAuthentication();
const [hideActivity] = useSetting(settingsAtom, 'hideActivity'); const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
@@ -1189,6 +1196,29 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
}; };
}, [room.roomId, eventId, persistTimelineScroll]); }, [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. // Restore saved scroll or default to bottom on first open.
useLayoutEffect(() => { useLayoutEffect(() => {
const scrollEl = scrollRef.current; const scrollEl = scrollRef.current;
+4 -2
View File
@@ -1,4 +1,4 @@
import React, { useCallback, useRef } from 'react'; import React, { useCallback, useRef, useState } from 'react';
import { Box, Text, config } from 'folds'; import { Box, Text, config } from 'folds';
import { EventType, Room } from 'matrix-js-sdk'; import { EventType, Room } from 'matrix-js-sdk';
import { ReactEditor } from 'slate-react'; import { ReactEditor } from 'slate-react';
@@ -65,6 +65,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
const roomViewRef = useRef<HTMLDivElement>(null); const roomViewRef = useRef<HTMLDivElement>(null);
const [hideActivity] = useSetting(settingsAtom, 'hideActivity'); const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
const [viewportEventId, setViewportEventId] = useState<string>();
const { roomId } = room; const { roomId } = room;
const editor = useEditor(); const editor = useEditor();
@@ -117,10 +118,11 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
eventId={eventId} eventId={eventId}
roomInputRef={roomInputRef} roomInputRef={roomInputRef}
editor={editor} editor={editor}
onViewportAnchorChange={setViewportEventId}
/> />
<div className={roomViewCss.RoomViewBottomFloat}> <div className={roomViewCss.RoomViewBottomFloat}>
<RoomViewTyping room={room} /> <RoomViewTyping room={room} />
{!hideActivity && <RoomViewFollowing room={room} />} {!hideActivity && <RoomViewFollowing room={room} eventId={viewportEventId} />}
</div> </div>
</Box> </Box>
<Box shrink="No" direction="Column"> <Box shrink="No" direction="Column">
+8 -6
View File
@@ -21,16 +21,18 @@ export function RoomViewFollowingPlaceholder() {
export type RoomViewFollowingProps = { export type RoomViewFollowingProps = {
room: Room; room: Room;
/** Message the user is looking at. Falls back to the latest rendered event. */
eventId?: string;
}; };
export const RoomViewFollowing = as<'div', RoomViewFollowingProps>( export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
({ className, room, ...props }, ref) => { ({ className, room, eventId, ...props }, ref) => {
const mx = useMatrixClient(); const mx = useMatrixClient();
const myUserId = mx.getUserId(); const myUserId = mx.getUserId();
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const latestEvent = useRoomLatestRenderedEvent(room); const latestEvent = useRoomLatestRenderedEvent(room);
const eventId = latestEvent?.getId(); const shownEventId = eventId ?? latestEvent?.getId();
const latestEventReaders = useRoomEventReaders(room, eventId); const latestEventReaders = useRoomEventReaders(room, shownEventId);
const received = useRoomEventDelivery(room, eventId, myUserId); const received = useRoomEventDelivery(room, shownEventId, myUserId);
// Received but not read shows a single tick, read shows the double tick. // Received but not read shows a single tick, read shows the double tick.
const receivedOnly = received && !latestEventReaders.includes(myUserId); const receivedOnly = received && !latestEventReaders.includes(myUserId);
@@ -49,7 +51,7 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
return ( return (
<> <>
{eventId && ( {shownEventId && (
<Overlay open={open} backdrop={<OverlayBackdrop />}> <Overlay open={open} backdrop={<OverlayBackdrop />}>
<OverlayCenter> <OverlayCenter>
<FocusTrap <FocusTrap
@@ -61,7 +63,7 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
}} }}
> >
<Modal variant="Surface" size="300"> <Modal variant="Surface" size="300">
<EventReaders room={room} eventId={eventId} requestClose={() => setOpen(false)} /> <EventReaders room={room} eventId={shownEventId} requestClose={() => setOpen(false)} />
</Modal> </Modal>
</FocusTrap> </FocusTrap>
</OverlayCenter> </OverlayCenter>