High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(web): show correct assets in memory gallery (#26157)
Michel Heusschen1cf3a8084050
diff --git a/web/src/lib/components/memory-page/memory-viewer.svelte b/web/src/lib/components/memory-page/memory-viewer.svelteindex 304b5b278e..efa425dd30 100644--- a/web/src/lib/components/memory-page/memory-viewer.svelte+++ b/web/src/lib/components/memory-page/memory-viewer.svelte@@ -68,7 +68,8 @@let currentMemoryAssetFull = $derived.by(async () =>current?.asset ? await getAssetInfo({ ...authManager.params, id: current.asset.id }) : undefined,);- let currentTimelineAssets = $derived([+ let currentTimelineAssets = $derived(current?.memory.assets ?? []);+ let viewerAssets = $derived([...(current?.previousMemory?.assets ?? []),...(current?.memory.assets ?? []),...(current?.nextMemory?.assets ?? []),@@ -657,6 +658,7 @@><GalleryViewerassets={currentTimelineAssets}+ {viewerAssets}viewport={galleryViewport}{assetInteraction}slidingWindowOffset={viewerHeight}diff --git a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelteindex bdcacdf0ce..c44ded9b9c 100644--- a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte+++ b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte@@ -34,6 +34,7 @@type Props = {assets: AssetResponseDto[];+ viewerAssets?: AssetResponseDto[];assetInteraction: AssetInteraction;disableAssetSelect?: boolean;showArchiveIcon?: boolean;@@ -48,6 +49,7 @@let {assets = $bindable(),+ viewerAssets,assetInteraction,disableAssetSelect = false,showArchiveIcon = false,@@ -61,6 +63,7 @@}: Props = $props();let { isViewing: isViewerOpen, asset: viewingAsset } = assetViewingStore;+ const navigationAssets = $derived(viewerAssets ?? assets);const geometry = $derived(getJustifiedLayoutFromAssets(assets, {@@ -282,12 +285,12 @@);const handleRandom = async (): Promise<{ id: string } | undefined> => {- if (assets.length === 0) {+ if (navigationAssets.length === 0) {return;}try {- const randomIndex = Math.floor(Math.random() * assets.length);- const asset = assets[randomIndex];+ const randomIndex = Math.floor(Math.random() * navigationAssets.length);+ const asset = navigationAssets[randomIndex];await navigateToAsset(asset);return asset;@@ -344,8 +347,8 @@const assetCursor = $derived({current: $viewingAsset,- nextAsset: getNextAsset(assets, $viewingAsset),- previousAsset: getPreviousAsset(assets, $viewingAsset),+ nextAsset: getNextAsset(navigationAssets, $viewingAsset),+ previousAsset: getPreviousAsset(navigationAssets, $viewingAsset),});</script>