Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

feat(viewer): add return route handling in viewer state and close logic

Timothy Yin9963131ea28f
diff --git a/app/pages/[...slug].vue b/app/pages/[...slug].vue
index 281269a0..891758ad 100644
--- a/app/pages/[...slug].vue
+++ b/app/pages/[...slug].vue
@@ -9,8 +9,8 @@ const route = useRoute()
const router = useRouter()
const config = useRuntimeConfig()
-const { switchToIndex, closeViewer, openViewer } = useViewerState()
-const { currentPhotoIndex, isViewerOpen } = storeToRefs(useViewerState())
+const { switchToIndex, closeViewer, openViewer, clearReturnRoute } = useViewerState()
+const { currentPhotoIndex, isViewerOpen, returnRoute } = storeToRefs(useViewerState())
const { photos } = usePhotos()
@@ -84,7 +84,18 @@ const handleIndexChange = (newIndex: number) => {
const handleClose = () => {
closeViewer()
- router.replace('/')
+
+ if (returnRoute.value) {
+ const destination = returnRoute.value
+ clearReturnRoute()
+ router.replace(destination)
+ } else {
+ if (window.history.length > 1) {
+ router.back()
+ } else {
+ router.replace('/')
+ }
+ }
}
</script>
diff --git a/app/stores/viewer.ts b/app/stores/viewer.ts
index 99675c40..dd47c2af 100644
--- a/app/stores/viewer.ts
+++ b/app/stores/viewer.ts
@@ -1,10 +1,14 @@
export const useViewerState = defineStore('photo-viewer-state', () => {
const currentPhotoIndex = ref(0)
const isViewerOpen = ref(false)
+ const returnRoute = ref<string | null>(null)
- const openViewer = (index: number) => {
+ const openViewer = (index: number, route?: string | null) => {
currentPhotoIndex.value = index
isViewerOpen.value = true
+ if (route) {
+ returnRoute.value = route
+ }
}
const switchToIndex = (index: number) => {
@@ -15,11 +19,17 @@ export const useViewerState = defineStore('photo-viewer-state', () => {
isViewerOpen.value = false
}
+ const clearReturnRoute = () => {
+ returnRoute.value = null
+ }
+
return {
currentPhotoIndex,
isViewerOpen,
+ returnRoute,
openViewer,
switchToIndex,
closeViewer,
+ clearReturnRoute,
}
})