diff --git a/web/src/components/layout/NowPlaying.tsx b/web/src/components/layout/NowPlaying.tsx index 9dc7f98..8b1dbeb 100644 --- a/web/src/components/layout/NowPlaying.tsx +++ b/web/src/components/layout/NowPlaying.tsx @@ -118,7 +118,7 @@ export default function NowPlaying() { {t('player.nowPlaying')}
-
+
@@ -155,11 +155,16 @@ export default function NowPlaying() { {radio &&

{t('radio.now', { name: radio.title })}

}
- + - - - + {/* On a phone the seek bar and the controls stay at the bottom of the screen while the page scrolls; wide, they are in the flow as before. */} +
+ + +
{upNext.length > 0 && ( diff --git a/web/src/components/layout/Player.test.tsx b/web/src/components/layout/Player.test.tsx index 09c045c..01daa39 100644 --- a/web/src/components/layout/Player.test.tsx +++ b/web/src/components/layout/Player.test.tsx @@ -584,6 +584,29 @@ test('the full-screen player controls come in full: shuffle, previous and repeat for (const name of ['Shuffle', 'Previous', 'Repeat: off']) expect(dialog.getByRole('button', { name })).not.toHaveClass('max-sm:hidden') }) +test('on a phone the seek bar and the controls of the full-screen player stay at the bottom while the page scrolls', async () => { + act(() => usePlayer.getState().playTracks([a, b, c])) + renderBar() + await userEvent.click(screen.getByRole('button', { name: 'Open the full-screen player' })) + const full = within(screen.getByRole('dialog')) + const dock = full.getByRole('button', { name: 'Previous' }).closest('[data-phone-dock]') + expect(dock).not.toBeNull() + expect(dock).toHaveClass('max-sm:sticky', 'max-sm:bottom-0') + // The seek bar and the play button are in the same block, so that both stay on screen. + expect(within(dock as HTMLElement).getByRole('slider')).toBeInTheDocument() + expect(within(dock as HTMLElement).getByRole('button', { name: 'Pause' })).toBeInTheDocument() + // What comes next is not in it: it is what scrolls beneath. + expect(within(dock as HTMLElement).queryByRole('region', { name: 'Up next' })).toBeNull() +}) + +test('on a short phone the cover of the full-screen player shrinks to leave room for the controls', async () => { + act(() => usePlayer.getState().playTracks([a, b])) + renderBar() + await userEvent.click(screen.getByRole('button', { name: 'Open the full-screen player' })) + const full = screen.getByRole('dialog') + expect(full.querySelector('[data-phone-cover]')?.className).toContain('max-sm:max-w-[min(18rem,34dvh)]') +}) + // --- Gestures on a phone ----------------------------------------------------------------------- const touch = (x: number, y: number) => ({ clientX: x, clientY: y })