fix: keep album views in search tab when navigating from search results

src/screens/Music/index.tsx

@@ -1,18 +1,19 @@
 import React from 'react';
 import { createStackNavigator } from '@react-navigation/stack';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
-import { MusicStackParams } from './types';
-import Albums from './stacks/Albums';
-import Album from './stacks/Album';
-import RecentAlbums from './stacks/RecentAlbums';
 import { THEME_COLOR } from 'CONSTANTS';
 import { t } from '@localisation';
 import useDefaultStyles from 'components/Colors';
-import Playlists from './stacks/Playlists';
-import Playlist from './stacks/Playlist';
+import { StackParams } from 'screens/types';
 import NowPlaying from './overlays/NowPlaying';
 
-const Stack = createStackNavigator<MusicStackParams>();
+import RecentAlbums from './stacks/RecentAlbums';
+import Albums from './stacks/Albums';
+import Album from './stacks/Album';
+import Playlists from './stacks/Playlists';
+import Playlist from './stacks/Playlist';
+
+const Stack = createStackNavigator<StackParams>();
 
 function MusicStack() {
     const defaultStyles = useDefaultStyles();

src/screens/Music/overlays/NowPlaying/index.tsx

@@ -15,7 +15,7 @@ import useDefaultStyles, { ColoredBlurView } from 'components/Colors';
 import { useNavigation } from '@react-navigation/native';
 import { calculateProgressTranslation } from 'components/Progresstrack';
 import { THEME_COLOR } from 'CONSTANTS';
-import { MusicNavigationProp } from 'screens/Music/types';
+import { NavigationProp } from 'screens/types';
 import { ShadowWrapper } from 'components/Shadow';
 import { useBottomTabBarHeight } from '@react-navigation/bottom-tabs';
 
@@ -115,7 +115,7 @@ function NowPlaying() {
     const previousBuffered = usePrevious(buffered);
     const previousPosition = usePrevious(position);
 
-    const navigation = useNavigation<MusicNavigationProp>();
+    const navigation = useNavigation<NavigationProp>();
 
     const bufferAnimation = useRef(new Animated.Value(0));
     const progressAnimation = useRef(new Animated.Value(0));

src/screens/Music/stacks/Albums.tsx

@@ -1,6 +1,5 @@
 import React, { useCallback, useEffect, useRef, ReactText, useMemo } from 'react';
 import { useGetImage } from 'utility/JellyfinApi';
-import { MusicNavigationProp } from '../types';
 import { SafeAreaView, SectionList, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { differenceInDays } from 'date-fns';
@@ -17,6 +16,7 @@ import useDefaultStyles, { ColoredBlurView } from 'components/Colors';
 import { Album } from 'store/music/types';
 import { Text } from 'components/Typography';
 import { ShadowWrapper } from 'components/Shadow';
+import { NavigationProp } from 'screens/types';
 
 const HeadingHeight = 50;
 
@@ -87,7 +87,7 @@ const Albums: React.FC = () => {
     
     // Initialise helpers
     const dispatch = useAppDispatch();
-    const navigation = useNavigation<MusicNavigationProp>();
+    const navigation = useNavigation<NavigationProp>();
     const getImage = useGetImage();
     const listRef = useRef<SectionList<EntityId[]>>(null);
 

src/screens/Music/stacks/Playlists.tsx

@@ -1,6 +1,5 @@
 import React, { useCallback, useEffect, useRef, ReactText } from 'react';
 import { useGetImage } from 'utility/JellyfinApi';
-import { MusicNavigationProp } from '../types';
 import { Text, View, FlatList, ListRenderItem } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { differenceInDays } from 'date-fns';
@@ -11,6 +10,7 @@ import TouchableHandler from 'components/TouchableHandler';
 import AlbumImage, { AlbumItem } from './components/AlbumImage';
 import { EntityId } from '@reduxjs/toolkit';
 import useDefaultStyles from 'components/Colors';
+import { NavigationProp } from 'screens/types';
 
 interface GeneratedAlbumItemProps {
     id: ReactText;
@@ -41,7 +41,7 @@ const Playlists: React.FC = () => {
     
     // Initialise helpers
     const dispatch = useAppDispatch();
-    const navigation = useNavigation<MusicNavigationProp>();
+    const navigation = useNavigation<NavigationProp>();
     const getImage = useGetImage();
     const listRef = useRef<FlatList<EntityId>>(null);
 

src/screens/Music/stacks/RecentAlbums.tsx

@@ -1,6 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
 import { useGetImage } from 'utility/JellyfinApi';
-import { MusicNavigationProp } from '../types';
 import { Text, SafeAreaView, FlatList, StyleSheet } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useAppDispatch, useTypedSelector } from 'store';
@@ -17,6 +16,7 @@ import { Album } from 'store/music/types';
 import Divider from 'components/Divider';
 import styled from 'styled-components/native';
 import { ShadowWrapper } from 'components/Shadow';
+import { NavigationProp } from 'screens/types';
 
 const styles = StyleSheet.create({
     columnWrapper: {
@@ -31,7 +31,7 @@ const HeaderContainer = styled.View`
 `;
 
 const NavigationHeader: React.FC = () => {
-    const navigation = useNavigation<MusicNavigationProp>();
+    const navigation = useNavigation<NavigationProp>();
     const handleAllAlbumsClick = useCallback(() => { navigation.navigate('Albums'); }, [navigation]);
     const handlePlaylistsClick = useCallback(() => { navigation.navigate('Playlists'); }, [navigation]);
     
@@ -59,7 +59,7 @@ const RecentAlbums: React.FC = () => {
     
     // Initialise helpers
     const dispatch = useAppDispatch();
-    const navigation = useNavigation<MusicNavigationProp>();
+    const navigation = useNavigation<NavigationProp>();
     const getImage = useGetImage();
 
     // Set callbacks

src/screens/Music/stacks/components/TrackListView.tsx

@@ -14,7 +14,7 @@ import useDefaultStyles from 'components/Colors';
 import usePlayTracks from 'utility/usePlayTracks';
 import { EntityId } from '@reduxjs/toolkit';
 import { WrappableButtonRow, WrappableButton } from 'components/WrappableButtonRow';
-import { MusicNavigationProp } from 'screens/Music/types';
+import { NavigationProp } from 'screens/types';
 import DownloadIcon from 'components/DownloadIcon';
 import CloudDownArrow from 'assets/icons/cloud-down-arrow.svg';
 import Trash from 'assets/icons/trash.svg';
@@ -89,7 +89,7 @@ const TrackListView: React.FC<TrackListViewProps> = ({
     const getImage = useGetImage();
     const playTracks = usePlayTracks();
     const { track: currentTrack } = useCurrentTrack();
-    const navigation = useNavigation<MusicNavigationProp>();
+    const navigation = useNavigation<NavigationProp>();
     const dispatch = useAppDispatch();
 
     // Setup callbacks
@@ -101,7 +101,7 @@ const TrackListView: React.FC<TrackListViewProps> = ({
         await TrackPlayer.play();
     }, [playTracks, trackIds]);
     const longPressTrack = useCallback((index: number) => { 
-        navigation.navigate('TrackPopupMenu', { trackId: trackIds[index] }); 
+        navigation.navigate('TrackPopupMenu', { trackId: trackIds[index].toString() }); 
     }, [navigation, trackIds]);
     const downloadAllTracks = useCallback(() => {
         trackIds.forEach((trackId) => dispatch(queueTrackForDownload(trackId)));

src/screens/Music/types.ts

@@ -1,14 +0,0 @@
-import { StackNavigationProp } from '@react-navigation/stack';
-import { Album } from 'store/music/types';
-
-export type MusicStackParams = {
-    [key: string]: Record<string, unknown> | undefined;
-    Albums: undefined;
-    Album: { id: string, album: Album };
-    Playlists: undefined;
-    Playlist: { id: string };
-    RecentAlbums: undefined;
-    Search: undefined;
-};
-
-export type MusicNavigationProp = StackNavigationProp<MusicStackParams>;