feat(web/m7-377): ArtistMenu component with like/queue/playlist actions
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,121 @@
|
||||
<script lang="ts">
|
||||
import { MoreVertical, Heart, HeartOff, ListMusic, Plus } from 'lucide-svelte';
|
||||
import { useQueryClient } from '@tanstack/svelte-query';
|
||||
import { createLikedIdsQuery, likeEntity, unlikeEntity } from '$lib/api/likes';
|
||||
import { listArtistTracks } from '$lib/api/artists';
|
||||
import { enqueueTracks } from '$lib/player/store.svelte';
|
||||
import AddToPlaylistMenu from './AddToPlaylistMenu.svelte';
|
||||
import TrackMenuItem from './TrackMenuItem.svelte';
|
||||
import TrackMenuDivider from './TrackMenuDivider.svelte';
|
||||
import type { TrackRef } from '$lib/api/types';
|
||||
|
||||
let {
|
||||
artistId,
|
||||
artistName,
|
||||
tracks,
|
||||
direction = 'down'
|
||||
}: {
|
||||
artistId: string;
|
||||
artistName: string;
|
||||
/** Pre-loaded tracks; menu fetches lazily on action click when omitted. */
|
||||
tracks?: TrackRef[];
|
||||
/** Open above the trigger when used near the bottom of the viewport. */
|
||||
direction?: 'up' | 'down';
|
||||
} = $props();
|
||||
|
||||
let menuOpen = $state(false);
|
||||
let addOpen = $state(false);
|
||||
let cachedTracks: TrackRef[] | null = $state(tracks ?? null);
|
||||
|
||||
const queryClient = useQueryClient();
|
||||
const likedQ = $derived(createLikedIdsQuery());
|
||||
const liked = $derived.by(() => {
|
||||
const data = $likedQ?.data;
|
||||
if (!data) return false;
|
||||
return data.artist_ids.includes(artistId);
|
||||
});
|
||||
|
||||
function toggleMenu(e: MouseEvent) {
|
||||
e.stopPropagation();
|
||||
menuOpen = !menuOpen;
|
||||
}
|
||||
|
||||
function closeAll() {
|
||||
menuOpen = false;
|
||||
addOpen = false;
|
||||
}
|
||||
|
||||
async function ensureTracks(): Promise<TrackRef[]> {
|
||||
if (cachedTracks) return cachedTracks;
|
||||
const fetched = await listArtistTracks(artistId);
|
||||
cachedTracks = fetched;
|
||||
return fetched;
|
||||
}
|
||||
|
||||
async function onAddAllToQueue() {
|
||||
const ts = await ensureTracks();
|
||||
enqueueTracks(ts);
|
||||
closeAll();
|
||||
}
|
||||
|
||||
async function onOpenAddToPlaylist() {
|
||||
await ensureTracks();
|
||||
menuOpen = false;
|
||||
addOpen = true;
|
||||
}
|
||||
|
||||
async function onToggleLike() {
|
||||
closeAll();
|
||||
if (liked) {
|
||||
await unlikeEntity(queryClient, 'artist', artistId);
|
||||
} else {
|
||||
await likeEntity(queryClient, 'artist', artistId);
|
||||
}
|
||||
}
|
||||
|
||||
function onKeydown(e: KeyboardEvent) {
|
||||
if (!menuOpen && !addOpen) return;
|
||||
if (e.key === 'Escape') {
|
||||
e.preventDefault();
|
||||
closeAll();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:window onclick={() => { menuOpen = false; addOpen = false; }} onkeydown={onKeydown} />
|
||||
|
||||
<div class="relative inline-block">
|
||||
<button
|
||||
type="button"
|
||||
aria-label={`Artist actions for ${artistName}`}
|
||||
aria-haspopup="menu"
|
||||
aria-expanded={menuOpen}
|
||||
onclick={toggleMenu}
|
||||
class="rounded p-1 text-text-muted hover:text-text-primary"
|
||||
>
|
||||
<MoreVertical size={16} strokeWidth={1} />
|
||||
</button>
|
||||
|
||||
{#if menuOpen}
|
||||
<div
|
||||
role="menu"
|
||||
tabindex="-1"
|
||||
class="absolute right-0 z-20 w-56 rounded-md border border-border bg-surface p-1 shadow-lg
|
||||
{direction === 'up' ? 'bottom-full mb-1' : 'top-full mt-1'}"
|
||||
onclick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<TrackMenuItem
|
||||
icon={liked ? HeartOff : Heart}
|
||||
label={liked ? 'Unlike artist' : 'Like artist'}
|
||||
onclick={onToggleLike}
|
||||
/>
|
||||
<TrackMenuDivider />
|
||||
<TrackMenuItem icon={Plus} label="Add all to queue" onclick={onAddAllToQueue} />
|
||||
<TrackMenuItem icon={ListMusic} label="Add all to playlist…" onclick={onOpenAddToPlaylist} />
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if addOpen && cachedTracks}
|
||||
<AddToPlaylistMenu tracks={cachedTracks} onClose={closeAll} />
|
||||
{/if}
|
||||
</div>
|
||||
@@ -0,0 +1,90 @@
|
||||
import { afterEach, describe, expect, test, vi } from 'vitest';
|
||||
import { render, screen, fireEvent, waitFor } from '@testing-library/svelte';
|
||||
import { readable } from 'svelte/store';
|
||||
import type { TrackRef } from '$lib/api/types';
|
||||
|
||||
vi.mock('$app/navigation', () => ({ goto: vi.fn() }));
|
||||
|
||||
vi.mock('$lib/api/likes', () => ({
|
||||
createLikedIdsQuery: () =>
|
||||
readable({ data: { track_ids: [], album_ids: [], artist_ids: [] }, isPending: false, isError: false }),
|
||||
likeEntity: vi.fn().mockResolvedValue(undefined),
|
||||
unlikeEntity: vi.fn().mockResolvedValue(undefined)
|
||||
}));
|
||||
|
||||
vi.mock('$lib/api/artists', () => ({
|
||||
listArtistTracks: vi.fn().mockResolvedValue([])
|
||||
}));
|
||||
|
||||
vi.mock('$lib/api/playlists', () => ({
|
||||
createPlaylistsQuery: () =>
|
||||
readable({ data: { owned: [], public: [] }, isPending: false, isError: false }),
|
||||
appendTracks: vi.fn().mockResolvedValue({ id: 'p1', tracks: [] }),
|
||||
createPlaylist: vi.fn().mockResolvedValue({ id: 'p1', name: 'New' })
|
||||
}));
|
||||
|
||||
vi.mock('$lib/player/store.svelte', () => ({
|
||||
enqueueTracks: vi.fn()
|
||||
}));
|
||||
|
||||
vi.mock('@tanstack/svelte-query', async (orig) => {
|
||||
const actual = (await orig()) as Record<string, unknown>;
|
||||
return { ...actual, useQueryClient: () => ({ invalidateQueries: vi.fn() }) };
|
||||
});
|
||||
|
||||
import ArtistMenu from './ArtistMenu.svelte';
|
||||
import { enqueueTracks } from '$lib/player/store.svelte';
|
||||
import { listArtistTracks } from '$lib/api/artists';
|
||||
import { likeEntity, unlikeEntity } from '$lib/api/likes';
|
||||
|
||||
const TRACKS: TrackRef[] = [
|
||||
{ id: 't1', title: 'A', album_id: 'al1', album_title: 'X', artist_id: 'a1', artist_name: 'Test', duration_sec: 100, stream_url: '/s/t1' },
|
||||
{ id: 't2', title: 'B', album_id: 'al1', album_title: 'X', artist_id: 'a1', artist_name: 'Test', duration_sec: 100, stream_url: '/s/t2' }
|
||||
];
|
||||
|
||||
afterEach(() => {
|
||||
vi.clearAllMocks();
|
||||
});
|
||||
|
||||
describe('ArtistMenu', () => {
|
||||
test('kebab opens menu with action items', async () => {
|
||||
render(ArtistMenu, { props: { artistId: 'a1', artistName: 'Test', tracks: TRACKS } });
|
||||
const kebab = screen.getByRole('button', { name: /artist actions for test/i });
|
||||
await fireEvent.click(kebab);
|
||||
expect(await screen.findByText(/Like artist/i)).toBeInTheDocument();
|
||||
expect(screen.getByText(/Add all to queue/i)).toBeInTheDocument();
|
||||
expect(screen.getByText(/Add all to playlist/i)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
test('Add all to queue uses cached tracks when provided', async () => {
|
||||
render(ArtistMenu, { props: { artistId: 'a1', artistName: 'Test', tracks: TRACKS } });
|
||||
await fireEvent.click(screen.getByRole('button', { name: /artist actions for test/i }));
|
||||
await fireEvent.click(screen.getByText(/Add all to queue/i));
|
||||
expect(enqueueTracks).toHaveBeenCalledWith(TRACKS);
|
||||
expect(listArtistTracks).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test('Add all to queue lazily fetches when no cached tracks', async () => {
|
||||
(listArtistTracks as unknown as ReturnType<typeof vi.fn>).mockResolvedValueOnce(TRACKS);
|
||||
render(ArtistMenu, { props: { artistId: 'a1', artistName: 'Test' } });
|
||||
await fireEvent.click(screen.getByRole('button', { name: /artist actions for test/i }));
|
||||
await fireEvent.click(screen.getByText(/Add all to queue/i));
|
||||
await waitFor(() => expect(enqueueTracks).toHaveBeenCalledWith(TRACKS));
|
||||
expect(listArtistTracks).toHaveBeenCalledWith('a1');
|
||||
});
|
||||
|
||||
test('Like item calls likeEntity', async () => {
|
||||
render(ArtistMenu, { props: { artistId: 'a1', artistName: 'Test', tracks: TRACKS } });
|
||||
await fireEvent.click(screen.getByRole('button', { name: /artist actions for test/i }));
|
||||
await fireEvent.click(screen.getByText(/Like artist/i));
|
||||
expect(likeEntity).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test('Escape key closes the menu', async () => {
|
||||
render(ArtistMenu, { props: { artistId: 'a1', artistName: 'Test', tracks: TRACKS } });
|
||||
await fireEvent.click(screen.getByRole('button', { name: /artist actions for test/i }));
|
||||
expect(screen.getByRole('menu')).toBeInTheDocument();
|
||||
await fireEvent.keyDown(window, { key: 'Escape' });
|
||||
expect(screen.queryByRole('menu')).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user