Skip to content

High performance self-hosted photo and video management solution.

feat(web): restore scroll position on navigating back to search page (#12042)

Alexedf47dbbd008
diff --git a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
index cd4def1765..da85eb49c8 100644
--- a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -40,6 +40,7 @@
import AlbumCardGroup from '$lib/components/album-page/album-card-group.svelte';
import { isAlbumsRoute, isPeopleRoute } from '$lib/utils/navigation';
import { t } from 'svelte-i18n';
+ import { afterUpdate, tick } from 'svelte';
const MAX_ASSET_COUNT = 5000;
let { isViewing: showAssetViewer } = assetViewingStore;
@@ -54,6 +55,8 @@
let searchResultAlbums: AlbumResponseDto[] = [];
let searchResultAssets: AssetResponseDto[] = [];
let isLoading = true;
+ let scrollY = 0;
+ let scrollYHistory = 0;
const onEscape = () => {
if ($showAssetViewer) {
@@ -70,6 +73,13 @@
$preventRaceConditionSearchBar = false;
};
+ // save and restore scroll position
+ afterUpdate(() => {
+ if (scrollY) {
+ scrollYHistory = scrollY;
+ }
+ });
+
afterNavigate(({ from }) => {
// Prevent setting previousRoute to the current page.
if (from?.url && from.route.id !== $page.route.id) {
@@ -84,6 +94,14 @@
if (isAlbumsRoute(route)) {
previousRoute = AppRoute.EXPLORE;
}
+
+ tick()
+ .then(() => {
+ window.scrollTo(0, scrollYHistory);
+ })
+ .catch(() => {
+ // do nothing
+ });
});
let selectedAssets: Set<AssetResponseDto> = new Set();
@@ -203,7 +221,7 @@
}
</script>
-<svelte:window use:shortcut={{ shortcut: { key: 'Escape' }, onShortcut: onEscape }} />
+<svelte:window use:shortcut={{ shortcut: { key: 'Escape' }, onShortcut: onEscape }} bind:scrollY />
<section>
{#if isMultiSelectionMode}