helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-10-17 18:19:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix back after assetviewer next/prev navigation

Browse source
This commit is contained in:
midzelis 2025-10-11 15:17:31 +00:00
parent 5e0118df01
commit e99a29be5f
1 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
web/src/lib/components/timeline/Timeline.svelte
View file

@ -129,10 +129,6 @@
timelineManager.scrollableElement = scrollableElement; timelineManager.scrollableElement = scrollableElement;
}); });
const scrollToTop = () => {
timelineManager.scrollTo(0);
};
const getAssetHeight = (assetId: string, monthGroup: MonthGroup) => monthGroup.findAssetAbsolutePosition(assetId); const getAssetHeight = (assetId: string, monthGroup: MonthGroup) => monthGroup.findAssetAbsolutePosition(assetId);
const scrollToAssetId = async (assetId: string) => { const scrollToAssetId = async (assetId: string) => {
@ -142,7 +138,6 @@
} }
const height = getAssetHeight(assetId, monthGroup); const height = getAssetHeight(assetId, monthGroup);
timelineManager.scrollTo(height); timelineManager.scrollTo(height);
return true; return true;
}; };
@ -175,7 +170,7 @@
} }
if (!scrolled) { if (!scrolled) {
// if the asset is not found, scroll to the top // if the asset is not found, scroll to the top
scrollToTop(0); timelineManager.scrollToTop(0);
} }
} }
invisible = false; invisible = false;
@ -183,7 +178,9 @@
beforeNavigate(({ from, to }) => { beforeNavigate(({ from, to }) => {
timelineManager.suspendTransitions = true; timelineManager.suspendTransitions = true;
hasNavigatedToOrFromAssetViewer = isAssetViewerRoute(to) || isAssetViewerRoute(from); const toViewer = isAssetViewerRoute(to);
const fromViewer = isAssetViewerRoute(from);
hasNavigatedToOrFromAssetViewer = (toViewer && !fromViewer) || (fromViewer && !toViewer);
}); });
// tri-state boolean // tri-state boolean
@ -237,13 +234,29 @@
} }
}); });
const scrollToSegmentPercentage = (segmentTop: number, segmentHeight: number, monthGroupScrollPercent: number) => { const getMaxScrollPercent = () => {
const topOffset = segmentTop; const totalHeight = timelineManager.timelineHeight + bottomSectionHeight + timelineManager.topSectionHeight;
const maxScrollPercent = timelineManager.maxScrollPercent; return (totalHeight - timelineManager.viewportHeight) / totalHeight;
const delta = segmentHeight * monthGroupScrollPercent; };
const getMaxScroll = () => {
if (!scrollableElement || !timelineElement) {
return 0;
}
return (
timelineManager.topSectionHeight +
bottomSectionHeight +
(timelineElement.clientHeight - scrollableElement.clientHeight)
);
};
const scrollToMonthGroupAndOffset = (monthGroup: MonthGroup, monthGroupScrollPercent: number) => {
const topOffset = monthGroup.top;
const maxScrollPercent = getMaxScrollPercent();
const delta = monthGroup.height * monthGroupScrollPercent;
const scrollToTop = (topOffset + delta) * maxScrollPercent; const scrollToTop = (topOffset + delta) * maxScrollPercent;
timelineManager.scrollTo(scrollToTop); timelineManager.scrollTo(offset);
}; };
// note: don't throttle, debounce, or otherwise make this function async - it causes flicker // note: don't throttle, debounce, or otherwise make this function async - it causes flicker
// this function scrolls the timeline to the specified month group and offset, based on scrubber interaction // this function scrolls the timeline to the specified month group and offset, based on scrubber interaction