diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx index 8565543a..57fd31e4 100644 --- a/src/app/features/room/RoomTimeline.tsx +++ b/src/app/features/room/RoomTimeline.tsx @@ -362,7 +362,6 @@ type RoomTimelineProps = { eventId?: string; roomInputRef: RefObject; editor: Editor; - onViewportAnchorChange?: (eventId?: string) => void; }; const PAGINATION_LIMIT = 80; @@ -565,13 +564,7 @@ const getRoomUnreadInfo = (room: Room, scrollTo = false) => { }; }; -export function RoomTimeline({ - room, - eventId, - roomInputRef, - editor, - onViewportAnchorChange, -}: RoomTimelineProps) { +export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimelineProps) { const mx = useMatrixClient(); const useAuthentication = useMediaAuthentication(); const [hideActivity] = useSetting(settingsAtom, 'hideActivity'); @@ -1196,29 +1189,6 @@ export function RoomTimeline({ }; }, [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 704e8949..034754dd 100644 --- a/src/app/features/room/RoomView.tsx +++ b/src/app/features/room/RoomView.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useRef, useState } from 'react'; +import React, { useCallback, useRef } from 'react'; import { Box, Text, config } from 'folds'; import { EventType, Room } from 'matrix-js-sdk'; import { ReactEditor } from 'slate-react'; @@ -65,7 +65,6 @@ 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(); @@ -118,11 +117,10 @@ 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 52596249..8beabc7d 100644 --- a/src/app/features/room/RoomViewFollowing.tsx +++ b/src/app/features/room/RoomViewFollowing.tsx @@ -20,17 +20,15 @@ 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, eventId, ...props }, ref) => { + ({ className, room, ...props }, ref) => { const mx = useMatrixClient(); const myUserId = mx.getUserId(); const [open, setOpen] = useState(false); const latestEvent = useRoomLatestRenderedEvent(room); - const shownEventId = eventId ?? latestEvent?.getId(); - const latestEventReaders = useRoomEventReaders(room, shownEventId); + const eventId = latestEvent?.getId(); + const latestEventReaders = useRoomEventReaders(room, eventId); const names = latestEventReaders .filter((readerId) => readerId !== myUserId) @@ -44,7 +42,7 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>( return ( <> - {shownEventId && ( + {eventId && ( }> ( }} > - setOpen(false)} /> + setOpen(false)} />