fix: photo viewer logic to use filtered photos for opening (#161)

Author: ChrAlpha

apps/web/src/components/ui/map/shared/PhotoMarkerPin.tsx

@@ -114,7 +114,7 @@ export const PhotoMarkerPin = ({ marker, isSelected = false, onClick, onClose }:
             <div className="space-y-3 p-4">
               {/* Title with link */}
               <Link
-                to={`/${marker.photo.id}`}
+                to={`/photos/${marker.photo.id}`}
                 target="_blank"
                 className="group/link hover:text-blue flex items-center gap-2 transition-colors"
               >

apps/web/src/pages/(main)/layout.tsx

@@ -1,4 +1,3 @@
-import { photoLoader } from '@afilmory/data'
 import { ScrollArea, ScrollElementContext } from '@afilmory/ui'
 import { useAtomValue, useSetAtom } from 'jotai'
 import { useEffect, useRef } from 'react'
@@ -67,13 +66,6 @@ const useStateRestoreFromUrl = () => {
     triggerOnceRef.current = true
     isRestored = true
 
-    if (photoId) {
-      const photo = photoLoader.getPhotos().find((photo) => photo.id === photoId)
-      if (photo) {
-        openViewer(photoLoader.getPhotos().indexOf(photo))
-      }
-    }
-
     const tagsFromSearchParams = searchParams.get('tags')?.split(',')
     const camerasFromSearchParams = searchParams.get('cameras')?.split(',')
     const lensesFromSearchParams = searchParams.get('lenses')?.split(',')
@@ -96,6 +88,15 @@ const useStateRestoreFromUrl = () => {
         tagFilterMode: tagModeFromSearchParams || prev.tagFilterMode,
       }))
     }
+
+    if (photoId) {
+      const filteredPhotos = getFilteredPhotos()
+      const targetIndex = filteredPhotos.findIndex((photo) => photo.id === photoId)
+
+      if (targetIndex !== -1) {
+        openViewer(targetIndex)
+      }
+    }
   }, [openViewer, photoId, searchParams, setGallerySetting])
 }