@@ -145,10 +145,13 @@ export function useSpotifyPlayerState(immediateLoad = false) {
145145 const hasBlobArtwork = currentBlobUrl ?. startsWith ( "blob:" ) ;
146146 const incomingTrackName = data . item ?. name ?. toLowerCase ( ) ?. trim ( ) ;
147147 const currentTrackName = currentItem ?. name ?. toLowerCase ( ) ?. trim ( ) ;
148+ const currentItemUri = currentItem ?. uri ;
149+ const incomingItemUri = data . item ?. uri ;
148150 const isSameTrack =
149151 incomingTrackName &&
150152 currentTrackName &&
151- incomingTrackName === currentTrackName ;
153+ incomingTrackName === currentTrackName &&
154+ ( ! incomingItemUri || ! currentItemUri || incomingItemUri === currentItemUri ) ;
152155 const preservedBlobArtwork =
153156 hasBlobArtwork && isSameTrack ? currentBlobUrl : null ;
154157
@@ -159,11 +162,18 @@ export function useSpotifyPlayerState(immediateLoad = false) {
159162 const prevBlobArtwork = prevPlayback ?. item ?. album ?. images ?. [ 0 ] ?. url ;
160163 const hasPrevBlobArtwork = prevBlobArtwork ?. startsWith ( "blob:" ) ;
161164 const prevTrackName = prevPlayback ?. item ?. name ?. toLowerCase ( ) ?. trim ( ) ;
165+ const prevTrackUri = prevPlayback ?. item ?. uri ;
166+ const incomingTrackUri = data . item ?. uri ;
167+ const urisMatch =
168+ prevTrackUri &&
169+ incomingTrackUri &&
170+ prevTrackUri === incomingTrackUri ;
162171 const shouldPreservePrevBlob =
163172 hasPrevBlobArtwork &&
164173 incomingTrackName &&
165174 prevTrackName &&
166- incomingTrackName === prevTrackName ;
175+ incomingTrackName === prevTrackName &&
176+ ( ! incomingTrackUri || ! prevTrackUri || urisMatch ) ;
167177
168178 let itemWithArtwork = data . item ;
169179 if ( shouldPreservePrevBlob && data . item ?. album ?. images ) {
0 commit comments