iarv/Remote-Terminal-for-MeshCore
1
0
Fork 1
mirror of https://github.com/jkingsman/Remote-Terminal-for-MeshCore.git synced 2026-03-28 17:43:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make conversation ref handling safer

Browse Source
This commit is contained in:
Jack Kingsman
2026-02-09 17:04:32 -08:00
parent f32ba0629a
commit e3ba7c8b82
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/src/components/MessageList.tsx
View File

@@ -163,6 +163,9 @@ export function MessageList({
wasNearBottom: true, // Default to true so initial messages scroll to bottom
});
// Track conversation key to detect when entire message set changes
const prevConvKeyRef = useRef<string | null>(null);
// Handle scroll position AFTER render
useLayoutEffect(() => {
if (!listRef.current) return;
@@ -170,8 +173,15 @@ export function MessageList({
const list = listRef.current;
const messagesAdded = messages.length - prevMessagesLengthRef.current;
if (isInitialLoadRef.current && messages.length > 0) {
// Initial load - scroll to bottom
// Detect if messages are from a different conversation (handles the case where
// the key prop remount consumes isInitialLoadRef on stale data from the previous
// conversation before the cache restore effect sets the correct messages)
const convKey = messages.length > 0 ? messages[0].conversation_key : null;
const conversationChanged = convKey !== null && convKey !== prevConvKeyRef.current;
if (convKey !== null) prevConvKeyRef.current = convKey;
if ((isInitialLoadRef.current || conversationChanged) && messages.length > 0) {
// Initial load or conversation switch - scroll to bottom
list.scrollTop = list.scrollHeight;
isInitialLoadRef.current = false;
} else if (messagesAdded > 0 && prevMessagesLengthRef.current > 0) {
@@ -195,6 +205,7 @@ export function MessageList({
if (messages.length === 0) {
isInitialLoadRef.current = true;
prevMessagesLengthRef.current = 0;
prevConvKeyRef.current = null;
scrollStateRef.current = {
scrollTop: 0,
scrollHeight: 0,