sjs/immich
1
0
Fork 0
mirror of https://github.com/samsonjs/immich.git synced 2026-04-27 15:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: asset view navbar onclose (#25087)

Browse source
This commit is contained in:
Jason Rasmussen 2026-01-06 10:41:53 -05:00 committed by GitHub
parent ded980bfc3
commit f0f1687c79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
View file

@ -69,7 +69,6 @@
album?: AlbumResponseDto | null; album?: AlbumResponseDto | null;
person?: PersonResponseDto | null; person?: PersonResponseDto | null;
stack?: StackResponseDto | null; stack?: StackResponseDto | null;
showCloseButton?: boolean;
showSlideshow?: boolean; showSlideshow?: boolean;
onZoomImage: () => void; onZoomImage: () => void;
onCopyImage?: () => Promise<void>; onCopyImage?: () => Promise<void>;
@ -79,7 +78,7 @@
onRunJob: (name: AssetJobName) => void; onRunJob: (name: AssetJobName) => void;
onPlaySlideshow: () => void; onPlaySlideshow: () => void;
// export let showEditorHandler: () => void; // export let showEditorHandler: () => void;
onClose: () => void; onClose?: () => void;
motionPhoto?: Snippet; motionPhoto?: Snippet;
playOriginalVideo: boolean; playOriginalVideo: boolean;
setPlayOriginalVideo: (value: boolean) => void; setPlayOriginalVideo: (value: boolean) => void;
@ -90,7 +89,6 @@
album = null, album = null,
person = null, person = null,
stack = null, stack = null,
showCloseButton = true,
showSlideshow = false, showSlideshow = false,
onZoomImage, onZoomImage,
onCopyImage, onCopyImage,
@ -128,7 +126,7 @@
class="flex h-16 place-items-center justify-between bg-linear-to-b from-black/40 px-3 transition-transform duration-200" class="flex h-16 place-items-center justify-between bg-linear-to-b from-black/40 px-3 transition-transform duration-200"
> >
<div class="dark"> <div class="dark">
{#if showCloseButton} {#if onClose}
<CloseAction {onClose} /> <CloseAction {onClose} />
{/if} {/if}
</div> </div>

9
web/src/lib/components/asset-viewer/asset-viewer.svelte
View file

@ -65,8 +65,7 @@
preAction?: PreAction | undefined; preAction?: PreAction | undefined;
onAction?: OnAction | undefined; onAction?: OnAction | undefined;
onUndoDelete?: OnUndoDelete | undefined; onUndoDelete?: OnUndoDelete | undefined;
showCloseButton?: boolean; onClose?: (asset: AssetResponseDto) => void;
onClose: (asset: AssetResponseDto) => void;
onNext: () => Promise<HasAsset>; onNext: () => Promise<HasAsset>;
onPrevious: () => Promise<HasAsset>; onPrevious: () => Promise<HasAsset>;
onRandom: () => Promise<{ id: string } | undefined>; onRandom: () => Promise<{ id: string } | undefined>;
@ -84,7 +83,6 @@
preAction = undefined, preAction = undefined,
onAction = undefined, onAction = undefined,
onUndoDelete = undefined, onUndoDelete = undefined,
showCloseButton,
onClose, onClose,
onNext, onNext,
onPrevious, onPrevious,
@ -203,7 +201,7 @@
}; };
const closeViewer = () => { const closeViewer = () => {
onClose(asset); onClose?.(asset);
}; };
const closeEditor = () => { const closeEditor = () => {
@ -411,7 +409,6 @@
{album} {album}
{person} {person}
{stack} {stack}
{showCloseButton}
showSlideshow={true} showSlideshow={true}
onZoomImage={zoomToggle} onZoomImage={zoomToggle}
onCopyImage={copyImage} onCopyImage={copyImage}
@ -420,7 +417,7 @@
{onUndoDelete} {onUndoDelete}
onRunJob={handleRunJob} onRunJob={handleRunJob}
onPlaySlideshow={() => ($slideshowState = SlideshowState.PlaySlideshow)} onPlaySlideshow={() => ($slideshowState = SlideshowState.PlaySlideshow)}
onClose={closeViewer} onClose={onClose ? () => onClose(asset) : undefined}
{playOriginalVideo} {playOriginalVideo}
{setPlayOriginalVideo} {setPlayOriginalVideo}
> >

2
web/src/lib/components/share-page/individual-shared-viewer.svelte
View file

@ -146,12 +146,10 @@
{#await import('$lib/components/asset-viewer/asset-viewer.svelte') then { default: AssetViewer }} {#await import('$lib/components/asset-viewer/asset-viewer.svelte') then { default: AssetViewer }}
<AssetViewer <AssetViewer
{asset} {asset}
showCloseButton={false}
onAction={handleAction} onAction={handleAction}
onPrevious={() => Promise.resolve(false)} onPrevious={() => Promise.resolve(false)}
onNext={() => Promise.resolve(false)} onNext={() => Promise.resolve(false)}
onRandom={() => Promise.resolve(undefined)} onRandom={() => Promise.resolve(undefined)}
onClose={() => {}}
/> />
{/await} {/await}
{/await} {/await}