From a100a4025e5789cf88f0b58f42007cdbb907d5b6 Mon Sep 17 00:00:00 2001 From: Mees Frensel <33722705+meesfrensel@users.noreply.github.com> Date: Fri, 27 Feb 2026 12:50:06 +0100 Subject: [PATCH] fix(web): handle delete shortcut on shared link page as remove (#26552) --- .../share-page/individual-shared-viewer.svelte | 2 +- .../gallery-viewer/gallery-viewer.svelte | 14 ++++++++++---- .../actions/RemoveFromSharedLinkAction.svelte | 3 +++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/web/src/lib/components/share-page/individual-shared-viewer.svelte b/web/src/lib/components/share-page/individual-shared-viewer.svelte index 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 @@ {/if}
- +
{: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.svelte index 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.svelte index 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 @@ + +