Skip to content

Fix: Restore main chat scroll position after closing thread view #1178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DammyCodes-all wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix: Restore main chat scroll position after closing thread view #1178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 42 additions & 3 deletions packages/react/src/views/ChatBody/ChatBody.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ const ChatBody = ({
const [isOverflowing, setIsOverflowing] = useState(false);
const [firstUnreadMessageId, setFirstUnreadMessageId] = useState(null);
const pendingFirstUnreadRef = useRef(null);
const previousThreadOpenRef = useRef(false);
const mainChatScrollSnapshotRef = useRef(null);
const isRestoringFromThreadRef = useRef(false);
const { RCInstance, ECOptions } = useContext(RCContext);
const showAnnouncement = ECOptions?.showAnnouncement;
const messages = useMessageStore((state) => state.messages);
Expand Down Expand Up @@ -121,6 +124,41 @@ const ChatBody = ({
}
}, [getThreadMessages, isThreadOpen, ECOptions?.enableThreads]);

useEffect(() => {
const messageList = messageListRef?.current;
if (!messageList) {
previousThreadOpenRef.current = isThreadOpen;
return;
}

if (!previousThreadOpenRef.current && isThreadOpen) {
mainChatScrollSnapshotRef.current = messageList.scrollTop;
}

if (previousThreadOpenRef.current && !isThreadOpen) {
const snapshot = mainChatScrollSnapshotRef.current;
if (typeof snapshot === 'number') {
isRestoringFromThreadRef.current = true;
requestAnimationFrame(() => {
const currentMessageList = messageListRef?.current;
if (currentMessageList) {
const maxScrollTop = Math.max(
0,
currentMessageList.scrollHeight - currentMessageList.clientHeight
);
currentMessageList.scrollTop = Math.min(snapshot, maxScrollTop);
}

requestAnimationFrame(() => {
isRestoringFromThreadRef.current = false;
});
});
}
}

previousThreadOpenRef.current = isThreadOpen;
}, [isThreadOpen, messageListRef]);

const addMessage = useCallback(
(message) => {
if (message.u.username !== username) {
Expand Down Expand Up @@ -217,7 +255,8 @@ const ChatBody = ({
if (
messageListRef.current.scrollTop === 0 &&
!loadingOlderMessages &&
hasMoreMessages
hasMoreMessages &&
!isRestoringFromThreadRef.current
) {
setLoadingOlderMessages(true);

Expand Down Expand Up @@ -308,10 +347,10 @@ const ChatBody = ({
};

useEffect(() => {
if (messageListRef.current) {
if (messageListRef.current && !isThreadOpen) {
messageListRef.current.scrollTop = messageListRef.current.scrollHeight;
}
}, [messages]);
}, [messages, isThreadOpen, messageListRef]);

useEffect(() => {
checkOverflow();
Expand Down