web-player/docs/frontend-refactor-plan.md

@@ -777,7 +777,7 @@ Tareas:
 | P2    | ✅     | (pendiente) | `<style>{expr}</style>` no interpola en Svelte (se trata como CSS del componente); solución: `{@html \`<style>${css}</style>\`}` |
 | P3    | ✅     | (pendiente) | Se quitó el nombre bajo el avatar de perfil (decisión tomada: redundante con el título de CollectionHeader). Se añadió `size="fill"` a Artwork (no está en la spec) para las tarjetas de grid fluidas (AlbumCard/PlaylistCard/MixTile), ya que P9 (MediaCard) aún no existe. SearchResultRow perdió su prop `kind`/radio-por-tipo (ahora el radio lo decide Artwork/Avatar). Sin QA visual autenticada (Docker no disponible) |
 | P4    | ✅     | (pendiente) | Decisión tomada sin bloquear: se elimina el botón "adelante" decorativo (TopBar) y el icono `AlignJustify` decorativo (PlayerExtras) por ser código muerto visual. `TransportControls` (shuffle/prev/next/repeat) se deja sin migrar a IconButton a propósito: son iconos sin chrome (sin fondo/hit-box), migrarlos habría añadido una píldora de hover no presente hoy — riesgo visual no verificable sin Docker |
-| P5    | ⬜     |        |                            |
+| P5    | 🟡     | (pendiente) | Hecho: pressable/clickOutside, toggle.svelte.ts, plural() (+minúsculas, Δ visible), helpers de player.svelte.ts (toQueueItem/isQueueCurrent/playAllOrToggle/playShuffled, addToQueue→playNextItem), navigation.svelte.ts (searchHref/appNavLinks — appNavLinks creado pero su migración a Sidebar/TabsBar se deja para P12 tal como indica esa parte), menus.svelte.ts (createTrackMenu, migrado en Inicio/Explorar/Mezcla). **Pendiente a propósito**: la tarea 5 (eliminar el envoltorio `TrackTarget` de tracks.ts y sus 8 accesores) se difiere — es el cambio de mayor riesgo del plan (toca tipos en Inicio/Explorar/Mezcla/menús de forma transversal) y no se pudo verificar visualmente sin Docker; abordarlo junto con P13 cuando se reescriban esas páginas |
 | P6    | ⬜     |        |                            |
 | P7    | ⬜     |        |                            |
 | P8    | ⬜     |        |                            |

web-player/src/lib/actions/clickOutside.ts

@@ -0,0 +1,17 @@
+import type { Action } from 'svelte/action';
+
+export const clickOutside: Action<HTMLElement, () => void> = (node, fn) => {
+	function onClick(event: MouseEvent) {
+		if (!node.contains(event.target as Node)) fn();
+	}
+	document.addEventListener('click', onClick, true);
+
+	return {
+		update(next) {
+			fn = next;
+		},
+		destroy() {
+			document.removeEventListener('click', onClick, true);
+		}
+	};
+};

web-player/src/lib/actions/pressable.ts

@@ -0,0 +1,25 @@
+import type { Action } from 'svelte/action';
+
+export const pressable: Action<HTMLElement, () => void> = (node, fn) => {
+	function onClick() {
+		fn();
+	}
+	function onKeydown(event: KeyboardEvent) {
+		if (event.key !== 'Enter' && event.key !== ' ') return;
+		event.preventDefault();
+		fn();
+	}
+
+	node.addEventListener('click', onClick);
+	node.addEventListener('keydown', onKeydown);
+
+	return {
+		update(next) {
+			fn = next;
+		},
+		destroy() {
+			node.removeEventListener('click', onClick);
+			node.removeEventListener('keydown', onKeydown);
+		}
+	};
+};

web-player/src/lib/components/TopBar.svelte

@@ -3,6 +3,7 @@
 	import { page } from '$app/state';
 	import type { SessionUser } from '$lib/types';
 	import { SEARCH_DEBOUNCE_MS, SEARCH_MIN_LENGTH } from '$lib/config';
+	import { searchHref } from '$lib/navigation.svelte';
 	import Search from '@lucide/svelte/icons/search';
 	import X from '@lucide/svelte/icons/x';
 	import ChevronLeft from '@lucide/svelte/icons/chevron-left';
@@ -24,13 +25,9 @@
 	let searchInput: HTMLInputElement | undefined = $state();
 	let searchTimeout: ReturnType<typeof setTimeout> | undefined;
 
