feat(context): scroll to active track on context navigation

cx
This commit is contained in:
vicrodh committed 2026-01-19 11:19:52 -06:00
1 parent 78c4898edf
commit 318e3d795a
7 files changed
+107 -11

No files matched your search

+1
View File
@@ -123,6 +123,7 @@
class:playing={isPlaying}
class:hovered={isHovered && !isPlaying}
class:compact
data-track-id={trackId ?? undefined}
onmouseenter={() => (isHovered = true)}
onmouseleave={() => (isHovered = false)}
onclick={onPlay}
@@ -1,9 +1,10 @@
<script lang="ts">
import { onMount } from 'svelte';
import { onMount, tick } from 'svelte';
import { ArrowLeft, Play, Shuffle, Heart } from 'lucide-svelte';
import TrackRow from '../TrackRow.svelte';
import AlbumMenu from '../AlbumMenu.svelte';
import { getDownloadState, type DownloadStatus, isAlbumFullyDownloaded } from '$lib/stores/downloadState';
import { consumeContextTrackFocus } from '$lib/stores/playbackContextStore';
import {
subscribe as subscribeAlbumFavorites,
isAlbumFavorite,
@@ -101,6 +102,7 @@
let isFavorite = $state(false);
let isFavoriteLoading = $state(false);
let playBtnHovered = $state(false);
let scrollContainer: HTMLDivElement | null = $state(null);
const albumFullyDownloaded = $derived(
isAlbumFullyDownloaded(album.tracks.map(t => t.id))
@@ -110,6 +112,12 @@
album.artist?.trim().toLowerCase() === 'various artists'
);
async function scrollToTrack(trackId: number) {
await tick();
const target = scrollContainer?.querySelector<HTMLElement>(`[data-track-id="${trackId}"]`);
target?.scrollIntoView({ block: 'center' });
}
// Check if album is in favorites on mount
onMount(() => {
let unsubscribe: (() => void) | null = null;
@@ -130,6 +138,14 @@
};
});
$effect(() => {
if (!album.tracks?.length) return;
const targetId = consumeContextTrackFocus('album', album.id);
if (targetId !== null) {
void scrollToTrack(targetId);
}
});
async function toggleFavorite() {
if (isFavoriteLoading) return;
@@ -144,7 +160,7 @@
}
</script>
<div class="album-detail">
<div class="album-detail" bind:this={scrollContainer}>
<!-- Back Navigation -->
<button class="back-btn" onclick={onBack}>
<ArrowLeft size={16} />
@@ -4,8 +4,9 @@
import type { ArtistDetail, QobuzArtist } from '$lib/types';
import AlbumCard from '../AlbumCard.svelte';
import TrackMenu from '../TrackMenu.svelte';
import { setPlaybackContext } from '$lib/stores/playbackContextStore';
import { consumeContextTrackFocus, setPlaybackContext } from '$lib/stores/playbackContextStore';
import { togglePlay } from '$lib/stores/playerStore';
import { tick } from 'svelte';
interface Track {
id: number;
@@ -525,6 +526,20 @@
target?.scrollIntoView({ behavior: 'smooth', block: 'start' });
}
async function scrollToTrack(trackId: number) {
await tick();
const target = artistDetailEl?.querySelector<HTMLElement>(`[data-track-id="${trackId}"]`);
target?.scrollIntoView({ block: 'center' });
}
$effect(() => {
if (!artistDetailEl || topTracks.length === 0) return;
const targetId = consumeContextTrackFocus('artist_top', artist.id.toString());
if (targetId !== null) {
void scrollToTrack(targetId);
}
});
$effect(() => {
if (!artistDetailEl) return;
if (jumpObserver) {
+18 -3
View File
@@ -1,13 +1,13 @@
<script lang="ts">
import { invoke } from '@tauri-apps/api/core';
import { onMount } from 'svelte';
import { onMount, tick } from 'svelte';
import { Heart, Play, Disc3, Mic2, Music, Search, X, LayoutGrid, List, ChevronDown, ListMusic, Edit3, Star, Folder, Library } from 'lucide-svelte';
import AlbumCard from '../AlbumCard.svelte';
import TrackRow from '../TrackRow.svelte';
import PlaylistCollage from '../PlaylistCollage.svelte';
import FavoritesEditModal from '../FavoritesEditModal.svelte';
import { type DownloadStatus } from '$lib/stores/downloadState';
import { setPlaybackContext } from '$lib/stores/playbackContextStore';
import { consumeContextTrackFocus, setPlaybackContext } from '$lib/stores/playbackContextStore';
import { normalizeFavoritesTabOrder } from '$lib/utils/favorites';
import type { FavoritesPreferences } from '$lib/types';
@@ -147,6 +147,7 @@
let loading = $state(false);
let loadingPlaylists = $state(false);
let editModalOpen = $state(false);
let scrollContainer: HTMLDivElement | null = $state(null);
let favoritesPreferences = $state<FavoritesPreferences>({
custom_icon_path: null,
custom_icon_preset: 'heart',
@@ -201,6 +202,12 @@
let showArtistGroupMenu = $state(false);
let artistGroupingEnabled = $state(false);
async function scrollToTrack(trackId: number) {
await tick();
const target = scrollContainer?.querySelector<HTMLElement>(`[data-track-id="${trackId}"]`);
target?.scrollIntoView({ block: 'center' });
}
// Filtered lists based on search
let filteredTracks = $derived.by(() => {
if (!trackSearch.trim()) return favoriteTracks;
@@ -363,6 +370,14 @@
}
});
$effect(() => {
if (!preferencesLoaded || activeTab !== 'tracks' || favoriteTracks.length === 0) return;
const targetId = consumeContextTrackFocus('favorites', 'favorites');
if (targetId !== null) {
void scrollToTrack(targetId);
}
});
const FAVORITES_PAGE_SIZE = 200;
const FAVORITES_MAX_PAGES = 50;
@@ -742,7 +757,7 @@
</script>
<div class="favorites-view">
<div class="favorites-view" bind:this={scrollContainer}>
<!-- Header -->
<div class="header">
<div
@@ -13,9 +13,9 @@
getStatus as getOfflineStatus,
type OfflineStatus
} from '$lib/stores/offlineStore';
import { setPlaybackContext } from '$lib/stores/playbackContextStore';
import { consumeContextTrackFocus, setPlaybackContext } from '$lib/stores/playbackContextStore';
import { t } from '$lib/i18n';
import { onMount } from 'svelte';
import { onMount, tick } from 'svelte';
interface PlaylistTrack {
id: number;
@@ -182,6 +182,7 @@
let loading = $state(true);
let error = $state<string | null>(null);
let playBtnHovered = $state(false);
let scrollContainer: HTMLDivElement | null = $state(null);
// Offline mode state
let offlineStatus = $state<OfflineStatus>(getOfflineStatus());
@@ -198,6 +199,12 @@
let editModalOpen = $state(false);
let isFavorite = $state(false);
async function scrollToTrack(trackId: number) {
await tick();
const target = scrollContainer?.querySelector<HTMLElement>(`[data-track-id="${trackId}"]`);
target?.scrollIntoView({ block: 'center' });
}
// Subscribe to offline status changes
onMount(() => {
const unsubscribe = subscribeOffline(() => {
@@ -210,6 +217,14 @@
return unsubscribe;
});
$effect(() => {
if (!playlist || displayTracks.length === 0) return;
const targetId = consumeContextTrackFocus('playlist', playlist.id.toString());
if (targetId !== null) {
void scrollToTrack(targetId);
}
});
// Check if a track is available (has local copy when offline, always available when online)
function isTrackAvailable(track: DisplayTrack): boolean {
if (!offlineStatus.isOffline) return true;
@@ -768,7 +783,7 @@
}
</script>
<div class="playlist-detail">
<div class="playlist-detail" bind:this={scrollContainer}>
<!-- Navigation Row -->
<div class="nav-row">
<button class="back-btn" onclick={onBack}>
+22
View File
@@ -24,6 +24,7 @@ export interface PlaybackContext {
// ============ State ============
let currentContext: PlaybackContext | null = null;
let pendingFocus: { contextType: ContextType; contextId: string; trackId: number } | null = null;
const listeners = new Set<() => void>();
function notifyListeners(): void {
@@ -105,6 +106,27 @@ export function getCurrentContext(): PlaybackContext | null {
return currentContext;
}
export function requestContextTrackFocus(
contextType: ContextType,
contextId: string,
trackId: number
): void {
pendingFocus = { contextType, contextId, trackId };
}
export function consumeContextTrackFocus(
contextType: ContextType,
contextId: string
): number | null {
if (!pendingFocus) return null;
if (pendingFocus.contextType !== contextType || pendingFocus.contextId !== contextId) {
return null;
}
const { trackId } = pendingFocus;
pendingFocus = null;
return trackId;
}
/**
* Get display info for the current context
*/
+14 -2
View File
@@ -30,7 +30,8 @@
initPlaybackContextStore,
setPlaybackContext,
clearPlaybackContext,
getCurrentContext
getCurrentContext,
requestContextTrackFocus
} from '$lib/stores/playbackContextStore';
import {
initPlaybackPreferences,
@@ -407,10 +408,18 @@
console.log('[ContextNav] Navigating to:', context);
const focusTrackId = currentTrack?.id;
const requestFocus = (contextType: typeof context.type, contextId: string) => {
if (typeof focusTrackId === 'number') {
requestContextTrackFocus(contextType, contextId, focusTrackId);
}
};
try {
switch (context.type) {
case 'album':
// Navigate to album page
requestFocus('album', context.id);
await handleAlbumClick(context.id);
break;
@@ -418,6 +427,7 @@
// Navigate to playlist page
const playlistId = parseInt(context.id);
if (!isNaN(playlistId)) {
requestFocus('playlist', context.id);
selectedPlaylistId = playlistId;
navigateTo('playlist');
}
@@ -427,13 +437,15 @@
// Navigate to artist page
const artistId = parseInt(context.id);
if (!isNaN(artistId)) {
requestFocus('artist_top', context.id);
await handleArtistClick(artistId);
}
break;
case 'favorites':
// Navigate to favorites page
navigateTo('favorites');
requestFocus('favorites', 'favorites');
navigateToFavorites('tracks');
break;
case 'home_list':