diff --git a/app/hooks/trackplayer.ts b/app/hooks/trackplayer.ts index 8341f37..443c22e 100644 --- a/app/hooks/trackplayer.ts +++ b/app/hooks/trackplayer.ts @@ -246,11 +246,16 @@ export const useSetQueue = () => { export const useIsPlaying = () => { const queueContextId = useStore(selectTrackPlayer.queueContextId) const currentTrackIdx = useStore(selectTrackPlayer.currentTrackIdx) + const shuffleOrder = useStore(selectTrackPlayer.shuffleOrder) return (contextId: string | undefined, track: number) => { if (contextId === undefined) { return track === currentTrackIdx } + if (shuffleOrder) { + const shuffledTrack = shuffleOrder.findIndex(i => i === track) + track = shuffledTrack !== undefined ? shuffledTrack : -1 + } return contextId === queueContextId && track === currentTrackIdx } }