feat(web/m7-364): PlayerBar queue toggle + Up next line

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-05-03 21:50:14 -04:00
parent b99eb5f120
commit 36805914d8
2 changed files with 84 additions and 13 deletions
+21 -2
View File
@@ -2,12 +2,14 @@
import { import {
SkipBack, SkipForward, Play, Pause, Loader2, SkipBack, SkipForward, Play, Pause, Loader2,
Shuffle, Repeat, Repeat1, Shuffle, Repeat, Repeat1,
Volume2, Volume1, VolumeX Volume2, Volume1, VolumeX,
ListMusic
} from 'lucide-svelte'; } from 'lucide-svelte';
import { import {
player, player,
togglePlay, skipNext, skipPrev, seekTo, setVolume, togglePlay, skipNext, skipPrev, seekTo, setVolume,
toggleShuffle, cycleRepeat, playQueue toggleShuffle, cycleRepeat, playQueue,
toggleQueueDrawer
} from '$lib/player/store.svelte'; } from '$lib/player/store.svelte';
import { formatDuration } from '$lib/media/duration'; import { formatDuration } from '$lib/media/duration';
import { FALLBACK_COVER } from '$lib/media/covers'; import { FALLBACK_COVER } from '$lib/media/covers';
@@ -69,6 +71,12 @@
> >
{current.artist_name} {current.artist_name}
</a> </a>
{#if player.queue.length > player.index + 1}
{@const nextTrack = player.queue[player.index + 1]}
<span class="text-text-secondary text-xs truncate block">
Next · {nextTrack.title}{nextTrack.artist_name}
</span>
{/if}
</div> </div>
<LikeButton entityType="track" entityId={current.id} /> <LikeButton entityType="track" entityId={current.id} />
<TrackMenu track={current} direction="up" hideQueueActions /> <TrackMenu track={current} direction="up" hideQueueActions />
@@ -177,6 +185,17 @@
<Repeat size={18} strokeWidth={1.5} /> <Repeat size={18} strokeWidth={1.5} />
{/if} {/if}
</button> </button>
<button
type="button"
onclick={() => toggleQueueDrawer()}
aria-label={player.queueDrawerOpen ? 'Close queue' : 'Open queue'}
aria-pressed={player.queueDrawerOpen}
class="flex h-9 w-9 items-center justify-center rounded-full transition-colors {player.queueDrawerOpen
? 'bg-action-secondary text-action-fg'
: 'text-text-secondary hover:bg-surface-hover hover:text-text-primary'}"
>
<ListMusic size={20} strokeWidth={1.5} />
</button>
<label class="flex items-center gap-1.5"> <label class="flex items-center gap-1.5">
<span class="sr-only">Volume</span> <span class="sr-only">Volume</span>
<VolumeIcon size={18} strokeWidth={1.5} class="shrink-0 text-text-secondary" /> <VolumeIcon size={18} strokeWidth={1.5} class="shrink-0 text-text-secondary" />
+56 -4
View File
@@ -14,7 +14,8 @@ const state = vi.hoisted(() => ({
volume: 1, volume: 1,
shuffle: false, shuffle: false,
repeat: 'off' as 'off' | 'all' | 'one', repeat: 'off' as 'off' | 'all' | 'one',
error: null as string | null error: null as string | null,
queueDrawerOpen: false
})); }));
vi.mock('$lib/player/store.svelte', () => ({ vi.mock('$lib/player/store.svelte', () => ({
@@ -29,7 +30,8 @@ vi.mock('$lib/player/store.svelte', () => ({
get volume() { return state.volume; }, get volume() { return state.volume; },
get shuffle() { return state.shuffle; }, get shuffle() { return state.shuffle; },
get repeat() { return state.repeat; }, get repeat() { return state.repeat; },
get error() { return state.error; } get error() { return state.error; },
get queueDrawerOpen() { return state.queueDrawerOpen; }
}, },
togglePlay: vi.fn(), togglePlay: vi.fn(),
skipNext: vi.fn(), skipNext: vi.fn(),
@@ -38,7 +40,8 @@ vi.mock('$lib/player/store.svelte', () => ({
setVolume: vi.fn(), setVolume: vi.fn(),
toggleShuffle: vi.fn(), toggleShuffle: vi.fn(),
cycleRepeat: vi.fn(), cycleRepeat: vi.fn(),
playQueue: vi.fn() playQueue: vi.fn(),
toggleQueueDrawer: vi.fn()
})); }));
vi.mock('$lib/api/likes', () => ({ vi.mock('$lib/api/likes', () => ({
@@ -66,7 +69,8 @@ vi.mock('@tanstack/svelte-query', async (orig) => {
import PlayerBar from './PlayerBar.svelte'; import PlayerBar from './PlayerBar.svelte';
import { import {
togglePlay, skipNext, skipPrev, seekTo, setVolume, togglePlay, skipNext, skipPrev, seekTo, setVolume,
toggleShuffle, cycleRepeat, playQueue toggleShuffle, cycleRepeat, playQueue,
toggleQueueDrawer
} from '$lib/player/store.svelte'; } from '$lib/player/store.svelte';
function track(): TrackRef { function track(): TrackRef {
@@ -90,6 +94,7 @@ beforeEach(() => {
state.shuffle = false; state.shuffle = false;
state.repeat = 'off'; state.repeat = 'off';
state.error = null; state.error = null;
state.queueDrawerOpen = false;
}); });
afterEach(() => vi.clearAllMocks()); afterEach(() => vi.clearAllMocks());
@@ -188,4 +193,51 @@ describe('PlayerBar', () => {
screen.getByRole('button', { name: /track actions for/i }) screen.getByRole('button', { name: /track actions for/i })
).toBeInTheDocument(); ).toBeInTheDocument();
}); });
describe('queue toggle button', () => {
test('clicking the queue toggle calls toggleQueueDrawer', async () => {
render(PlayerBar);
const btn = screen.getByLabelText(/(open|close) queue/i);
await fireEvent.click(btn);
expect(toggleQueueDrawer).toHaveBeenCalled();
});
test('aria-pressed reflects queueDrawerOpen state', () => {
state.queueDrawerOpen = true;
render(PlayerBar);
const btn = screen.getByLabelText(/close queue/i);
expect(btn).toHaveAttribute('aria-pressed', 'true');
});
});
describe('"Up next" line', () => {
test('renders the next track title when index + 1 < queue.length', () => {
state.queue = [
{ id: 'a', title: 'Track A', artist_name: 'Art A' } as TrackRef,
{ id: 'b', title: 'Track B', artist_name: 'Art B' } as TrackRef
];
state.index = 0;
state.current = state.queue[0];
render(PlayerBar);
expect(screen.getByText(/track b/i)).toBeInTheDocument();
});
test('omits the line on the last track in queue', () => {
state.queue = [
{ id: 'a', title: 'Track A', artist_name: 'Art A' } as TrackRef
];
state.index = 0;
state.current = state.queue[0];
render(PlayerBar);
expect(screen.queryByText(/^Next ·/i)).not.toBeInTheDocument();
});
test('omits the line when queue is empty', () => {
state.queue = [];
state.current = null;
state.index = 0;
render(PlayerBar);
expect(screen.queryByText(/^Next ·/i)).not.toBeInTheDocument();
});
});
}); });