github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-05-18 03:10:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): timeline scroll when pressing back from stacked asset (#28163)

Browse Source
This commit is contained in:
Snowknight26
2026-04-30 04:39:34 -05:00
committed by GitHub
parent bf32864644
commit 65bd0a9320
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/lib/components/asset-viewer/AssetViewer.svelte
+3 -3
View File
@@ -67,7 +67,7 @@
preAction?: PreAction; preAction?: PreAction;
onAction?: OnAction; onAction?: OnAction;
onUndoDelete?: OnUndoDelete; onUndoDelete?: OnUndoDelete;
onClose?: (asset: AssetResponseDto) => void; onClose?: (assetId: string) => void;
onRemoveFromAlbum?: (assetIds: string[]) => void; onRemoveFromAlbum?: (assetIds: string[]) => void;
onRandom?: () => Promise<{ id: string } | undefined>; onRandom?: () => Promise<{ id: string } | undefined>;
} }
@@ -179,7 +179,7 @@
}); });
const closeViewer = () => { const closeViewer = () => {
onClose?.(asset); onClose?.(asset.id);
}; };
const closeEditor = async () => { const closeEditor = async () => {
@@ -474,7 +474,7 @@
onAction={handleAction} onAction={handleAction}
{onUndoDelete} {onUndoDelete}
onPlaySlideshow={() => ($slideshowState = SlideshowState.PlaySlideshow)} onPlaySlideshow={() => ($slideshowState = SlideshowState.PlaySlideshow)}
onClose={onClose ? () => onClose(asset) : undefined} onClose={onClose ? () => onClose(stack?.primaryAssetId ?? asset.id) : undefined}
{onRemoveFromAlbum} {onRemoveFromAlbum}
{playOriginalVideo} {playOriginalVideo}
{setPlayOriginalVideo} {setPlayOriginalVideo}
web/src/lib/components/timeline/TimelineAssetViewer.svelte
+4 -4
View File
@@ -96,9 +96,9 @@
return { id: randomAsset.id }; return { id: randomAsset.id };
}; };
const handleClose = async (asset: { id: string }) => { const handleClose = async (assetId: string) => {
invisible = true; invisible = true;
assetViewerManager.gridScrollTarget = { at: asset.id }; assetViewerManager.gridScrollTarget = { at: assetId };
await navigate({ await navigate({
targetRoute: 'current', targetRoute: 'current',
assetId: null, assetId: null,
@@ -117,7 +117,7 @@
// eslint-disable-next-line @typescript-eslint/no-unused-expressions // eslint-disable-next-line @typescript-eslint/no-unused-expressions
(await navigateToAsset(assetCursor?.nextAsset)) || (await navigateToAsset(assetCursor?.nextAsset)) ||
(await navigateToAsset(assetCursor?.previousAsset)) || (await navigateToAsset(assetCursor?.previousAsset)) ||
(await handleClose(assetCursor.current)); (await handleClose(assetCursor.current.id));
}; };
const handlePreAction = async (action: Action) => { const handlePreAction = async (action: Action) => {
@@ -136,7 +136,7 @@
// eslint-disable-next-line @typescript-eslint/no-unused-expressions // eslint-disable-next-line @typescript-eslint/no-unused-expressions
(await navigateToAsset(assetCursor?.nextAsset)) || (await navigateToAsset(assetCursor?.nextAsset)) ||
(await navigateToAsset(assetCursor?.previousAsset)) || (await navigateToAsset(assetCursor?.previousAsset)) ||
(await handleClose(action.asset)); (await handleClose(action.asset.id));
break; break;
} }