Skip to content

High performance self-hosted photo and video management solution.

fix(web): timeline renders nothing with an invalid asset scroll target (#16994)

Snowknight26b00da18e8411
diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte
index c32527da89..0526c7bc75 100644
--- a/web/src/lib/components/photos-page/asset-grid.svelte
+++ b/web/src/lib/components/photos-page/asset-grid.svelte
@@ -82,26 +82,33 @@
let bottomSectionHeight = 60;
let leadout = $state(false);
+ const scrollTo = (top: number) => {
+ element?.scrollTo({ top });
+ showSkeleton = false;
+ };
+
+ const scrollToTop = () => {
+ scrollTo(0);
+ };
+
const completeNav = async () => {
- if ($gridScrollTarget?.at) {
+ const scrollTarget = $gridScrollTarget?.at;
+ if (scrollTarget) {
try {
- const bucket = await assetStore.findBucketForAsset($gridScrollTarget.at);
+ const bucket = await assetStore.findBucketForAsset(scrollTarget);
if (bucket) {
- const height = bucket.findAssetAbsolutePosition($gridScrollTarget.at);
+ const height = bucket.findAssetAbsolutePosition(scrollTarget);
if (height) {
- element?.scrollTo({ top: height });
- showSkeleton = false;
+ scrollTo(height);
assetStore.updateIntersections();
+ return;
}
}
} catch {
- element?.scrollTo({ top: 0 });
- showSkeleton = false;
+ // ignore errors - asset may not be in the store
}
- } else {
- element?.scrollTo({ top: 0 });
- showSkeleton = false;
}
+ scrollToTop();
};
beforeNavigate(() => (assetStore.suspendTransitions = true));
afterNavigate((nav) => {
@@ -134,8 +141,7 @@
{ replaceState: true, forceNavigate: true },
);
} else {
- element?.scrollTo({ top: 0 });
- showSkeleton = false;
+ scrollToTop();
}
}, 500);
}