diff --git a/src/lib/components/views/FavoritesView.svelte b/src/lib/components/views/FavoritesView.svelte index 0d4067aa8..b42003ae3 100644 --- a/src/lib/components/views/FavoritesView.svelte +++ b/src/lib/components/views/FavoritesView.svelte @@ -3,7 +3,7 @@ import { onMount, tick } from 'svelte'; import { get } from 'svelte/store'; import { t } from '$lib/i18n'; - import { Heart, Play, Disc3, Mic2, Music, Search, X, LayoutGrid, List, ChevronDown, ListMusic, Edit3, Star, Folder, Library, CloudDownload, Shuffle, MoreHorizontal, PanelLeftClose, Loader2 } from 'lucide-svelte'; + import { Heart, Play, Disc3, Mic2, Music, Search, X, LayoutGrid, List, ChevronDown, ListMusic, Edit3, Star, Folder, Library, CloudDownload, Shuffle, MoreHorizontal, PanelLeftClose, Loader2, ArrowLeft } from 'lucide-svelte'; import AlbumCard from '../AlbumCard.svelte'; import TrackRow from '../TrackRow.svelte'; import QualityBadge from '../QualityBadge.svelte'; @@ -26,6 +26,7 @@ type GenreFilterContext } from '$lib/stores/genreFilterStore'; import type { FavoritesPreferences, QobuzAlbum } from '$lib/types'; + import { saveScrollPosition, getSavedScrollPosition, getActiveView } from '$lib/stores/navigationStore'; const GENRE_CONTEXT: GenreFilterContext = 'favorites'; @@ -71,6 +72,7 @@ } interface Props { + onBack?: () => void; onAlbumClick?: (albumId: string) => void; onAlbumPlay?: (albumId: string) => void; onAlbumPlayNext?: (albumId: string) => void; @@ -127,6 +129,7 @@ } let { + onBack, onAlbumClick, onAlbumPlay, onAlbumPlayNext, @@ -568,9 +571,22 @@ activeTab = favoritesPreferences.tab_order[0] as TabType; } loadTabIfNeeded(activeTab); + // Restore scroll position after content loads + await tick(); + requestAnimationFrame(() => { + const saved = getSavedScrollPosition(getActiveView()); + if (scrollContainer && saved > 0) { + scrollContainer.scrollTop = saved; + } + }); }); }); + function handleFavoritesScroll(e: Event) { + const target = e.target as HTMLElement; + saveScrollPosition(getActiveView(), target.scrollTop); + } + async function loadFavoritesPreferences() { try { const prefs = await invoke('get_favorites_preferences'); @@ -1154,7 +1170,13 @@ -
0) || (activeTab === 'artists' && artistViewMode === 'sidepanel')} bind:this={scrollContainer}> +
0) || (activeTab === 'artists' && artistViewMode === 'sidepanel')} bind:this={scrollContainer} onscroll={handleFavoritesScroll}> + {#if onBack} + + {/if}
(); + // Selected playlist ID (album/artist are full data objects in +page.svelte) let selectedPlaylistId: number | null = null; @@ -222,6 +225,22 @@ export function navigateToFavorites(tab?: FavoritesTab): void { navigateTo(favoritesViewForTab(targetTab)); } +// ============ Scroll Position ============ + +/** + * Save scroll position for a view (call before navigating away) + */ +export function saveScrollPosition(view: ViewType, scrollTop: number): void { + scrollPositions.set(view, scrollTop); +} + +/** + * Get saved scroll position for a view (0 if none saved) + */ +export function getSavedScrollPosition(view: ViewType): number { + return scrollPositions.get(view) ?? 0; +} + // ============ Getters ============ export function getActiveView(): ViewType { diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 1d4909242..764505828 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -3278,6 +3278,7 @@ /> {:else}