Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-11-04 03:27:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* feat(web): restore scroll position on navigating back to search page

* set 0 for scroll X

* lint

* simplify
This commit is contained in:
Alex 2024-08-26 11:26:23 -05:00 committed by GitHub
parent 3ac42edc74
commit edf47dbbd0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
View File

@ -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}