Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/fix-mobile-drawer-offscreen-scroll.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: patch
---

Fixed the mobile nav drawer sliding permanently out of frame after the keyboard or a focus change scrolled the panel track.
51 changes: 51 additions & 0 deletions src/app/components/page/MobileNavDrawer.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { render, screen } from '@testing-library/react';
import { beforeAll, describe, expect, it, vi } from 'vitest';
import { MemoryRouter } from 'react-router-dom';
import { MobileNavDrawer } from './MobileNavDrawer';

vi.mock('$state/hooks/settings', () => ({
useSetting: () => [true, vi.fn<() => void>()],
}));

vi.mock('./PersistentRoomHost', () => ({
PersistentRoomHost: () => <div data-testid="persistent-room-host" />,
}));

beforeAll(() => {
window.matchMedia =
window.matchMedia ??
((query: string) =>
({
matches: false,
media: query,
addEventListener: () => {},
removeEventListener: () => {},
addListener: () => {},
removeListener: () => {},
onchange: null,
dispatchEvent: () => false,
}) as unknown as MediaQueryList);
});

const renderDrawer = () =>
render(
<MemoryRouter initialEntries={['/home']}>
<MobileNavDrawer nav={<div>nav</div>}>
<div>content</div>
</MobileNavDrawer>
</MemoryRouter>
);

describe('MobileNavDrawer', () => {
// The panels sit side by side in a track twice the viewport wide, moved by transform.
// `hidden` leaves a scrollport that focus or scrollIntoView scrolls a full panel width,
// stacking on top of the transform and stranding the active panel off frame.
it('clips the viewport instead of hiding overflow, so it can never be scrolled', () => {
renderDrawer();

const viewport = screen.getByTestId('mobile-nav-drawer-viewport');

expect(viewport.style.overflow).toBe('clip');
expect(viewport.style.overflow).not.toBe('hidden');
});
});
5 changes: 4 additions & 1 deletion src/app/components/page/MobileNavDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ export function MobileNavDrawer({ nav, rail, bottomNav, children }: MobileNavDra
<div
ref={viewportRef}
className="no-scrollbar"
data-testid="mobile-nav-drawer-viewport"
onTouchStartCapture={(event) => {
const viewport = viewportRef.current;
const touch = event.touches[0];
Expand Down Expand Up @@ -419,7 +420,9 @@ export function MobileNavDrawer({ nav, rail, bottomNav, children }: MobileNavDra
flexGrow: 1,
height: '100%',
width: '100%',
overflow: 'hidden',
// `clip`, not `hidden`: hidden keeps a scrollport, so a focus or scrollIntoView on
// the revealed panel scrolls it a full panel width out of frame, permanently.
overflow: 'clip',
overscrollBehaviorX: 'none',
touchAction: 'pan-y',
}}
Expand Down
Loading