diff --git a/src/lib/components/views/SearchView.svelte b/src/lib/components/views/SearchView.svelte index d5a8e3390..7dc417515 100644 --- a/src/lib/components/views/SearchView.svelte +++ b/src/lib/components/views/SearchView.svelte @@ -3,6 +3,7 @@ import { invoke } from '@tauri-apps/api/core'; import { Search, Disc3, Music, Mic2, User } from 'lucide-svelte'; import AlbumCard from '../AlbumCard.svelte'; + import { getSearchState, setSearchState, type SearchResults, type SearchTab } from '$lib/stores/searchState'; onMount(() => { console.log('SearchView mounted!'); @@ -60,21 +61,16 @@ albums_count?: number; } - interface SearchResults { - items: T[]; - total: number; - offset: number; - limit: number; - } + const cachedState = getSearchState(); - let query = $state(''); - let activeTab = $state<'albums' | 'tracks' | 'artists'>('albums'); + let query = $state(cachedState.query ?? ''); + let activeTab = $state(cachedState.activeTab ?? 'albums'); let isSearching = $state(false); let searchError = $state(null); - let albumResults = $state | null>(null); - let trackResults = $state | null>(null); - let artistResults = $state | null>(null); + let albumResults = $state | null>(cachedState.albumResults ?? null); + let trackResults = $state | null>(cachedState.trackResults ?? null); + let artistResults = $state | null>(cachedState.artistResults ?? null); let searchTimeout: ReturnType | null = null; let isLoadingMore = $state(false); @@ -96,6 +92,16 @@ searchTimeout = setTimeout(() => performSearch(), 300); } + $effect(() => { + setSearchState({ + query, + activeTab, + albumResults, + trackResults, + artistResults + }); + }); + async function performSearch() { if (!query.trim()) return; diff --git a/src/lib/stores/searchState.ts b/src/lib/stores/searchState.ts new file mode 100644 index 000000000..8f417aa54 --- /dev/null +++ b/src/lib/stores/searchState.ts @@ -0,0 +1,32 @@ +export type SearchTab = 'albums' | 'tracks' | 'artists'; + +export interface SearchResults { + items: T[]; + total: number; + offset: number; + limit: number; +} + +export interface SearchState { + query: string; + activeTab: SearchTab; + albumResults: SearchResults | null; + trackResults: SearchResults | null; + artistResults: SearchResults | null; +} + +let searchState: SearchState = { + query: '', + activeTab: 'albums', + albumResults: null, + trackResults: null, + artistResults: null, +}; + +export function getSearchState(): SearchState { + return searchState as SearchState; +} + +export function setSearchState(next: SearchState): void { + searchState = next as SearchState; +} diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 65b69bdb6..5928e5ae2 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -167,6 +167,7 @@ type ViewType = 'home' | 'search' | 'library' | 'settings' | 'album' | 'artist' | 'playlist' | 'favorites'; let activeView = $state('home'); let viewHistory = $state(['home']); + let forwardHistory = $state([]); let selectedAlbum = $state(null); let selectedArtist = $state(null); let selectedPlaylistId = $state(null); @@ -211,6 +212,7 @@ const typedView = view as ViewType; if (typedView !== activeView) { viewHistory = [...viewHistory, typedView]; + forwardHistory = []; activeView = typedView; console.log('View changed to:', activeView); } else { @@ -220,17 +222,19 @@ function goBack() { if (viewHistory.length > 1) { + const lastView = viewHistory[viewHistory.length - 1]; viewHistory = viewHistory.slice(0, -1); + forwardHistory = [...forwardHistory, lastView]; activeView = viewHistory[viewHistory.length - 1]; - if (activeView !== 'album') { - selectedAlbum = null; - } - if (activeView !== 'artist') { - selectedArtist = null; - } - if (activeView !== 'playlist') { - selectedPlaylistId = null; - } + } + } + + function goForward() { + if (forwardHistory.length > 0) { + const nextView = forwardHistory[forwardHistory.length - 1]; + forwardHistory = forwardHistory.slice(0, -1); + viewHistory = [...viewHistory, nextView]; + activeView = nextView; } } @@ -1149,8 +1153,23 @@ document.documentElement.setAttribute('data-theme', savedTheme); } + const handleMouseNavigation = (event: MouseEvent) => { + if (event.button === 3) { + event.preventDefault(); + goBack(); + } else if (event.button === 4) { + event.preventDefault(); + goForward(); + } + }; + document.addEventListener('keydown', handleKeydown); - return () => document.removeEventListener('keydown', handleKeydown); + window.addEventListener('mouseup', handleMouseNavigation); + + return () => { + document.removeEventListener('keydown', handleKeydown); + window.removeEventListener('mouseup', handleMouseNavigation); + }; }); // Sync queue state when opening queue panel