refactor: remove unnecessary navigation wrappers
- Remove goBack(), goForward(), handlePlaylistSelect() wrappers - Use navGoBack, navGoForward, selectPlaylist directly from store - Keep navigateTo() wrapper (has debug logging) +page.svelte: 1,241 → 1,229 lines (-12 lines)
This commit is contained in:
1 parent
58db1bedc1
commit
7580948e8c
1 file changed
+10
-22
+10
-22
@@ -227,24 +227,12 @@
|
|||||||
// Toast State (from store subscription)
|
// Toast State (from store subscription)
|
||||||
let toast = $state<ToastData | null>(null);
|
let toast = $state<ToastData | null>(null);
|
||||||
|
|
||||||
// Navigation Functions (using store)
|
// Navigation wrapper (keeps debug logging)
|
||||||
function navigateTo(view: string) {
|
function navigateTo(view: string) {
|
||||||
console.log('navigateTo called with:', view, 'current activeView:', activeView);
|
console.log('navigateTo called with:', view, 'current activeView:', activeView);
|
||||||
navTo(view as ViewType);
|
navTo(view as ViewType);
|
||||||
}
|
}
|
||||||
|
|
||||||
function goBack() {
|
|
||||||
navGoBack();
|
|
||||||
}
|
|
||||||
|
|
||||||
function goForward() {
|
|
||||||
navGoForward();
|
|
||||||
}
|
|
||||||
|
|
||||||
function handlePlaylistSelect(playlistId: number) {
|
|
||||||
selectPlaylist(playlistId);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleAlbumClick(albumId: string) {
|
async function handleAlbumClick(albumId: string) {
|
||||||
try {
|
try {
|
||||||
showToast('Loading album...', 'info');
|
showToast('Loading album...', 'info');
|
||||||
@@ -759,7 +747,7 @@
|
|||||||
case 'ArrowLeft':
|
case 'ArrowLeft':
|
||||||
if (e.altKey) {
|
if (e.altKey) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
goBack();
|
navGoBack();
|
||||||
} else if (e.ctrlKey || e.metaKey) {
|
} else if (e.ctrlKey || e.metaKey) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
handleSkipBack();
|
handleSkipBack();
|
||||||
@@ -768,7 +756,7 @@
|
|||||||
case 'ArrowRight':
|
case 'ArrowRight':
|
||||||
if (e.altKey) {
|
if (e.altKey) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
goForward();
|
navGoForward();
|
||||||
} else if (e.ctrlKey || e.metaKey) {
|
} else if (e.ctrlKey || e.metaKey) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
handleSkipForward();
|
handleSkipForward();
|
||||||
@@ -815,10 +803,10 @@
|
|||||||
const handleMouseNavigation = (event: MouseEvent) => {
|
const handleMouseNavigation = (event: MouseEvent) => {
|
||||||
if (event.button === 3) {
|
if (event.button === 3) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
goBack();
|
navGoBack();
|
||||||
} else if (event.button === 4) {
|
} else if (event.button === 4) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
goForward();
|
navGoForward();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -967,7 +955,7 @@
|
|||||||
{activeView}
|
{activeView}
|
||||||
{selectedPlaylistId}
|
{selectedPlaylistId}
|
||||||
onNavigate={navigateTo}
|
onNavigate={navigateTo}
|
||||||
onPlaylistSelect={handlePlaylistSelect}
|
onPlaylistSelect={selectPlaylist}
|
||||||
onCreatePlaylist={openCreatePlaylist}
|
onCreatePlaylist={openCreatePlaylist}
|
||||||
onSettingsClick={() => navigateTo('settings')}
|
onSettingsClick={() => navigateTo('settings')}
|
||||||
onLogout={handleLogout}
|
onLogout={handleLogout}
|
||||||
@@ -997,7 +985,7 @@
|
|||||||
/>
|
/>
|
||||||
{:else if activeView === 'settings'}
|
{:else if activeView === 'settings'}
|
||||||
<SettingsView
|
<SettingsView
|
||||||
onBack={goBack}
|
onBack={navGoBack}
|
||||||
onLogout={handleLogout}
|
onLogout={handleLogout}
|
||||||
userName={userInfo?.userName}
|
userName={userInfo?.userName}
|
||||||
subscription={userInfo?.subscription}
|
subscription={userInfo?.subscription}
|
||||||
@@ -1005,7 +993,7 @@
|
|||||||
{:else if activeView === 'album' && selectedAlbum}
|
{:else if activeView === 'album' && selectedAlbum}
|
||||||
<AlbumDetailView
|
<AlbumDetailView
|
||||||
album={selectedAlbum}
|
album={selectedAlbum}
|
||||||
onBack={goBack}
|
onBack={navGoBack}
|
||||||
onArtistClick={() => selectedAlbum?.artistId && handleArtistClick(selectedAlbum.artistId)}
|
onArtistClick={() => selectedAlbum?.artistId && handleArtistClick(selectedAlbum.artistId)}
|
||||||
onTrackPlay={handleAlbumTrackPlay}
|
onTrackPlay={handleAlbumTrackPlay}
|
||||||
onTrackPlayNext={handleAlbumTrackPlayNext}
|
onTrackPlayNext={handleAlbumTrackPlayNext}
|
||||||
@@ -1028,7 +1016,7 @@
|
|||||||
{:else if activeView === 'artist' && selectedArtist}
|
{:else if activeView === 'artist' && selectedArtist}
|
||||||
<ArtistDetailView
|
<ArtistDetailView
|
||||||
artist={selectedArtist}
|
artist={selectedArtist}
|
||||||
onBack={goBack}
|
onBack={navGoBack}
|
||||||
onAlbumClick={handleAlbumClick}
|
onAlbumClick={handleAlbumClick}
|
||||||
onTrackPlay={handleDisplayTrackPlay}
|
onTrackPlay={handleDisplayTrackPlay}
|
||||||
onTrackPlayNext={queueQobuzTrackNext}
|
onTrackPlayNext={queueQobuzTrackNext}
|
||||||
@@ -1050,7 +1038,7 @@
|
|||||||
{:else if activeView === 'playlist' && selectedPlaylistId}
|
{:else if activeView === 'playlist' && selectedPlaylistId}
|
||||||
<PlaylistDetailView
|
<PlaylistDetailView
|
||||||
playlistId={selectedPlaylistId}
|
playlistId={selectedPlaylistId}
|
||||||
onBack={goBack}
|
onBack={navGoBack}
|
||||||
onTrackPlay={handleDisplayTrackPlay}
|
onTrackPlay={handleDisplayTrackPlay}
|
||||||
onTrackPlayNext={queuePlaylistTrackNext}
|
onTrackPlayNext={queuePlaylistTrackNext}
|
||||||
onTrackPlayLater={queuePlaylistTrackLater}
|
onTrackPlayLater={queuePlaylistTrackLater}
|
||||||
|
|||||||
Reference in new issue
Block a user