From 1cad36b9297e290011253d89f74ce710c676a09c Mon Sep 17 00:00:00 2001
From: XShine555 <xshine555@gmail.com>
Date: Thu, 24 Sep 2026 11:51:14 +0200
Subject: [PATCH] web-player: extract menu, paged list and play-all components
 from pages

---
 .../components/ui/media/PlayAllButton.svelte  |  35 +++++
 .../ui/overlay/AlbumContextMenu.svelte        |  46 ++++++
 .../ui/overlay/TrackContextMenu.svelte        |  36 +++++
 .../ui/primitives/InfiniteScroll.svelte       |  17 ++-
 web-player/src/lib/state/menu.svelte.ts       |  22 +++
 web-player/src/lib/state/menus.svelte.ts      |  27 ----
 web-player/src/lib/state/pagedList.svelte.ts  |  50 ++++++
 .../src/routes/(app)/albums/[id]/+page.svelte |  16 +-
 .../src/routes/(app)/explore/+page.svelte     | 142 +++++-------------
 .../src/routes/(app)/liked/+page.svelte       |  11 +-
 .../src/routes/(app)/mixes/[id]/+page.svelte  |  40 ++---
 .../routes/(app)/playlists/[id]/+page.svelte  |  16 +-
 .../user/[id]/[list=followList]/+page.svelte  |  50 +++---
 web-player/src/routes/+page.svelte            |  95 ++++--------
 14 files changed, 306 insertions(+), 297 deletions(-)
 create mode 100644 web-player/src/lib/components/ui/media/PlayAllButton.svelte
 create mode 100644 web-player/src/lib/components/ui/overlay/AlbumContextMenu.svelte
 create mode 100644 web-player/src/lib/components/ui/overlay/TrackContextMenu.svelte
 create mode 100644 web-player/src/lib/state/menu.svelte.ts
 delete mode 100644 web-player/src/lib/state/menus.svelte.ts
 create mode 100644 web-player/src/lib/state/pagedList.svelte.ts

