Skip to content

fix: Restore room scroll for secondary navigation #35121

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

Merged
kodiakhq merged 6 commits into from
Feb 13, 2025
Merged

fix: Restore room scroll for secondary navigation #35121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
719e67f
fix race condition: use roomId from opened room from manager
yash-rajpal Feb 5, 2025
7e49653
add changeset
yash-rajpal Feb 5, 2025
26513ba
Merge branch 'develop' into fix/room-opening-race-condition-on-scroll
yash-rajpal Feb 5, 2025
3ee4e3a
Merge branch 'develop' into fix/room-opening-race-condition-on-scroll
kodiakhq[bot] Feb 11, 2025
661a72a
Merge branch 'develop' into fix/room-opening-race-condition-on-scroll
dougfabris Feb 13, 2025
99c9235
Merge branch 'develop' into fix/room-opening-race-condition-on-scroll
kodiakhq[bot] Feb 13, 2025
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
5 changes: 5 additions & 0 deletions .changeset/lucky-birds-lie.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue which caused some weird scrolling in rooms when using secondary sidepanel navigation.
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/body/RoomBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const RoomBody = (): ReactElement => {
targeDrop: [fileUploadTriggerProps, fileUploadOverlayProps],
} = useFileUpload();

const { innerRef: restoreScrollPositionInnerRef } = useRestoreScrollPosition(room._id);
const { innerRef: restoreScrollPositionInnerRef } = useRestoreScrollPosition();

const { messageListRef } = useMessageListNavigation();
const { innerRef: selectAndScrollRef, selectAllAndScrollToTop } = useSelectAllAndScrollToTop();
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/body/RoomBodyV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const RoomBody = (): ReactElement => {
targeDrop: [fileUploadTriggerProps, fileUploadOverlayProps],
} = useFileUpload();

const { innerRef: restoreScrollPositionInnerRef } = useRestoreScrollPosition(room._id);
const { innerRef: restoreScrollPositionInnerRef } = useRestoreScrollPosition();

const { messageListRef } = useMessageListNavigation();
const { innerRef: selectAndScrollRef, selectAllAndScrollToTop } = useSelectAllAndScrollToTop();
Expand Down
8 changes: 5 additions & 3 deletions apps/meteor/client/views/room/body/hooks/useRestoreScrollPosition.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ jest.mock('../../../../lib/RoomManager', () => ({
RoomManager: {
getStore: jest.fn(),
},
useOpenedRoom: jest.fn(() => 'room-id'),
useSecondLevelOpenedRoom: jest.fn(() => 'room-id'),
}));

describe('useRestoreScrollPosition', () => {
Expand All @@ -21,7 +23,7 @@ describe('useRestoreScrollPosition', () => {

const useRefSpy = jest.spyOn(React, 'useRef').mockReturnValueOnce({ current: mockElement });

const { unmount } = renderHook(() => useRestoreScrollPosition('room-id'));
const { unmount } = renderHook(() => useRestoreScrollPosition());

expect(useRefSpy).toHaveBeenCalledWith(null);
expect(mockElement).toHaveProperty('scrollTop', 100);
Expand All @@ -42,7 +44,7 @@ describe('useRestoreScrollPosition', () => {

const useRefSpy = jest.spyOn(React, 'useRef').mockReturnValueOnce({ current: mockElement });

const { unmount } = renderHook(() => useRestoreScrollPosition('room-id'));
const { unmount } = renderHook(() => useRestoreScrollPosition());

expect(useRefSpy).toHaveBeenCalledWith(null);
expect(mockElement).toHaveProperty('scrollTop', 800);
Expand Down Expand Up @@ -71,7 +73,7 @@ describe('useRestoreScrollPosition', () => {

const useRefSpy = jest.spyOn(React, 'useRef').mockReturnValueOnce({ current: mockElement });

const { unmount } = renderHook(() => useRestoreScrollPosition('room-id'));
const { unmount } = renderHook(() => useRestoreScrollPosition());

expect(useRefSpy).toHaveBeenCalledWith(null);
expect(update).toHaveBeenCalledWith({ scroll: 500, atBottom: false });
Expand Down
11 changes: 6 additions & 5 deletions apps/meteor/client/views/room/body/hooks/useRestoreScrollPosition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import type { IRoom } from '@rocket.chat/core-typings';
import { useCallback, useEffect, useRef } from 'react';

import { isAtBottom } from '../../../../../app/ui/client/views/app/lib/scrolling';
import { withThrottling } from '../../../../../lib/utils/highOrderFunctions';
import { RoomManager } from '../../../../lib/RoomManager';
import { RoomManager, useOpenedRoom, useSecondLevelOpenedRoom } from '../../../../lib/RoomManager';

export function useRestoreScrollPosition(roomId: IRoom['_id']) {
export function useRestoreScrollPosition() {
const ref = useRef<HTMLElement>(null);
const parentRoomId = useOpenedRoom();
const roomId = useSecondLevelOpenedRoom() ?? parentRoomId;

const handleRestoreScroll = useCallback(() => {
if (!ref.current) {
if (!ref.current || !roomId) {
return;
}

Expand All @@ -24,7 +25,7 @@ export function useRestoreScrollPosition(roomId: IRoom['_id']) {
}, [roomId]);

useEffect(() => {
if (!ref.current) {
if (!ref.current || !roomId) {
return;
}

Expand Down
Loading