High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(web): Duplicate arrow shortcuts go to next/previous duplicate when viewing assets (#21200)
xCJPECKOVERxd9d8beb92fb3
diff --git a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelteindex 86c76a461f..adc0f679cb 100644--- a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -11,6 +11,7 @@import { AppRoute } from '$lib/constants';import DuplicatesInformationModal from '$lib/modals/DuplicatesInformationModal.svelte';import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';+ import { assetViewingStore } from '$lib/stores/asset-viewing.store';import { locale } from '$lib/stores/preferences.store';import { featureFlags } from '$lib/stores/server-config.store';import { stackAssets } from '$lib/utils/asset-utils';@@ -60,6 +61,7 @@};let duplicates = $state(data.duplicates);+ const { isViewing: showAssetViewer } = assetViewingStore;const correctDuplicatesIndex = (index: number) => {return Math.max(0, Math.min(index, duplicates.length - 1));@@ -189,9 +191,21 @@const handlePrevious = async () => {await correctDuplicatesIndexAndGo(Math.max(duplicatesIndex - 1, 0));};+ const handlePreviousShortcut = async () => {+ if ($showAssetViewer) {+ return;+ }+ await handlePrevious();+ };const handleNext = async () => {await correctDuplicatesIndexAndGo(Math.min(duplicatesIndex + 1, duplicates.length - 1));};+ const handleNextShortcut = async () => {+ if ($showAssetViewer) {+ return;+ }+ await handleNext();+ };const handleLast = async () => {await correctDuplicatesIndexAndGo(duplicates.length - 1);};@@ -203,8 +217,8 @@<svelte:documentuse:shortcuts={[- { shortcut: { key: 'ArrowLeft' }, onShortcut: handlePrevious },- { shortcut: { key: 'ArrowRight' }, onShortcut: handleNext },+ { shortcut: { key: 'ArrowLeft' }, onShortcut: handlePreviousShortcut },+ { shortcut: { key: 'ArrowRight' }, onShortcut: handleNextShortcut },]}/>