diff --git a/web-player/src/lib/components/ui/media/PlayAllButton.svelte b/web-player/src/lib/components/ui/media/PlayAllButton.svelte
new file mode 100644
index 0000000..846f243
--- /dev/null
+++ b/web-player/src/lib/components/ui/media/PlayAllButton.svelte
@@ -0,0 +1,35 @@
+<script lang="ts">
+	import { player } from '$lib/player/player.svelte';
+	import { isQueueCurrent, playAllOrToggle } from '$lib/player/actions';
+	import type { Track } from '$lib/types';
+	import Button from '../primitives/Button.svelte';
+
+	interface Props {
+		items: Track[];
+		load?: () => Promise<Track[]>;
+		variant?: 'primary' | 'secondary' | 'accent';
+		size?: 'sm' | 'md' | 'lg';
+		idleLabel?: string;
+		activeLabel?: string;
+	}
+
+	let {
+		items,
+		load,
+		variant = 'primary',
+		size = 'sm',
+		idleLabel = 'Reproducir',
+		activeLabel = 'Pausar'
+	}: Props = $props();
+
+	const active = $derived(isQueueCurrent(items) && player.playing);
+
+	async function play() {
+		if (load && !isQueueCurrent(items)) playAllOrToggle(await load());
+		else playAllOrToggle(items);
+	}
+</script>
+
+<Button {variant} {size} onclick={play} disabled={items.length === 0 && !load}>
+	{active ? activeLabel : idleLabel}
+</Button>
diff --git a/web-player/src/lib/components/ui/overlay/AlbumContextMenu.svelte b/web-player/src/lib/components/ui/overlay/AlbumContextMenu.svelte
new file mode 100644
index 0000000..12b044c
--- /dev/null
+++ b/web-player/src/lib/components/ui/overlay/AlbumContextMenu.svelte
@@ -0,0 +1,46 @@
+<script lang="ts">
+	import ListEnd from '@lucide/svelte/icons/list-end';
+	import ListPlus from '@lucide/svelte/icons/list-plus';
+	import { player } from '$lib/player/player.svelte';
+	import { fetchAlbumTracks } from '$lib/data/albums';
+	import type { Menu } from '$lib/state/menu.svelte';
+	import type { Playlist } from '$lib/types';
+	import ContextMenu from './ContextMenu.svelte';
+
+	interface Props {
+		menu: Menu<string>;
+		playlists: Playlist[];
+	}
+
+	let { menu, playlists }: Props = $props();
+
+	async function playNext(albumId: string) {
+		menu.close();
+		player.playNext(await fetchAlbumTracks(albumId));
+	}
+
+	async function addToQueue(albumId: string) {
+		menu.close();
+		player.appendToQueue(await fetchAlbumTracks(albumId));
+	}
+</script>
+
+{#if menu.state}
+	{@const { target: albumId, x, y, openLeft } = menu.state}
+	<ContextMenu
+		{x}
+		{y}
+		{openLeft}
+		onClose={() => menu.close()}
+		items={[
+			{ icon: ListPlus, label: 'Reproducir a continuación', onclick: () => playNext(albumId) },
+			{ icon: ListEnd, label: 'Añadir a la cola', onclick: () => addToQueue(albumId) }
+		]}
+		playlistAction={{
+			action: '?/addAlbumToPlaylist',
+			fields: { albumId },
+			label: 'Añadir álbum a una playlist'
+		}}
+		{playlists}
+	/>
+{/if}
diff --git a/web-player/src/lib/components/ui/overlay/TrackContextMenu.svelte b/web-player/src/lib/components/ui/overlay/TrackContextMenu.svelte
new file mode 100644
index 0000000..4e4bcb1
--- /dev/null
+++ b/web-player/src/lib/components/ui/overlay/TrackContextMenu.svelte
@@ -0,0 +1,36 @@
+<script lang="ts">
+	import ListPlus from '@lucide/svelte/icons/list-plus';
+	import { player } from '$lib/player/player.svelte';
+	import type { Menu } from '$lib/state/menu.svelte';
+	import type { Playlist, Track } from '$lib/types';
+	import ContextMenu from './ContextMenu.svelte';
+
+	interface Props {
+		menu: Menu<Track>;
+		playlists: Playlist[];
+	}
+
+	let { menu, playlists }: Props = $props();
+
+	function playNext(track: Track) {
+		player.playNext([track]);
+		menu.close();
+	}
+</script>
+
+{#if menu.state}
+	{@const { target: track, x, y, openLeft } = menu.state}
+	<ContextMenu
+		{x}
+		{y}
+		{openLeft}
+		onClose={() => menu.close()}
+		items={[{ icon: ListPlus, label: 'Reproducir a continuación', onclick: () => playNext(track) }]}
+		playlistAction={{
+			action: '?/addTrack',
+			fields: { trackId: track.id },
+			label: 'Añadir a una playlist'
+		}}
+		{playlists}
+	/>
+{/if}
diff --git a/web-player/src/lib/components/ui/primitives/InfiniteScroll.svelte b/web-player/src/lib/components/ui/primitives/InfiniteScroll.svelte
index e4e0cb8..7074c58 100644
--- a/web-player/src/lib/components/ui/primitives/InfiniteScroll.svelte
+++ b/web-player/src/lib/components/ui/primitives/InfiniteScroll.svelte
@@ -1,15 +1,23 @@
 <script lang="ts">
 	import LoaderCircle from '@lucide/svelte/icons/loader-circle';
+	import Button from './Button.svelte';
 	import { INFINITE_SCROLL_ROOT_MARGIN } from '$lib/config';
 
 	interface Props {
 		onLoadMore: () => void;
 		hasMore: boolean;
 		loading: boolean;
+		error?: boolean;
 		rootMargin?: string;
 	}
 
-	let { onLoadMore, hasMore, loading, rootMargin = INFINITE_SCROLL_ROOT_MARGIN }: Props = $props();
+	let {
+		onLoadMore,
+		hasMore,
+		loading,
+		error = false,
+		rootMargin = INFINITE_SCROLL_ROOT_MARGIN
+	}: Props = $props();
 
 	let sentinel = $state<HTMLDivElement>();
 	let visible = $state(false);
@@ -28,12 +36,17 @@
 	});
 
 	$effect(() => {
-		if (visible && hasMore && !loading) onLoadMore();
+		if (visible && hasMore && !loading && !error) onLoadMore();
 	});
 </script>
 
 <div bind:this={sentinel} class="flex min-h-12 items-center justify-center py-8">
 	{#if loading}
 		<LoaderCircle class="size-5 animate-spin text-fg-2" />
+	{:else if error}
+		<div class="flex items-center gap-3 text-sm text-fg-2">
+			No se pudo cargar más.
+			<Button variant="secondary" size="sm" onclick={onLoadMore}>Reintentar</Button>
+		</div>
 	{/if}
 </div>
diff --git a/web-player/src/lib/state/menu.svelte.ts b/web-player/src/lib/state/menu.svelte.ts
new file mode 100644
index 0000000..1b84a96
--- /dev/null
+++ b/web-player/src/lib/state/menu.svelte.ts
@@ -0,0 +1,22 @@
+import { contextMenuPosition, type MenuPosition } from '$lib/utils/menuPosition';
+
+export type MenuState<T> = { target: T } & MenuPosition;
+
+export function createMenu<T>() {
+	let state = $state<MenuState<T> | null>(null);
+
+	return {
+		get state() {
+			return state;
+		},
+		open(event: MouseEvent, target: T) {
+			event.preventDefault();
+			state = { target, ...contextMenuPosition(event) };
+		},
+		close() {
+			state = null;
+		}
+	};
+}
+
+export type Menu<T> = ReturnType<typeof createMenu<T>>;
diff --git a/web-player/src/lib/state/menus.svelte.ts b/web-player/src/lib/state/menus.svelte.ts
deleted file mode 100644
index 42db1be..0000000
--- a/web-player/src/lib/state/menus.svelte.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { contextMenuPosition, type MenuPosition } from '$lib/utils/menuPosition';
-import { player } from '$lib/player/player.svelte';
-import type { Track } from '$lib/types';
-
-export type TrackMenuState = { track: Track } & MenuPosition;
-
-export function createTrackMenu() {
-	let state = $state<TrackMenuState | null>(null);
-
-	return {
-		get state() {
-			return state;
-		},
-		open(event: MouseEvent, track: Track) {
-			event.preventDefault();
-			state = { track, ...contextMenuPosition(event) };
-		},
-		close() {
-			state = null;
-		},
-		playNext() {
-			if (!state) return;
-			player.playNext([state.track]);
-			state = null;
-		}
-	};
-}
diff --git a/web-player/src/lib/state/pagedList.svelte.ts b/web-player/src/lib/state/pagedList.svelte.ts
new file mode 100644
index 0000000..b6b9580
--- /dev/null
+++ b/web-player/src/lib/state/pagedList.svelte.ts
@@ -0,0 +1,50 @@
+import type { Paged } from '$lib/types';
+
+export function createPagedList<T>(
+	fetchPage: (pageNumber: number) => Promise<Paged<T>>,
+	keyOf: (item: T) => string | number
+) {
+	let items = $state<T[]>([]);
+	let pageNumber = 1;
+	let hasMore = $state(false);
+	let loading = $state(false);
+	let error = $state(false);
+
+	return {
+		get items() {
+			return items;
+		},
+		get hasMore() {
+			return hasMore;
+		},
+		get loading() {
+			return loading;
+		},
+		get error() {
+			return error;
+		},
+		reset(initial: Paged<T> | null) {
+			items = initial?.items ?? [];
+			pageNumber = initial?.pageNumber ?? 1;
+			hasMore = initial?.hasNextPage ?? false;
+			loading = false;
+			error = false;
+		},
+		async loadMore() {
+			if (loading) return;
+			loading = true;
+			error = false;
+			try {
+				const next = await fetchPage(pageNumber + 1);
+				const seen = new Set(items.map(keyOf));
+				items = [...items, ...next.items.filter((item) => !seen.has(keyOf(item)))];
+				pageNumber = next.pageNumber;
+				hasMore = next.hasNextPage;
+			} catch {
+				error = true;
+			} finally {
+				loading = false;
+			}
+		}
+	};
+}
diff --git a/web-player/src/routes/(app)/albums/[id]/+page.svelte b/web-player/src/routes/(app)/albums/[id]/+page.svelte
index d0e5bdf..fb24a80 100644
--- a/web-player/src/routes/(app)/albums/[id]/+page.svelte
+++ b/web-player/src/routes/(app)/albums/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { albumCover } from '$lib/utils/hrefs';
 	import { player } from '$lib/player/player.svelte';
-	import { isQueueCurrent, playAllOrToggle } from '$lib/player/actions';
+	import PlayAllButton from '$lib/components/ui/media/PlayAllButton.svelte';
 	import X from '@lucide/svelte/icons/x';
 	import Plus from '@lucide/svelte/icons/plus';
 	import Page from '$lib/components/ui/layout/Page.svelte';
@@ -27,12 +27,6 @@
 	let editing = $state(false);
 	let confirmingDelete = $state(false);
 
-	const isCurrentQueue = $derived(isQueueCurrent(tracks));
-
-	function playAll() {
-		playAllOrToggle(tracks);
-	}
-
 	function playTrackFrom(index: number) {
 		player.playOrToggle(tracks, index);
 	}
@@ -69,13 +63,7 @@
 			/>
 		{/snippet}
 		{#snippet actions()}
-			<Button size="sm" onclick={playAll} disabled={tracks.length === 0}>
-				{#if isCurrentQueue && player.playing}
-					Pausar
-				{:else}
-					Reproducir
-				{/if}
-			</Button>
+			<PlayAllButton items={tracks} />
 			{#if isOwner}
 				<Button size="sm" variant="secondary" onclick={() => (editing = true)}>Editar</Button>
 				<Button size="sm" variant="secondary" onclick={() => (confirmingDelete = true)}>
diff --git a/web-player/src/routes/(app)/explore/+page.svelte b/web-player/src/routes/(app)/explore/+page.svelte
index 5a7d450..a579587 100644
--- a/web-player/src/routes/(app)/explore/+page.svelte
+++ b/web-player/src/routes/(app)/explore/+page.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
 	import Music from '@lucide/svelte/icons/music';
 	import { player } from '$lib/player/player.svelte';
-	import { fetchAlbumTracks } from '$lib/data/albums';
-	import type { Track } from '$lib/types';
+	import type { Paged, Track } from '$lib/types';
 	import { fmtTime, fmtPlays, plural } from '$lib/utils/format';
 	import Page from '$lib/components/ui/layout/Page.svelte';
 	import PageHeader from '$lib/components/ui/layout/PageHeader.svelte';
@@ -19,12 +18,10 @@
 	import SectionHeading from '$lib/components/ui/layout/SectionHeading.svelte';
 	import { EXPLORE_PAGE_SIZE } from '$lib/config';
 	import { genreHref, playlistCover } from '$lib/utils/hrefs';
-	import { createTrackMenu } from '$lib/state/menus.svelte';
-	import ContextMenu from '$lib/components/ui/overlay/ContextMenu.svelte';
-	import { contextMenuPosition } from '$lib/utils/menuPosition';
-	import ListPlus from '@lucide/svelte/icons/list-plus';
-	import ListEnd from '@lucide/svelte/icons/list-end';
-	import { appendUnique } from '$lib/utils/collections';
+	import { createMenu } from '$lib/state/menu.svelte';
+	import { createPagedList } from '$lib/state/pagedList.svelte';
+	import TrackContextMenu from '$lib/components/ui/overlay/TrackContextMenu.svelte';
+	import AlbumContextMenu from '$lib/components/ui/overlay/AlbumContextMenu.svelte';
 	import { genreInfo, genreTiles } from '$lib/data/genres';
 	import {
 		type SearchFilter,
@@ -37,8 +34,6 @@
 		findTopResult
 	} from '$lib/data/search';
 
-	type AlbumMenuState = { x: number; y: number; openLeft: boolean; albumId: string };
-
 	const TOP_RESULT_KIND_LABEL: Record<TopResult['kind'], string> = {
 		track: 'Canción',
 		album: 'Álbum',
@@ -48,25 +43,33 @@
 
 	let { data, form } = $props();
 
-	const trackMenu = createTrackMenu();
-	let albumMenu = $state<AlbumMenuState | null>(null);
+	const trackMenu = createMenu<Track>();
+	const albumMenu = createMenu<string>();
 	let sfilter = $state<SearchFilter>('all');
 
-	let localItems = $state<Track[]>([]);
-	let localPage = $state(1);
-	let hasMore = $state(false);
-	let loadingMore = $state(false);
+	const tracksList = createPagedList<Track>(
+		async (pageNumber) => {
+			const params = new URLSearchParams({
+				pageNumber: String(pageNumber),
+				pageSize: String(EXPLORE_PAGE_SIZE)
+			});
+			if (data.query) params.set('name', data.query);
+			if (data.genre) params.set('genre', data.genre);
+			const res = await fetch(`/api/tracks?${params}`);
+			if (!res.ok) throw new Error(String(res.status));
+			return (await res.json()) as Paged<Track>;
+		},
+		(track) => track.id
+	);
 
 	$effect(() => {
 		trackMenu.close();
-		albumMenu = null;
+		albumMenu.close();
 		sfilter = data.genre ? 'tracks' : 'all';
-		localItems = data.tracks.items;
-		localPage = data.tracks.pageNumber;
-		hasMore = data.tracks.hasNextPage;
+		tracksList.reset(data.tracks);
 	});
 
-	const items = $derived(localItems);
+	const items = $derived(tracksList.items);
 
 	const tiles = $derived(genreTiles(data.genres));
 	const activeGenre = $derived(data.genre ? genreInfo(data.genre) : null);
@@ -127,52 +130,6 @@
 		if (topResult.kind === 'playlist') return `/playlists/${topResult.playlist.id}`;
 		return `/user/${topResult.user.id}`;
 	});
-
-	function togglePlay(index: number) {
-		player.playOrToggle(items, index);
-	}
-
-	function openAlbumMenu(event: MouseEvent, albumId: string) {
-		event.preventDefault();
-		albumMenu = { ...contextMenuPosition(event), albumId };
-	}
-
-	async function albumPlayNext() {
-		if (!albumMenu) return;
-		const { albumId } = albumMenu;
-		albumMenu = null;
-		player.playNext(await fetchAlbumTracks(albumId));
-	}
-
-	async function albumAddToQueue() {
-		if (!albumMenu) return;
-		const { albumId } = albumMenu;
-		albumMenu = null;
-		player.appendToQueue(await fetchAlbumTracks(albumId));
-	}
-
-	async function loadMore() {
-		if (loadingMore) return;
-		loadingMore = true;
-		try {
-			const params = new URLSearchParams({
-				pageNumber: String(localPage + 1),
-				pageSize: String(EXPLORE_PAGE_SIZE)
-			});
-			if (data.query) params.set('name', data.query);
-			if (data.genre) params.set('genre', data.genre);
-			const res = await fetch(`/api/tracks?${params}`);
-			if (!res.ok) throw new Error(String(res.status));
-			const next = (await res.json()) as typeof data.tracks;
-			localItems = appendUnique(localItems, next.items, (track) => track.id);
-			localPage = next.pageNumber;
-			hasMore = next.hasNextPage;
-		} catch {
-			hasMore = false;
-		} finally {
-			loadingMore = false;
-		}
-	}
 </script>
 
 <svelte:head>
@@ -334,7 +291,7 @@
 										active={player.currentId === track.id}
 										size="lg"
 										trackId={track.id}
-										onclick={() => togglePlay(i)}
+										onclick={() => player.playOrToggle(items, i)}
 										oncontextmenu={(e) => trackMenu.open(e, track)}
 									>
 										{#snippet overlay()}
@@ -352,8 +309,13 @@
 							{/each}
 						</ul>
 
-						{#if sfilter === 'tracks' && hasMore}
-							<InfiniteScroll onLoadMore={loadMore} {hasMore} loading={loadingMore} />
+						{#if sfilter === 'tracks' && tracksList.hasMore}
+							<InfiniteScroll
+								onLoadMore={() => tracksList.loadMore()}
+								hasMore={tracksList.hasMore}
+								loading={tracksList.loading}
+								error={tracksList.error}
+							/>
 						{/if}
 					{:else}
 						<EmptyState
@@ -377,7 +339,7 @@
 									href="/albums/{album.id}"
 									size="lg"
 									trackIds={album.coverTrackIds}
-									oncontextmenu={(e) => openAlbumMenu(e, album.id)}
+									oncontextmenu={(e) => albumMenu.open(e, album.id)}
 								>
 									{#snippet trailing()}
 										<span class="hidden shrink-0 text-xs text-fg-2 tabular-nums sm:block">
@@ -427,39 +389,5 @@
 	{/if}
 </Page>
 
-{#if trackMenu.state}
-	<ContextMenu
-		x={trackMenu.state.x}
-		y={trackMenu.state.y}
-		openLeft={trackMenu.state.openLeft}
-		onClose={() => trackMenu.close()}
-		items={[
-			{ icon: ListPlus, label: 'Reproducir a continuación', onclick: () => trackMenu.playNext() }
-		]}
-		playlistAction={{
-			action: '?/addTrack',
-			fields: { trackId: trackMenu.state.track.id },
-			label: 'Añadir a una playlist'
-		}}
-		playlists={data.userPlaylists}
-	/>
-{/if}
-
-{#if albumMenu}
-	<ContextMenu
-		x={albumMenu.x}
-		y={albumMenu.y}
-		openLeft={albumMenu.openLeft}
-		onClose={() => (albumMenu = null)}
-		items={[
-			{ icon: ListPlus, label: 'Reproducir a continuación', onclick: albumPlayNext },
-			{ icon: ListEnd, label: 'Añadir a la cola', onclick: albumAddToQueue }
-		]}
-		playlistAction={{
-			action: '?/addAlbumToPlaylist',
-			fields: { albumId: albumMenu.albumId },
-			label: 'Añadir álbum a una playlist'
-		}}
-		playlists={data.userPlaylists}
-	/>
-{/if}
+<TrackContextMenu menu={trackMenu} playlists={data.userPlaylists} />
+<AlbumContextMenu menu={albumMenu} playlists={data.userPlaylists} />
diff --git a/web-player/src/routes/(app)/liked/+page.svelte b/web-player/src/routes/(app)/liked/+page.svelte
index 94882f5..81629c6 100644
--- a/web-player/src/routes/(app)/liked/+page.svelte
+++ b/web-player/src/routes/(app)/liked/+page.svelte
@@ -2,7 +2,7 @@
 	import Heart from '@lucide/svelte/icons/heart';
 	import X from '@lucide/svelte/icons/x';
 	import { player } from '$lib/player/player.svelte';
-	import { isQueueCurrent, playAllOrToggle } from '$lib/player/actions';
+	import PlayAllButton from '$lib/components/ui/media/PlayAllButton.svelte';
 	import { liked } from '$lib/player/liked.svelte';
 	import { plural } from '$lib/utils/format';
 	import Page from '$lib/components/ui/layout/Page.svelte';
@@ -13,15 +13,10 @@
 
 	const tracks = $derived(liked.list);
 	const listTracks = $derived(tracks.map((track) => ({ ...track, date: track.likedAt })));
-	const isCurrentQueue = $derived(isQueueCurrent(tracks));
 
 	function playFrom(index: number) {
 		player.playOrToggle(tracks, index);
 	}
-
-	function playAll() {
-		playAllOrToggle(tracks);
-	}
 </script>
 
 <svelte:head>
@@ -44,9 +39,7 @@
 			</div>
 		{/snippet}
 		{#snippet actions()}
-			<Button size="sm" onclick={playAll} disabled={tracks.length === 0}>
-				{isCurrentQueue && player.playing ? 'Pausar' : 'Reproducir'}
-			</Button>
+			<PlayAllButton items={tracks} />
 		{/snippet}
 	</PageHeader>
 
diff --git a/web-player/src/routes/(app)/mixes/[id]/+page.svelte b/web-player/src/routes/(app)/mixes/[id]/+page.svelte
index ccc5ed8..903002c 100644
--- a/web-player/src/routes/(app)/mixes/[id]/+page.svelte
+++ b/web-player/src/routes/(app)/mixes/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import Shuffle from '@lucide/svelte/icons/shuffle';
 	import { player } from '$lib/player/player.svelte';
-	import { isQueueCurrent, playAllOrToggle, playShuffled } from '$lib/player/actions';
+	import { playShuffled } from '$lib/player/actions';
 	import { fmtTime, plural } from '$lib/utils/format';
 	import Page from '$lib/components/ui/layout/Page.svelte';
 	import BackLink from '$lib/components/ui/primitives/BackLink.svelte';
@@ -10,9 +10,10 @@
 	import Artwork from '$lib/components/ui/media/Artwork.svelte';
 	import PageHeader from '$lib/components/ui/layout/PageHeader.svelte';
 	import TrackList from '$lib/components/ui/media/TrackList.svelte';
-	import ContextMenu from '$lib/components/ui/overlay/ContextMenu.svelte';
-	import ListPlus from '@lucide/svelte/icons/list-plus';
-	import { createTrackMenu } from '$lib/state/menus.svelte';
+	import TrackContextMenu from '$lib/components/ui/overlay/TrackContextMenu.svelte';
+	import { createMenu } from '$lib/state/menu.svelte';
+	import type { Track } from '$lib/types';
+	import PlayAllButton from '$lib/components/ui/media/PlayAllButton.svelte';
 
 	let { data, form } = $props();
 
@@ -20,9 +21,8 @@
 	const tracks = $derived(mix.tracks);
 
 	const totalSeconds = $derived(tracks.reduce((total, track) => total + track.duration, 0));
-	const isCurrentQueue = $derived(isQueueCurrent(tracks));
 
-	const trackMenu = createTrackMenu();
+	const trackMenu = createMenu<Track>();
 
 	function playFrom(index: number) {
 		player.playOrToggle(tracks, index);
@@ -52,13 +52,7 @@
 			/>
 		{/snippet}
 		{#snippet actions()}
-			<Button size="sm" onclick={() => playAllOrToggle(tracks)} disabled={tracks.length === 0}>
-				{#if isCurrentQueue && player.playing}
-					Pausar
-				{:else}
-					Reproducir
-				{/if}
-			</Button>
+			<PlayAllButton items={tracks} />
 			<Button
 				variant="secondary"
 				size="sm"
@@ -79,24 +73,8 @@
 		{tracks}
 		columns={['plays']}
 		onPlay={playFrom}
-		oncontextmenu={(e, _track, i) => trackMenu.open(e, tracks[i])}
+		oncontextmenu={(e, track) => trackMenu.open(e, track)}
 	/>
 </Page>
 
-{#if trackMenu.state}
-	<ContextMenu
-		x={trackMenu.state.x}
-		y={trackMenu.state.y}
-		openLeft={trackMenu.state.openLeft}
-		onClose={() => trackMenu.close()}
-		items={[
-			{ icon: ListPlus, label: 'Reproducir a continuación', onclick: () => trackMenu.playNext() }
-		]}
-		playlistAction={{
-			action: '?/addTrack',
-			fields: { trackId: trackMenu.state.track.id },
-			label: 'Añadir a una playlist'
-		}}
-		playlists={data.userPlaylists}
-	/>
-{/if}
+<TrackContextMenu menu={trackMenu} playlists={data.userPlaylists} />
diff --git a/web-player/src/routes/(app)/playlists/[id]/+page.svelte b/web-player/src/routes/(app)/playlists/[id]/+page.svelte
index beb543a..bc2b014 100644
--- a/web-player/src/routes/(app)/playlists/[id]/+page.svelte
+++ b/web-player/src/routes/(app)/playlists/[id]/+page.svelte
@@ -3,7 +3,7 @@
 	import ListMusic from '@lucide/svelte/icons/list-music';
 	import X from '@lucide/svelte/icons/x';
 	import { player } from '$lib/player/player.svelte';
-	import { isQueueCurrent, playAllOrToggle } from '$lib/player/actions';
+	import PlayAllButton from '$lib/components/ui/media/PlayAllButton.svelte';
 	import Page from '$lib/components/ui/layout/Page.svelte';
 	import PageHeader from '$lib/components/ui/layout/PageHeader.svelte';
 	import Modal from '$lib/components/ui/overlay/Modal.svelte';
@@ -25,12 +25,6 @@
 	let editing = $state(false);
 	let confirmingDelete = $state(false);
 
-	const isCurrentQueue = $derived(isQueueCurrent(tracks));
-
-	function playAll() {
-		playAllOrToggle(tracks);
-	}
-
 	function playFrom(index: number) {
 		player.playOrToggle(tracks, index);
 	}
@@ -66,13 +60,7 @@
 			/>
 		{/snippet}
 		{#snippet actions()}
-			<Button size="sm" onclick={playAll} disabled={tracks.length === 0}>
-				{#if isCurrentQueue && player.playing}
-					Pausar
-				{:else}
-					Reproducir
-				{/if}
-			</Button>
+			<PlayAllButton items={tracks} />
 			{#if isOwner}
 				<Button size="sm" variant="secondary" onclick={() => (editing = true)}>Editar</Button>
 				<Button size="sm" variant="secondary" onclick={() => (confirmingDelete = true)}>
diff --git a/web-player/src/routes/(app)/user/[id]/[list=followList]/+page.svelte b/web-player/src/routes/(app)/user/[id]/[list=followList]/+page.svelte
index ee64210..c35405c 100644
--- a/web-player/src/routes/(app)/user/[id]/[list=followList]/+page.svelte
+++ b/web-player/src/routes/(app)/user/[id]/[list=followList]/+page.svelte
@@ -6,44 +6,29 @@
 	import EmptyState from '$lib/components/ui/primitives/EmptyState.svelte';
 	import InfiniteScroll from '$lib/components/ui/primitives/InfiniteScroll.svelte';
 	import UserRow from '$lib/components/ui/media/UserRow.svelte';
-	import { appendUnique } from '$lib/utils/collections';
+	import { createPagedList } from '$lib/state/pagedList.svelte';
 	import { plural } from '$lib/utils/format';
 
 	let { data } = $props();
 
 	type ListUser = NonNullable<typeof data.users>['items'][number];
 
-	let items = $state<ListUser[]>([]);
-	let page = $state(1);
-	let hasMore = $state(false);
-	let loadingMore = $state(false);
+	const list = createPagedList<ListUser>(
+		async (pageNumber) => {
+			const res = await fetch(
+				`/api/users/${data.profile.id}/${data.list}?pageNumber=${pageNumber}`
+			);
+			if (!res.ok) throw new Error(String(res.status));
+			return (await res.json()) as NonNullable<typeof data.users>;
+		},
+		(user) => user.id
+	);
 
-	$effect(() => {
-		items = data.users?.items ?? [];
-		page = data.users?.pageNumber ?? 1;
-		hasMore = data.users?.hasNextPage ?? false;
-	});
+	$effect(() => list.reset(data.users));
 
 	const isFollowers = $derived(data.list === 'followers');
 	const title = $derived(isFollowers ? 'Seguidores' : 'Siguiendo');
 	const total = $derived(data.users?.totalItemCount ?? 0);
-
-	async function loadMore() {
-		if (loadingMore) return;
-		loadingMore = true;
-		try {
-			const res = await fetch(`/api/users/${data.profile.id}/${data.list}?pageNumber=${page + 1}`);
-			if (!res.ok) throw new Error(String(res.status));
-			const next = (await res.json()) as NonNullable<typeof data.users>;
-			items = appendUnique(items, next.items, (u) => u.id);
-			page = next.pageNumber;
-			hasMore = next.hasNextPage;
-		} catch {
-			hasMore = false;
-		} finally {
-			loadingMore = false;
-		}
-	}
 </script>
 
 <svelte:head>
@@ -67,7 +52,7 @@
 			title="Seguidores privados"
 			description="Solo puedes ver los seguidores de {data.profile.name} si os seguís mutuamente."
 		/>
-	{:else if items.length === 0}
+	{:else if list.items.length === 0}
 		<EmptyState
 			icon={Users}
 			title={isFollowers ? 'Sin seguidores' : 'No sigue a nadie'}
@@ -77,12 +62,17 @@
 		/>
 	{:else}
 		<ul class="flex flex-col gap-1">
-			{#each items as user (user.id)}
+			{#each list.items as user (user.id)}
 				<li>
 					<UserRow {user} />
 				</li>
 			{/each}
 		</ul>
-		<InfiniteScroll onLoadMore={loadMore} {hasMore} loading={loadingMore} />
+		<InfiniteScroll
+			onLoadMore={() => list.loadMore()}
+			hasMore={list.hasMore}
+			loading={list.loading}
+			error={list.error}
+		/>
 	{/if}
 </Page>
diff --git a/web-player/src/routes/+page.svelte b/web-player/src/routes/+page.svelte
index e11d642..a8468a4 100644
--- a/web-player/src/routes/+page.svelte
+++ b/web-player/src/routes/+page.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
 	import { playlistCover } from '$lib/utils/hrefs';
-	import { goto } from '$app/navigation';
 	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 { isQueueCurrent, playAllOrToggle, playShuffled } from '$lib/player/actions';
+	import { playShuffled } from '$lib/player/actions';
 	import type { Track } from '$lib/types';
 	import { mergeRecentlyPlayed } from '$lib/data/recentlyPlayed';
 	import { fetchPlaylistTracks } from '$lib/data/albums';
@@ -17,43 +16,20 @@
 	import SectionHeading from '$lib/components/ui/layout/SectionHeading.svelte';
 	import EmptyState from '$lib/components/ui/primitives/EmptyState.svelte';
 	import Button from '$lib/components/ui/primitives/Button.svelte';
-	import ContextMenu from '$lib/components/ui/overlay/ContextMenu.svelte';
-	import ListPlus from '@lucide/svelte/icons/list-plus';
-	import { createTrackMenu } from '$lib/state/menus.svelte';
+	import PlayAllButton from '$lib/components/ui/media/PlayAllButton.svelte';
+	import TrackContextMenu from '$lib/components/ui/overlay/TrackContextMenu.svelte';
+	import { createMenu } from '$lib/state/menu.svelte';
 	import { HOME_CONTINUE_LIMIT } from '$lib/config';
 
 	let { data } = $props();
 
-	const trackMenu = createTrackMenu();
+	const trackMenu = createMenu<Track>();
 
-	const mixes = $derived(data.mixes);
-	const playlists = $derived(data.playlists);
 	const spotlight = $derived(data.spotlightPlaylist);
-
 	const continueItems = $derived(mergeRecentlyPlayed(data.recentlyPlayed, HOME_CONTINUE_LIMIT));
 
-	function playContinue(index: number) {
-		player.playOrToggle(continueItems, index);
-	}
-	function playSpotlightTrack(items: Track[], index: number) {
-		player.playOrToggle(items, index);
-	}
-	async function playSpotlight(previewItems: Track[]) {
-		if (!spotlight) return;
-		if (isQueueCurrent(previewItems)) {
-			player.toggle();
-			return;
-		}
-		playAllOrToggle(await fetchPlaylistTracks(spotlight.id));
-	}
 	async function shuffleSpotlight() {
-		if (!spotlight) return;
-		playShuffled(await fetchPlaylistTracks(spotlight.id));
-	}
-
-	function playMix(mix: (typeof mixes)[number], event: MouseEvent) {
-		event.preventDefault();
-		player.playQueue(mix.tracks, 0);
+		if (data.spotlightPlaylist) playShuffled(await fetchPlaylistTracks(data.spotlightPlaylist.id));
 	}
 </script>
 
@@ -90,11 +66,14 @@
 				</p>
 				<div class="mt-6.5 flex flex-wrap items-center gap-2.5">
 					{#if spotlight}
-						{#await data.spotlightTracks then { items: previewItems }}
-							<Button variant="primary" onclick={() => playSpotlight(previewItems)}>
-								{isQueueCurrent(previewItems) && player.playing ? 'Pausar' : 'Reanudar'}
-								{spotlight.name}
-							</Button>
+						{#await data.spotlightTracks then { items }}
+							<PlayAllButton
+								{items}
+								load={() => fetchPlaylistTracks(spotlight.id)}
+								size="md"
+								idleLabel="Reanudar {spotlight.name}"
+								activeLabel="Pausar {spotlight.name}"
+							/>
 						{/await}
 					{/if}
 					<Button href="/explore" variant="secondary">Explorar música</Button>
@@ -130,7 +109,7 @@
 					{#each continueItems as item, i (item.id)}
 						{@const isCurrent = player.currentId === item.id}
 						<ListRow
-							onclick={() => playContinue(i)}
+							onclick={() => player.playOrToggle(continueItems, i)}
 							oncontextmenu={(e) => trackMenu.open(e, item)}
 							active={isCurrent}
 							size="lg"
@@ -185,16 +164,19 @@
 								{spotlight.description || 'Tu colección, siempre a mano.'}
 							</p>
 							<div class="mt-5 flex gap-2.5">
-								<Button variant="accent" onclick={() => playSpotlight(previewItems)}
-									>Reproducir</Button
-								>
+								<PlayAllButton
+									items={previewItems}
+									load={() => fetchPlaylistTracks(spotlight.id)}
+									variant="accent"
+									size="md"
+								/>
 								<Button variant="secondary" onclick={shuffleSpotlight}>Aleatorio</Button>
 							</div>
 						</div>
 						<div class="flex flex-col gap-2 p-5.5 sm:p-6">
 							{#each previewItems as track, i (track.id)}
 								<ListRow
-									onclick={() => playSpotlightTrack(previewItems, i)}
+									onclick={() => player.playOrToggle(previewItems, i)}
 									active={player.currentId === track.id}
 									size="sm"
 									title={track.title}
@@ -224,15 +206,18 @@
 
 		<section>
 			<SectionHeading title="Mixes" subtitle="Generados a partir de lo que más repites" />
-			{#if mixes.length > 0}
+			{#if data.mixes.length > 0}
 				<div class="grid-tiles">
-					{#each mixes as mix, i (mix.id)}
+					{#each data.mixes as mix, i (mix.id)}
 						<MediaCard
 							href="/mixes/{mix.id}"
 							title={mix.title}
 							subtitle={mix.subtitle}
 							trackIds={mix.tracks.map((track) => track.id)}
-							onPlay={(event) => playMix(mix, event)}
+							onPlay={(event) => {
+								event.preventDefault();
+								player.playQueue(mix.tracks, 0);
+							}}
 							index={i}
 						/>
 					{/each}
@@ -252,11 +237,11 @@
 				subtitle="Creadas y guardadas por ti"
 				href={data.playlistsHasMore ? '/playlists' : undefined}
 			/>
-			{#if playlists.length > 0}
+			{#if data.playlists.length > 0}
 				<div class="grid-wide">
-					{#each playlists as playlist, i (playlist.id)}
+					{#each data.playlists as playlist, i (playlist.id)}
 						<ListRow
-							onclick={() => goto(`/playlists/${playlist.id}`)}
+							href="/playlists/{playlist.id}"
 							size="lg"
 							variant="card"
 							title={playlist.name}
@@ -282,20 +267,4 @@
 	</div>
 </Page>
 
-{#if trackMenu.state}
-	<ContextMenu
-		x={trackMenu.state.x}
-		y={trackMenu.state.y}
-		openLeft={trackMenu.state.openLeft}
-		onClose={() => trackMenu.close()}
-		items={[
-			{ icon: ListPlus, label: 'Reproducir a continuación', onclick: () => trackMenu.playNext() }
-		]}
-		playlistAction={{
-			action: '?/addTrack',
-			fields: { trackId: trackMenu.state.track.id },
-			label: 'Añadir a una playlist'
-		}}
-		playlists={data.userPlaylists}
-	/>
-{/if}
+<TrackContextMenu menu={trackMenu} playlists={data.userPlaylists} />