Report the activity bar against the message in the viewport.
Trigger cinny-mobile / dispatch (push) Successful in 1s
Trigger cinny-mobile / dispatch (push) Successful in 1s
This commit is contained in:
@@ -362,6 +362,7 @@ type RoomTimelineProps = {
|
||||
eventId?: string;
|
||||
roomInputRef: RefObject<HTMLElement>;
|
||||
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;
|
||||
|
||||
@@ -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<HTMLDivElement>(null);
|
||||
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [viewportEventId, setViewportEventId] = useState<string>();
|
||||
|
||||
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}
|
||||
/>
|
||||
<div className={roomViewCss.RoomViewBottomFloat}>
|
||||
<RoomViewTyping room={room} />
|
||||
{!hideActivity && <RoomViewFollowing room={room} />}
|
||||
{!hideActivity && <RoomViewFollowing room={room} eventId={viewportEventId} />}
|
||||
</div>
|
||||
</Box>
|
||||
<Box shrink="No" direction="Column">
|
||||
|
||||
@@ -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 && (
|
||||
<Overlay open={open} backdrop={<OverlayBackdrop />}>
|
||||
<OverlayCenter>
|
||||
<FocusTrap
|
||||
@@ -61,7 +63,7 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
|
||||
}}
|
||||
>
|
||||
<Modal variant="Surface" size="300">
|
||||
<EventReaders room={room} eventId={eventId} requestClose={() => setOpen(false)} />
|
||||
<EventReaders room={room} eventId={shownEventId} requestClose={() => setOpen(false)} />
|
||||
</Modal>
|
||||
</FocusTrap>
|
||||
</OverlayCenter>
|
||||
|
||||
Reference in New Issue
Block a user