High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(web): handle delete shortcut on shared link page as remove (#26552)
Mees Frensela100a4025e57
diff --git a/web/src/lib/components/share-page/individual-shared-viewer.svelte b/web/src/lib/components/share-page/individual-shared-viewer.svelteindex 8ead288490..94e00500fb 100644--- a/web/src/lib/components/share-page/individual-shared-viewer.svelte+++ b/web/src/lib/components/share-page/individual-shared-viewer.svelte@@ -140,7 +140,7 @@</ControlAppBar>{/if}<section class="my-40 mx-4" bind:clientHeight={viewport.height} bind:clientWidth={viewport.width}>- <GalleryViewer {assets} {assetInteraction} {viewport} />+ <GalleryViewer {assets} {assetInteraction} {viewport} allowDeletion={false} /></section>{:else if assets.length === 1}{#await getAssetInfo({ ...authManager.params, id: assets[0].id }) then asset}diff --git a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelteindex c44ded9b9c..5d1254f8d9 100644--- a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte+++ b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte@@ -45,6 +45,7 @@pageHeaderOffset?: number;slidingWindowOffset?: number;arrowNavigation?: boolean;+ allowDeletion?: boolean;};let {@@ -60,6 +61,7 @@slidingWindowOffset = 0,pageHeaderOffset = 0,arrowNavigation = true,+ allowDeletion = true,}: Props = $props();let { isViewing: isViewerOpen, asset: viewingAsset } = assetViewingStore;@@ -273,11 +275,15 @@if (assetInteraction.selectionActive) {shortcuts.push({ shortcut: { key: 'Escape' }, onShortcut: deselectAllAssets },- { shortcut: { key: 'Delete' }, onShortcut: onDelete },- { shortcut: { key: 'Delete', shift: true }, onShortcut: () => trashOrDelete(true) },- { shortcut: { key: 'D', ctrl: true }, onShortcut: () => deselectAllAssets() },- { shortcut: { key: 'a', shift: true }, onShortcut: toggleArchive },+ { shortcut: { key: 'D', ctrl: true }, onShortcut: deselectAllAssets },);+ if (allowDeletion) {+ shortcuts.push(+ { shortcut: { key: 'Delete' }, onShortcut: onDelete },+ { shortcut: { key: 'Delete', shift: true }, onShortcut: () => trashOrDelete(true) },+ { shortcut: { key: 'a', shift: true }, onShortcut: toggleArchive },+ );+ }}return shortcuts;diff --git a/web/src/lib/components/timeline/actions/RemoveFromSharedLinkAction.svelte b/web/src/lib/components/timeline/actions/RemoveFromSharedLinkAction.svelteindex 2e7d336294..a8497e7309 100644--- a/web/src/lib/components/timeline/actions/RemoveFromSharedLinkAction.svelte+++ b/web/src/lib/components/timeline/actions/RemoveFromSharedLinkAction.svelte@@ -1,4 +1,5 @@<script lang="ts">+ import { shortcut } from '$lib/actions/shortcut';import { handleRemoveSharedLinkAssets } from '$lib/services/shared-link.service';import { getAssetControlContext } from '$lib/utils/context';import { type SharedLinkResponseDto } from '@immich/sdk';@@ -23,6 +24,8 @@};</script>+<svelte:document use:shortcut={{ shortcut: { key: 'Delete' }, onShortcut: handleSelect }} />+<IconButtonshape="round"color="secondary"