-	function buildHref(term: string) {
-		return term ? `/explore?q=${encodeURIComponent(term)}` : '/explore';
-	}
-
 	function runSearch(term: string) {
 		if (term.length > 0 && term.length < SEARCH_MIN_LENGTH) return;
-		goto(buildHref(term), {
+		goto(searchHref(term), {
 			replaceState: page.url.pathname === '/explore',
 			keepFocus: true,
 			noScroll: true

web-player/src/lib/components/player/Queue.svelte

@@ -4,6 +4,7 @@
 	import Artwork from '$lib/components/ui/Artwork.svelte';
 	import ArtistLink from '$lib/components/ui/ArtistLink.svelte';
 	import IconButton from '$lib/components/ui/IconButton.svelte';
+	import { pressable } from '$lib/actions/pressable';
 	import { fmtTime } from '$lib/format';
 	import X from '@lucide/svelte/icons/x';
 	import { fly } from 'svelte/transition';
@@ -71,12 +72,7 @@
 				<div
 					role="button"
 					tabindex="0"
-					onclick={() => player.playQueueIndex(index)}
+					use:pressable={() => player.playQueueIndex(index)}
-					onkeydown={(e) => {
-						if (e.key !== 'Enter' && e.key !== ' ') return;
-						e.preventDefault();
-						player.playQueueIndex(index);
-					}}
 					class="flex items-center gap-3 rounded-control p-2.25 text-left hover:bg-hover"
 				>
 					<Artwork trackIds={[track.id]} size="sm" alt={track.title} class="shrink-0 opacity-80" />

web-player/src/lib/components/ui/AccountMenu.svelte

@@ -9,6 +9,7 @@
 	import MenuItem from './MenuItem.svelte';
 	import GlassMenu from './GlassMenu.svelte';
 	import { themeMode } from '$lib/theme/mode.svelte';
+	import { clickOutside } from '$lib/actions/clickOutside';
 
 	interface Props {
 		user: SessionUser;
@@ -27,7 +28,6 @@
 	}: Props = $props();
 
 	let open = $state(false);
-	let menuRef: HTMLDivElement | undefined = $state();
 
 	function toggle() {
 		open = !open;
@@ -36,13 +36,9 @@
 	function close() {
 		open = false;
 	}
-
-	function onDocumentClick(event: MouseEvent) {
-		if (menuRef && !menuRef.contains(event.target as Node)) open = false;
-	}
 </script>
 
-<div class="relative" bind:this={menuRef}>
+<div class="relative" use:clickOutside={close}>
 	{@render trigger({ toggle, open })}
 
 	{#if open}
@@ -69,5 +65,3 @@
 		</GlassMenu>
 	{/if}
 </div>
-
-<svelte:window onclick={onDocumentClick} />

web-player/src/lib/components/ui/AlbumCard.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import MediaCard from './MediaCard.svelte';
 	import Artwork from './Artwork.svelte';
+	import { plural } from '$lib/format';
 
 	interface Props {
 		id: string;
@@ -35,9 +36,7 @@
 			typeLabel,
 			subtitle,
 			releaseYear ? String(releaseYear) : undefined,
-			trackCount === undefined
+			trackCount === undefined ? undefined : plural(trackCount, 'canción', 'canciones')
-				? undefined
-				: `${trackCount} ${trackCount === 1 ? 'canción' : 'canciones'}`
 		]
 			.filter((part) => !!part)
 			.join(' · ')

web-player/src/lib/components/ui/PlaylistCard.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import MediaCard from './MediaCard.svelte';
 	import Artwork from './Artwork.svelte';
+	import { plural } from '$lib/format';
 
 	interface Props {
 		id: string;
@@ -13,7 +14,7 @@
 
 	let { id, name, trackCount, trackIds, updatedAt, index = 0 }: Props = $props();
 
-	const subtitle = $derived(`${trackCount} ${trackCount === 1 ? 'Canción' : 'Canciones'}`);
+	const subtitle = $derived(plural(trackCount, 'canción', 'canciones'));
 </script>
 
 <MediaCard href="/playlists/{id}" title={name} {subtitle} {index}>

web-player/src/lib/components/ui/TrackTitleCell.svelte

@@ -3,6 +3,7 @@
 	import Artwork from './Artwork.svelte';
 	import ExplicitBadge from './ExplicitBadge.svelte';
 	import ArtistLink from './ArtistLink.svelte';
+	import { pressable } from '$lib/actions/pressable';
 
 	interface Props {
 		trackId: string | number;
@@ -33,24 +34,14 @@
 		overlay,
 		badge
 	}: Props = $props();
-
-	function onKeydown(event: KeyboardEvent) {
-		if (event.key !== 'Enter' && event.key !== ' ') return;
-		event.preventDefault();
-		onClick();
-	}
-
-	function onclick(event: MouseEvent) {
-		event.stopPropagation();
-		onClick();
-	}
 </script>
 
+<!-- svelte-ignore a11y_click_events_have_key_events -->
 <div
 	role="button"
 	tabindex="0"
-	{onclick}
+	use:pressable={onClick}
-	onkeydown={onKeydown}
+	onclick={(event) => event.stopPropagation()}
 	class="flex min-w-0 items-center gap-3.5 text-left"
 >
 	<Artwork trackIds={[trackId]} src={coverSrc} {size} alt={title} class="shrink-0">

web-player/src/lib/format.ts

@@ -18,7 +18,11 @@ export function fmtDate(value: string | number | Date): string {
 	return dateFormatter.format(new Date(value));
 }
 
+export function plural(n: number, one: string, many: string): string {
+	return `${n} ${n === 1 ? one : many}`;
+}
+
 export function fmtPlays(count: number | string | undefined): string {
 	const value = Math.max(0, Math.floor(Number(count ?? 0)));
-	return `${value} ${value === 1 ? 'Reproducción' : 'Reproducciones'}`;
+	return plural(value, 'reproducción', 'reproducciones');
 }

web-player/src/lib/menus.svelte.ts

@@ -0,0 +1,27 @@
+import {
+	contextMenuStateFor,
+	type ContextMenuState
+} from '$lib/components/TrackContextMenu.svelte';
+import { player } from './player/player.svelte';
+import { queueItemForTarget, type TrackTarget } from './tracks';
+
+export function createTrackMenu() {
+	let state = $state<ContextMenuState | null>(null);
+
+	return {
+		get state() {
+			return state;
+		},
+		open(event: MouseEvent, target: TrackTarget) {
+			state = contextMenuStateFor(event, target);
+		},
+		close() {
+			state = null;
+		},
+		playNext() {
+			if (!state) return;
+			player.playNextItem(queueItemForTarget(state));
+			state = null;
+		}
+	};
+}

web-player/src/lib/navigation.svelte.ts

@@ -1,4 +1,13 @@
 import { afterNavigate } from '$app/navigation';
+import type { LucideIcon } from '@lucide/svelte';
+import Home from '@lucide/svelte/icons/house';
+import Compass from '@lucide/svelte/icons/compass';
+import ListMusic from '@lucide/svelte/icons/list-music';
+import Heart from '@lucide/svelte/icons/heart';
+import Disc from '@lucide/svelte/icons/disc-2';
+import Folder from '@lucide/svelte/icons/folder';
+import Upload from '@lucide/svelte/icons/upload';
+import type { SessionUser } from './types';
 
 const HISTORY_INDEX = 'sveltekit:history';
 
@@ -54,3 +63,39 @@ export function isSectionActive(href: string, pathname: string, section?: string
 	if (section !== undefined) return section === href;
 	return href === '/' ? pathname === '/' : pathname.startsWith(href);
 }
+
+export function searchHref(query: string): string {
+	return query ? `/explore?q=${encodeURIComponent(query)}` : '/explore';
+}
+
+export interface AppNavLink {
+	href: string;
+	label: string;
+	icon: LucideIcon;
+	count?: number;
+	primary: boolean;
+}
+
+export interface AppNavCounts {
+	playlists?: number;
+	liked?: number;
+}
+
+export function appNavLinks(user: SessionUser | null, counts: AppNavCounts = {}): AppNavLink[] {
+	if (!user) return [{ href: '/explore', label: 'Descubrir', icon: Compass, primary: true }];
+	return [
+		{ href: '/', label: 'Inicio', icon: Home, primary: true },
+		{ href: '/explore', label: 'Descubrir', icon: Compass, primary: true },
+		{
+			href: '/playlists',
+			label: 'Playlists',
+			icon: ListMusic,
+			count: counts.playlists,
+			primary: true
+		},
+		{ href: '/liked', label: 'Me gusta', icon: Heart, count: counts.liked, primary: true },
+		{ href: '/albums', label: 'Mis álbumes', icon: Disc, primary: false },
+		{ href: '/library', label: 'Canciones subidas', icon: Folder, primary: false },
+		{ href: '/upload', label: 'Subir música', icon: Upload, primary: false }
+	];
+}

web-player/src/lib/player/liked.svelte.ts

@@ -34,13 +34,10 @@ class LikedStore {
 		const items = toQueueItems(tracks);
 		const next: Record<string, LikedTrack> = {};
 		items.forEach((item, i) => {
-			next[String(item.id)] = {
+			const id = String(item.id);
-				id: String(item.id),
+			next[id] = {
-				title: item.title,
+				...item,
-				artist: item.artist,
+				id,
-				explicit: item.explicit,
-				ownerUserId: item.ownerUserId,
-				listensCount: item.listensCount,
 				duration: tracks[i].duration,
 				likedAt: new Date(tracks[i].createdAt).getTime()
 			};
@@ -58,17 +55,7 @@ class LikedStore {
 		const wasLiked = id in before;
 		const next = { ...before };
 		if (wasLiked) delete next[id];
-		else {
+		else next[id] = { ...track, id, likedAt: Date.now() };
-			next[id] = {
-				id,
-				title: track.title,
-				artist: track.artist,
-				explicit: track.explicit,
-				ownerUserId: track.ownerUserId,
-				duration: track.duration,
-				likedAt: Date.now()
-			};
-		}
 		this.entries = next;
 
 		try {

web-player/src/lib/player/player.svelte.ts

@@ -1,6 +1,7 @@
 import { browser } from '$app/environment';
 import { DEFAULT_ACCENT } from '$lib/theme/color';
 import { extractAccent, type Accent } from '$lib/theme/palette';
+import { shuffle } from '$lib/collections';
 
 export interface PlayerTrack {
 	id: string | number;
@@ -47,6 +48,25 @@ export function toQueueItems(tracks: ApiTrackLike[]): QueueItem[] {
 	}));
 }
 
+export function toQueueItem(track: ApiTrackLike): QueueItem {
+	return toQueueItems([track])[0];
+}
+
+export function isQueueCurrent(items: { id: string | number }[]): boolean {
+	return items.some((item) => item.id === player.current.id);
+}
+
+export function playAllOrToggle(items: QueueItem[]) {
+	if (items.length === 0) return;
+	if (isQueueCurrent(items)) player.toggle();
+	else player.playQueue(items, 0);
+}
+
+export function playShuffled(items: QueueItem[]) {
+	if (items.length === 0) return;
+	player.playQueue(shuffle(items), 0);
+}
+
 async function readErrorMessage(res: Response): Promise<string> {
 	try {
 		const body = (await res.json()) as { message?: string };
@@ -291,7 +311,7 @@ class PlayerState {
 		else this.playQueue(list, index);
 	}
 
-	addToQueue(item: QueueItem) {
+	playNextItem(item: QueueItem) {
 		this.playNext([item]);
 	}
 

web-player/src/lib/player/queuePanel.svelte.ts

@@ -1,16 +1,3 @@
-let open = $state(false);
+import { createToggle } from '../toggle.svelte';
 
-export const queuePanel = {
+export const queuePanel = createToggle();
-	get open() {
-		return open;
-	},
-	toggle() {
-		open = !open;
-	},
-	close() {
-		open = false;
-	},
-	show() {
-		open = true;
-	}
-};

web-player/src/lib/playlists.svelte.ts

@@ -1,13 +1,3 @@
-let open = $state(false);
+import { createToggle } from './toggle.svelte';
 
-export const createPlaylistModal = {
+export const createPlaylistModal = createToggle();
-	get open() {
-		return open;
-	},
-	show() {
-		open = true;
-	},
-	close() {
-		open = false;
-	}
-};

web-player/src/lib/recentlyPlayed.ts

@@ -12,28 +12,14 @@ export function mergeRecentlyPlayed(history: ApiTrackLike[], limit: number): Que
 		const id = String(t.id);
 		if (seen.has(id)) continue;
 		seen.add(id);
-		merged.push({
+		merged.push({ ...t, id });
-			id,
-			title: t.title,
-			artist: t.artist,
-			explicit: t.explicit,
-			ownerUserId: t.ownerUserId,
-			listensCount: t.listensCount
-		});
 	}
 
 	for (const item of toQueueItems(history)) {
 		const id = String(item.id);
 		if (seen.has(id)) continue;
 		seen.add(id);
-		merged.push({
+		merged.push({ ...item, id });
-			id,
-			title: item.title,
-			artist: item.artist,
-			explicit: item.explicit,
-			ownerUserId: item.ownerUserId,
-			listensCount: item.listensCount
-		});
 	}
 
 	return merged.slice(0, limit);

web-player/src/lib/toggle.svelte.ts

@@ -0,0 +1,18 @@
+export function createToggle(initial = false) {
+	let open = $state(initial);
+
+	return {
+		get open() {
+			return open;
+		},
+		show() {
+			open = true;
+		},
+		close() {
+			open = false;
+		},
+		toggle() {
+			open = !open;
+		}
+	};
+}

web-player/src/routes/(app)/albums/[id]/+page.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { player, toQueueItems } from '$lib/player/player.svelte';
+	import { player, toQueueItems, isQueueCurrent, playAllOrToggle } from '$lib/player/player.svelte';
 	import Page from '$lib/components/ui/Page.svelte';
 	import Modal from '$lib/components/ui/Modal.svelte';
 	import Alert from '$lib/components/ui/Alert.svelte';
@@ -19,12 +19,10 @@
 	let editing = $state(false);
 	let confirmingDelete = $state(false);
 
-	const isCurrentQueue = $derived(tracks.some((track) => track.id === player.current.id));
+	const isCurrentQueue = $derived(isQueueCurrent(tracks));
 
 	function playAll() {
-		if (tracks.length === 0) return;
+		playAllOrToggle(toQueueItems(tracks));
-		if (isCurrentQueue) player.toggle();
-		else player.playQueue(toQueueItems(tracks), 0);
 	}
 </script>
 

web-player/src/routes/(app)/albums/[id]/components/AlbumHeader.svelte

@@ -7,6 +7,7 @@
 	import BackLink from '$lib/components/ui/BackLink.svelte';
 	import Button from '$lib/components/ui/Button.svelte';
 	import CollectionHeader from '$lib/components/ui/CollectionHeader.svelte';
+	import { plural } from '$lib/format';
 
 	interface Props {
 		title: string;
@@ -35,10 +36,7 @@
 	}: Props = $props();
 
 	const meta = $derived(
-		[
+		[releaseYear ? String(releaseYear) : undefined, plural(trackIds.length, 'canción', 'canciones')]
-			releaseYear ? String(releaseYear) : undefined,
-			`${trackIds.length} ${trackIds.length === 1 ? 'canción' : 'canciones'}`
-		]
 			.filter((part) => part !== undefined)
 			.join(' · ')
 	);

web-player/src/routes/(app)/explore/+page.svelte

@@ -2,7 +2,7 @@
 	import Music from '@lucide/svelte/icons/music';
 	import { player } from '$lib/player/player.svelte';
 	import { fetchAlbumQueueItems } from '$lib/albums';
-	import { fmtTime, fmtPlays } from '$lib/format';
+	import { fmtTime, fmtPlays, plural } from '$lib/format';
 	import Page from '$lib/components/ui/Page.svelte';
 	import PageHeader from '$lib/components/ui/PageHeader.svelte';
 	import Alert from '$lib/components/ui/Alert.svelte';
@@ -15,10 +15,9 @@
 	import SearchResultRow from '$lib/components/ui/SearchResultRow.svelte';
 	import SectionHeading from '$lib/components/ui/SectionHeading.svelte';
 	import { EXPLORE_PAGE_SIZE } from '$lib/config';
-	import TrackContextMenu, {
+	import { searchHref } from '$lib/navigation.svelte';
-		contextMenuStateFor,
+	import { createTrackMenu } from '$lib/menus.svelte';
-		type ContextMenuState
+	import TrackContextMenu from '$lib/components/TrackContextMenu.svelte';
-	} from '$lib/components/TrackContextMenu.svelte';
 	import AlbumContextMenu, {
 		albumContextMenuStateFor,
 		type AlbumMenuState
@@ -73,7 +72,7 @@
 	type SearchFilter = (typeof SEARCH_FILTERS)[number];
 	const SEARCH_GROUP_PREVIEW = 4;
 
-	let contextMenu = $state<ContextMenuState | null>(null);
+	const trackMenu = createTrackMenu();
 	let albumMenu = $state<AlbumMenuState | null>(null);
 	let sfilter = $state<SearchFilter>('Todo');
 
@@ -85,7 +84,7 @@
 	let loadingMore = $state(false);
 
 	$effect(() => {
-		contextMenu = null;
+		trackMenu.close();
 		albumMenu = null;
 		sfilter = 'Todo';
 		localItems = data.tracks.items.map((item) => item.track);
@@ -170,10 +169,6 @@
 		return sfilter === 'Todo' ? list.slice(0, SEARCH_GROUP_PREVIEW) : list;
 	}
 
-	function buildHref(query: string) {
-		return query ? `/explore?q=${encodeURIComponent(query)}` : '/explore';
-	}
-
 	function playTopResult() {
 		if (topResult?.kind !== 'track') return;
 		player.playOrToggle([queueItemForTarget(topResult.target)], 0);
@@ -191,7 +186,7 @@
 	}
 
 	function openContextMenu(event: MouseEvent, target: TrackTarget) {
-		contextMenu = contextMenuStateFor(event, target);
+		trackMenu.open(event, target);
 	}
 
 	function openAlbumMenu(event: MouseEvent, albumId: string) {
@@ -212,12 +207,6 @@
 		player.appendToQueue(await fetchAlbumQueueItems(albumId));
 	}
 
-	function addToQueue() {
-		if (!contextMenu) return;
-		player.addToQueue(queueItemForTarget(contextMenu));
-		contextMenu = null;
-	}
-
 	async function loadMore() {
 		if (loadingMore) return;
 		loadingMore = true;
@@ -270,8 +259,7 @@
 				Resultados para «{data.query}»
 			</h1>
 			<p class="mt-1.75 text-sm text-fg-2">
-				{totalHits}
+				{plural(totalHits, 'coincidencia', 'coincidencias')} en canciones, álbumes, playlists y usuarios
-				{totalHits === 1 ? 'Coincidencia' : 'Coincidencias'} en canciones, álbumes, playlists y usuarios
 			</p>
 		</div>
 
@@ -377,7 +365,7 @@
 			<div class="mt-5.5 flex flex-wrap justify-center gap-2">
 				{#each genreTiles.slice(0, 4) as genre (genre.query)}
 					<a
-						href={buildHref(genre.query)}
+						href={searchHref(genre.query)}
 						class="rounded-full border border-line-strong px-3.5 py-2 text-xs text-fg-2 transition-colors hover:bg-hover hover:text-fg"
 					>
 						{genre.label}
@@ -392,7 +380,7 @@
 		<div class="mt-7 grid grid-cols-[repeat(auto-fill,minmax(268px,1fr))] gap-3.5">
 			{#each genreTiles as genre, i (genre.query)}
 				<a
-					href={buildHref(genre.query)}
+					href={searchHref(genre.query)}
 					class="animate-enter group relative flex h-28 flex-col gap-1 overflow-hidden rounded-2xl p-4.25 transition-[filter] hover:brightness-110"
 					style="animation-delay:{Math.min(i, 10) *
 						40}ms; background:linear-gradient(140deg, oklch(var(--mf-tile-l) var(--mf-tile-c) {genre.hue}), oklch(var(--mf-tile-shade-l) var(--mf-tile-shade-c) {genre.hue}))"
@@ -415,8 +403,7 @@
 							{#snippet actions()}
 								<div class="h-px flex-1 self-center bg-line"></div>
 								<span class="shrink-0 text-xs text-muted tabular-nums">
-									{searchCounts.Canciones}
+									{plural(searchCounts.Canciones, 'resultado', 'resultados')}
-									{searchCounts.Canciones === 1 ? 'Resultado' : 'Resultados'}
 								</span>
 							{/snippet}
 						</SectionHeading>
@@ -466,8 +453,7 @@
 						{#snippet actions()}
 							<div class="h-px flex-1 self-center bg-line"></div>
 							<span class="shrink-0 text-xs text-muted tabular-nums">
-								{searchCounts.Álbumes}
+								{plural(searchCounts.Álbumes, 'resultado', 'resultados')}
-								{searchCounts.Álbumes === 1 ? 'Resultado' : 'Resultados'}
 							</span>
 						{/snippet}
 					</SectionHeading>
@@ -496,8 +482,7 @@
 						{#snippet actions()}
 							<div class="h-px flex-1 self-center bg-line"></div>
 							<span class="shrink-0 text-xs text-muted tabular-nums">
-								{searchCounts.Usuarios}
+								{plural(searchCounts.Usuarios, 'resultado', 'resultados')}
-								{searchCounts.Usuarios === 1 ? 'Resultado' : 'Resultados'}
 							</span>
 						{/snippet}
 					</SectionHeading>
@@ -521,8 +506,7 @@
 						{#snippet actions()}
 							<div class="h-px flex-1 self-center bg-line"></div>
 							<span class="shrink-0 text-xs text-muted tabular-nums">
-								{searchCounts.Playlists}
+								{plural(searchCounts.Playlists, 'resultado', 'resultados')}
-								{searchCounts.Playlists === 1 ? 'Resultado' : 'Resultados'}
 							</span>
 						{/snippet}
 					</SectionHeading>
@@ -554,12 +538,12 @@
 	{/if}
 </Page>
 
-{#if contextMenu}
+{#if trackMenu.state}
 	<TrackContextMenu
-		menu={contextMenu}
+		menu={trackMenu.state}
 		playlists={data.playlists}
-		onClose={() => (contextMenu = null)}
+		onClose={() => trackMenu.close()}
-		onAddToQueue={addToQueue}
+		onAddToQueue={() => trackMenu.playNext()}
 	/>
 {/if}
 

web-player/src/routes/(app)/liked/+page.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import Heart from '@lucide/svelte/icons/heart';
 	import X from '@lucide/svelte/icons/x';
-	import { player, type QueueItem } from '$lib/player/player.svelte';
+	import { player, isQueueCurrent, playAllOrToggle } from '$lib/player/player.svelte';
 	import { liked } from '$lib/player/liked.svelte';
 	import { fmtDate, fmtTime } from '$lib/format';
 	import Page from '$lib/components/ui/Page.svelte';
@@ -16,24 +16,14 @@
 	import TrackTitleCell from '$lib/components/ui/TrackTitleCell.svelte';
 
 	const tracks = $derived(liked.list);
-	const queueItems = $derived<QueueItem[]>(
+	const isCurrentQueue = $derived(isQueueCurrent(tracks));
-		tracks.map((t) => ({
-			id: t.id,
-			title: t.title,
-			artist: t.artist,
-			explicit: t.explicit
-		}))
-	);
-	const isCurrentQueue = $derived(tracks.some((t) => t.id === player.current.id));
 
 	function playFrom(index: number) {
-		player.playOrToggle(queueItems, index);
+		player.playOrToggle(tracks, index);
 	}
 
 	function playAll() {
-		if (queueItems.length === 0) return;
+		playAllOrToggle(tracks);
-		if (isCurrentQueue) player.toggle();
-		else player.playQueue(queueItems, 0);
 	}
 </script>
 

web-player/src/routes/(app)/mixes/[id]/+page.svelte

@@ -2,9 +2,8 @@
 	import Play from '@lucide/svelte/icons/play';
 	import Pause from '@lucide/svelte/icons/pause';
 	import Shuffle from '@lucide/svelte/icons/shuffle';
-	import { player } from '$lib/player/player.svelte';
+	import { player, isQueueCurrent, playAllOrToggle, playShuffled } from '$lib/player/player.svelte';
 	import { fmtTime } from '$lib/format';
-	import { shuffle } from '$lib/collections';
 	import Page from '$lib/components/ui/Page.svelte';
 	import BackLink from '$lib/components/ui/BackLink.svelte';
 	import Button from '$lib/components/ui/Button.svelte';
@@ -16,10 +15,8 @@
 	import TrackMeta from '$lib/components/ui/TrackMeta.svelte';
 	import TrackIndexCell from '$lib/components/ui/TrackIndexCell.svelte';
 	import TrackTitleCell from '$lib/components/ui/TrackTitleCell.svelte';
-	import TrackContextMenu, {
+	import TrackContextMenu from '$lib/components/TrackContextMenu.svelte';
-		contextMenuStateFor,
+	import { createTrackMenu } from '$lib/menus.svelte';
-		type ContextMenuState
-	} from '$lib/components/TrackContextMenu.svelte';
 	import { mixItemKey, mixItemTarget } from '$lib/mixes';
 	import {
 		isTargetCurrent,
@@ -40,24 +37,13 @@
 	const totalSeconds = $derived(
 		items.reduce((total, item) => total + Number(item.durationSeconds), 0)
 	);
-	const isCurrentQueue = $derived(targets.some(isTargetCurrent));
+	const isCurrentQueue = $derived(isQueueCurrent(queue));
 
-	let contextMenu = $state<ContextMenuState | null>(null);
+	const trackMenu = createTrackMenu();
 
 	function playFrom(index: number) {
 		player.playOrToggle(queue, index);
 	}
-
-	function playAll() {
-		if (queue.length === 0) return;
-		if (isCurrentQueue) player.toggle();
-		else player.playQueue(queue, 0);
-	}
-
-	function playShuffled() {
-		if (queue.length === 0) return;
-		player.playQueue(shuffle(queue), 0);
-	}
 </script>
 
 <svelte:head>
@@ -83,7 +69,7 @@
 			/>
 		{/snippet}
 		{#snippet actions()}
-			<Button size="sm" onclick={playAll} disabled={queue.length === 0}>
+			<Button size="sm" onclick={() => playAllOrToggle(queue)} disabled={queue.length === 0}>
 				{#if isCurrentQueue && player.playing}
 					<Pause class="h-4 w-4" strokeWidth={1.5} />
 					Pausar
@@ -92,7 +78,12 @@
 					Reproducir
 				{/if}
 			</Button>
-			<Button variant="secondary" size="sm" onclick={playShuffled} disabled={queue.length === 0}>
+			<Button
+				variant="secondary"
+				size="sm"
+				onclick={() => playShuffled(queue)}
+				disabled={queue.length === 0}
+			>
 				<Shuffle class="h-4 w-4" />
 				Aleatorio
 			</Button>
@@ -106,7 +97,7 @@
 	<TrackTable index meta={[{ label: 'Escuchas', width: '100px' }]} class="mt-6 sm:mt-8">
 		{#each items as item, i (mixItemKey(item))}
 			{@const active = isTargetCurrent(targets[i])}
-			<TrackRow {active} oncontextmenu={(e) => (contextMenu = contextMenuStateFor(e, targets[i]))}>
+			<TrackRow {active} oncontextmenu={(e) => trackMenu.open(e, targets[i])}>
 				<TrackIndexCell index={i} {active} playing={player.playing} onToggle={() => playFrom(i)} />
 				<TrackTitleCell
 					trackId={targetId(targets[i])}
@@ -122,18 +113,11 @@
 	</TrackTable>
 </Page>
 
-{#if contextMenu}
+{#if trackMenu.state}
 	<TrackContextMenu
-		menu={contextMenu}
+		menu={trackMenu.state}
 		playlists={data.playlists}
-		onClose={() => (contextMenu = null)}
+		onClose={() => trackMenu.close()}
-		onAddToQueue={() => {
+		onAddToQueue={() => trackMenu.playNext()}
-			const menu = contextMenu;
-			if (menu) {
-				const index = targets.findIndex((target) => targetId(target) === targetId(menu));
-				if (index >= 0) player.addToQueue(queue[index]);
-			}
-			contextMenu = null;
-		}}
 	/>
 {/if}

web-player/src/routes/(app)/playlists/[id]/+page.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import ListMusic from '@lucide/svelte/icons/list-music';
-	import { player, toQueueItems } from '$lib/player/player.svelte';
+	import { player, toQueueItems, isQueueCurrent, playAllOrToggle } from '$lib/player/player.svelte';
 	import Page from '$lib/components/ui/Page.svelte';
 	import Modal from '$lib/components/ui/Modal.svelte';
 	import PlaylistForm from '$lib/components/ui/PlaylistForm.svelte';
@@ -17,12 +17,10 @@
 	let editing = $state(false);
 	let confirmingDelete = $state(false);
 
-	const isCurrentQueue = $derived(tracks.some((t) => t.id === player.current.id));
+	const isCurrentQueue = $derived(isQueueCurrent(tracks));
 
 	function playAll() {
-		if (tracks.length === 0) return;
+		playAllOrToggle(toQueueItems(tracks));
-		if (isCurrentQueue) player.toggle();
-		else player.playQueue(toQueueItems(tracks), 0);
 	}
 </script>
 

web-player/src/routes/+page.svelte

@@ -3,9 +3,9 @@
 	import History from '@lucide/svelte/icons/history';
 	import Shuffle from '@lucide/svelte/icons/shuffle';
 	import ListMusic from '@lucide/svelte/icons/list-music';
-	import { player } from '$lib/player/player.svelte';
+	import { player, isQueueCurrent, playAllOrToggle, playShuffled } from '$lib/player/player.svelte';
+	import { pressable } from '$lib/actions/pressable';
 	import { mergeRecentlyPlayed } from '$lib/recentlyPlayed';
-	import { shuffle as shuffleList } from '$lib/collections';
 	import { fmtTime, fmtDurationLong, fmtPlays } from '$lib/format';
 	import {
 		isTargetCurrent,
@@ -27,15 +27,13 @@
 	import SectionHeading from '$lib/components/ui/SectionHeading.svelte';
 	import EmptyState from '$lib/components/ui/EmptyState.svelte';
 	import Button from '$lib/components/ui/Button.svelte';
-	import TrackContextMenu, {
+	import TrackContextMenu from '$lib/components/TrackContextMenu.svelte';
-		contextMenuStateFor,
+	import { createTrackMenu } from '$lib/menus.svelte';
-		type ContextMenuState
-	} from '$lib/components/TrackContextMenu.svelte';
 	import { HOME_CONTINUE_LIMIT, HOME_POPULAR_MAX } from '$lib/config';
 
 	let { data } = $props();
 
-	let contextMenu = $state<ContextMenuState | null>(null);
+	const trackMenu = createTrackMenu();
 
 	type SpotlightRow = { target: TrackTarget; seconds: number };
 	let spotlightRows = $state<SpotlightRow[]>([]);
@@ -87,9 +85,7 @@
 	);
 
 	const spotlightQueue = $derived(spotlightItems.map(queueItemForTarget));
-	const spotlightIsCurrent = $derived(
+	const spotlightIsCurrent = $derived(isQueueCurrent(spotlightQueue));
-		spotlightQueue.length > 0 && spotlightQueue.some((item) => item.id === player.current.id)
-	);
 	const heroPlaying = $derived(spotlightIsCurrent && player.playing);
 
 	function playContinue(index: number) {
@@ -102,28 +98,14 @@
 		player.playOrToggle(spotlightQueue, index);
 	}
 	function playSpotlight() {
-		if (spotlightQueue.length === 0) return;
+		playAllOrToggle(spotlightQueue);
-		if (spotlightIsCurrent) player.toggle();
-		else player.playQueue(spotlightQueue, 0);
 	}
 	function shuffleSpotlight() {
-		if (spotlightQueue.length === 0) return;
+		playShuffled(spotlightQueue);
-		player.playQueue(shuffleList(spotlightQueue), 0);
-	}
-
-	function onRowKeydown(event: KeyboardEvent, action: () => void) {
-		if (event.key !== 'Enter' && event.key !== ' ') return;
-		event.preventDefault();
-		action();
 	}
 
 	function openContextMenu(event: MouseEvent, target: TrackTarget) {
-		contextMenu = contextMenuStateFor(event, target);
+		trackMenu.open(event, target);
-	}
-	function addToQueue() {
-		if (!contextMenu) return;
-		player.addToQueue(queueItemForTarget(contextMenu));
-		contextMenu = null;
 	}
 </script>
 
@@ -196,12 +178,11 @@
 					<div
 						role="button"
 						tabindex="0"
+						use:pressable={() => playContinue(i)}
 						class="animate-enter rounded-art p-2.25 pr-3.5 transition-colors {isCurrent
 							? 'bg-accent-tint'
 							: 'hover:bg-hover'}"
-						style="animation-delay:{Math.min(i, 10) * 40}ms"
+						style="--i:{i}"
-						onclick={() => playContinue(i)}
-						onkeydown={(e) => onRowKeydown(e, () => playContinue(i))}
 						oncontextmenu={(e) => openContextMenu(e, targetForQueueItem(item))}
 					>
 						<TrackTitleCell
@@ -240,9 +221,8 @@
 					<div
 						role="button"
 						tabindex="0"
+						use:pressable={() => goto(`/playlists/${spotlight.id}`)}
 						class="flex w-fit items-center gap-5 self-start sm:gap-6"
-						onclick={() => goto(`/playlists/${spotlight.id}`)}
-						onkeydown={(e) => onRowKeydown(e, () => goto(`/playlists/${spotlight.id}`))}
 					>
 						<Artwork
 							src="/api/playlists/{spotlight.id}/cover?size=large&v={encodeURIComponent(
@@ -276,12 +256,7 @@
 						<div
 							role="button"
 							tabindex="0"
-							onclick={() => playSpotlightTrack(i)}
+							use:pressable={() => playSpotlightTrack(i)}
-							onkeydown={(e) => {
-								if (e.key !== 'Enter' && e.key !== ' ') return;
-								e.preventDefault();
-								playSpotlightTrack(i);
-							}}
 							class="flex items-center gap-4 rounded-control p-2 text-left transition-colors {isTargetCurrent(
 								target
 							)
@@ -341,11 +316,10 @@
 					<div
 						role="button"
 						tabindex="0"
+						use:pressable={() => playPopular(i)}
 						class="flex items-center gap-3.5 rounded-control p-2 transition-colors {isCurrent
 							? 'bg-accent-tint'
 							: 'hover:bg-hover'}"
-						onclick={() => playPopular(i)}
-						onkeydown={(e) => onRowKeydown(e, () => playPopular(i))}
 						oncontextmenu={(e) => openContextMenu(e, target)}
 					>
 						<span class="flex h-3.5 w-4.5 shrink-0 items-end justify-center">
@@ -405,10 +379,9 @@
 					<div
 						role="button"
 						tabindex="0"
+						use:pressable={() => goto(`/playlists/${playlist.id}`)}
 						class="group/card animate-enter flex items-center gap-3.5 rounded-panel p-3 transition-colors hover:bg-hover"
 						style="--i:{i}"
-						onclick={() => goto(`/playlists/${playlist.id}`)}
-						onkeydown={(e) => onRowKeydown(e, () => goto(`/playlists/${playlist.id}`))}
 					>
 						<Artwork
 							src="/api/playlists/{playlist.id}/cover?size=medium&v={encodeURIComponent(
@@ -449,11 +422,11 @@
 	</section>
 </div>
 
-{#if contextMenu}
+{#if trackMenu.state}
 	<TrackContextMenu
-		menu={contextMenu}
+		menu={trackMenu.state}
 		{playlists}
-		onClose={() => (contextMenu = null)}
+		onClose={() => trackMenu.close()}
-		onAddToQueue={addToQueue}
+		onAddToQueue={() => trackMenu.playNext()}
 	/>
 {/if}