chore: bot reviews

Author: MartinSchoeler

apps/meteor/client/views/room/MessageList/MessageList.tsx

@@ -43,7 +43,7 @@ type MessageListProps = {
 	handleDateScroll: (topMessage: IMessage | undefined) => void;
 };
 
-const lastViewportSize = 0;
+let lastViewportSize = 0;
 
 export const MessageList = function MessageList({
 	rid,
@@ -139,6 +139,7 @@ export const MessageList = function MessageList({
 		}
 		// If new messages arrive and is at bottom, scroll to keep at bottom
 		if (isAtBottom.current && lastViewportSize !== handle?.viewportSize) {
+			lastViewportSize = handle?.viewportSize ?? 0;
 			handle?.scrollToIndex(lastItemIndex + 1, {
 				align: 'end',
 			});
@@ -232,6 +233,9 @@ export const MessageList = function MessageList({
 
 						if (showUnreadDivider) {
 							unreadMarkIndex.current = index;
+						} else {
+							// Manually unsets the unread mark index when the divider is not visible to avoid stale state
+							unreadMarkIndex.current = null;
 						}
 
 						return (

apps/meteor/client/views/room/MessageList/hooks/useTryToJumpToMessage.ts

@@ -8,6 +8,7 @@ import type { WindowVirtualizerHandle } from 'virtua';
 import { RoomHistoryManager } from '../../../../../app/ui-utils/client';
 import { messagesQueryKeys } from '../../../../lib/queryKeys';
 import { mapMessageFromApi } from '../../../../lib/utils/mapMessageFromApi';
+import { setMessageJumpQueryStringParameter } from '../../../../lib/utils/setMessageJumpQueryStringParameter';
 import { clearHighlightMessage, setHighlightMessage } from '../providers/messageHighlightSubscription';
 
 type UseTryToJumpToMessageProps = {
@@ -84,12 +85,7 @@ const useTryToJumpToMessage = ({ rid, virtualizerRef, isJumpingToMessage, messag
 			isJumpingToMessage.current = false;
 		}, 500);
 
-		router.navigate(
-			{
-				pathname: router.getLocationPathname(),
-			},
-			{ replace: true },
-		);
+		setMessageJumpQueryStringParameter(null);
 	}, [messageJumpParam, virtualizerRef, isJumpingToMessage, rid, messages, router, message]);
 };
 

apps/meteor/client/views/room/body/hooks/useStoreScrollPosition.ts

@@ -13,8 +13,15 @@ type UseStoreScrollPositionProps = {
 export function useStoreScrollPosition({ rid, isAtBottom, virtualizerRef }: UseStoreScrollPositionProps) {
 	return useDebouncedCallback(
 		() => {
+			const scroll = virtualizerRef.current?.scrollOffset;
+
+			if (scroll == null) {
+				return;
+			}
+
 			const store = RoomManager.getStore(rid);
-			store?.update({ scroll: virtualizerRef.current?.scrollOffset ?? 0, atBottom: isAtBottom.current });
+
+			store?.update({ scroll, atBottom: isAtBottom.current });
 		},
 		100,
 		[rid, isAtBottom, virtualizerRef],

apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx

@@ -12,6 +12,7 @@ import type { VirtualizerHandle } from 'virtua';
 import { VList } from 'virtua';
 
 import { ThreadMessageItem } from './ThreadMessageItem';
+import { setMessageJumpQueryStringParameter } from '../../../../../lib/utils/setMessageJumpQueryStringParameter';
 import { BubbleDate } from '../../../BubbleDate';
 import { isMessageNewDay } from '../../../MessageList/lib/isMessageNewDay';
 import MessageListProvider from '../../../MessageList/providers/MessageListProvider';
@@ -123,12 +124,7 @@ const ThreadMessageList = ({ mainMessage }: ThreadMessageListProps): ReactElemen
 		const t1 = setTimeout(() => {
 			clearHighlightMessage();
 		}, 2000);
-		router.navigate(
-			{
-				pathname: router.getLocationPathname(),
-			},
-			{ replace: true },
-		);
+		setMessageJumpQueryStringParameter(null);
 		return () => {
 			clearTimeout(t1);
 		};

apps/meteor/client/views/room/hooks/useDateScroll.ts

@@ -100,7 +100,7 @@ export const useDateScroll = (margin = 8): useDateScrollReturn => {
 					undefined,
 					{
 						position: 'absolute',
-						to: `${margin}px`,
+						top: `${margin}px`,
 						left: ' 50%',
 						translate: '-50%',
 						zIndex: 11,