From 188188a8443bc1c83586ee4a1075a365930a0920 Mon Sep 17 00:00:00 2001 From: Arno <46051866+arnolicious@users.noreply.github.com> Date: Wed, 21 May 2025 18:12:00 +0200 Subject: [PATCH] fix: Change shortcut listeners from window to document (#18416) * fix: Change shortcut listeners to document * fix: split into window and document * chore: upgrade ui package --- web/package-lock.json | 22 +++++++++---------- web/package.json | 2 +- .../components/album-page/album-viewer.svelte | 2 +- .../actions/add-to-album-action.svelte | 2 +- .../actions/archive-action.svelte | 2 +- .../asset-viewer/actions/close-action.svelte | 2 +- .../asset-viewer/actions/delete-action.svelte | 2 +- .../actions/download-action.svelte | 2 +- .../actions/favorite-action.svelte | 2 +- .../actions/next-asset-action.svelte | 2 +- .../actions/previous-asset-action.svelte | 2 +- .../actions/show-detail-action.svelte | 2 +- .../asset-viewer/editor/editor-panel.svelte | 2 +- .../asset-viewer/photo-viewer.svelte | 2 +- .../asset-viewer/slideshow-bar.svelte | 2 +- .../manage-people-visibility.svelte | 2 +- .../memory-page/memory-viewer.svelte | 2 +- .../actions/download-action.svelte | 2 +- .../components/photos-page/asset-grid.svelte | 2 +- .../context-menu/menu-option.svelte | 10 ++++----- .../gallery-viewer/gallery-viewer.svelte | 2 +- .../search-bar/search-bar.svelte | 2 +- .../duplicates-compare-control.svelte | 2 +- .../[[assetId=id]]/+page.svelte | 3 ++- web/src/routes/+layout.svelte | 2 +- 25 files changed, 40 insertions(+), 39 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index c0f441d72c..bcf62268ce 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@formatjs/icu-messageformat-parser": "^2.9.8", "@immich/sdk": "file:../open-api/typescript-sdk", - "@immich/ui": "^0.22.1", + "@immich/ui": "^0.22.2", "@mapbox/mapbox-gl-rtl-text": "0.2.3", "@mdi/js": "^7.4.47", "@photo-sphere-viewer/core": "^5.11.5", @@ -1342,13 +1342,13 @@ "link": true }, "node_modules/@immich/ui": { - "version": "0.22.1", - "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.22.1.tgz", - "integrity": "sha512-/QdqctBit+eX8QZgTL4PlgS7l6/NCGXeDjR6kQNLOVBPhbjkmtwqsvZ+RymYClcHAEhutXOKRhnlQU9mNLC/SA==", + "version": "0.22.2", + "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.22.2.tgz", + "integrity": "sha512-aP9B54i4SqL+y7EzkI1gVhx/qtiSYDOFz6vjn1PyXfCnA0RrE+dxYu/Y7f9PXLX0MPrTro5MxmNC06JjuS/Gow==", "license": "GNU Affero General Public License version 3", "dependencies": { "@mdi/js": "^7.4.47", - "bits-ui": "^1.0.0-next.46", + "bits-ui": "^1.5.3", "tailwind-merge": "^2.5.4", "tailwind-variants": "^1.0.0" }, @@ -1357,9 +1357,9 @@ } }, "node_modules/@internationalized/date": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.8.0.tgz", - "integrity": "sha512-J51AJ0fEL68hE4CwGPa6E0PO6JDaVLd8aln48xFCSy7CZkZc96dGEGmLs2OEEbBxcsVZtfrqkXJwI2/MSG8yKw==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.8.1.tgz", + "integrity": "sha512-PgVE6B6eIZtzf9Gu5HvJxRK3ufUFz9DhspELuhW/N0GuMGMTLvPQNRkHP2hTuP9lblOk+f+1xi96sPiPXANXAA==", "license": "Apache-2.0", "dependencies": { "@swc/helpers": "^0.5.0" @@ -3599,9 +3599,9 @@ "license": "MIT" }, "node_modules/bits-ui": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/bits-ui/-/bits-ui-1.4.8.tgz", - "integrity": "sha512-j34GsdSsJ+ZBl9h/70VkufvrlEgTKQSZvm80eM5VvuhLJWvpfEpn9+k0FVmtDQl9NSPgEVtI9imYhm8nW9Nj/w==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/bits-ui/-/bits-ui-1.5.3.tgz", + "integrity": "sha512-BTZ9/GU11DaEGyQp+AY+sXCMLZO0gbDC5J8l7+Ngj4Vf6hNOwrpMmoh5iuKktA6cphXYolVkUDgBWmkh415I+w==", "license": "MIT", "dependencies": { "@floating-ui/core": "^1.6.4", diff --git a/web/package.json b/web/package.json index 3f94ebbc73..96b3189d4b 100644 --- a/web/package.json +++ b/web/package.json @@ -28,7 +28,7 @@ "dependencies": { "@formatjs/icu-messageformat-parser": "^2.9.8", "@immich/sdk": "file:../open-api/typescript-sdk", - "@immich/ui": "^0.22.1", + "@immich/ui": "^0.22.2", "@mapbox/mapbox-gl-rtl-text": "0.2.3", "@mdi/js": "^7.4.47", "@photo-sphere-viewer/core": "^5.11.5", diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index 227fb999b8..f8a38d9e67 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -48,7 +48,7 @@ }); - { diff --git a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte index 4ebe9d002a..0fbd1c8529 100644 --- a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte +++ b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte @@ -36,7 +36,7 @@ }; - (showSelectionModal = true) }} /> diff --git a/web/src/lib/components/asset-viewer/actions/archive-action.svelte b/web/src/lib/components/asset-viewer/actions/archive-action.svelte index 362a0a693a..c4936d21d0 100644 --- a/web/src/lib/components/asset-viewer/actions/archive-action.svelte +++ b/web/src/lib/components/asset-viewer/actions/archive-action.svelte @@ -28,7 +28,7 @@ }; - + - + diff --git a/web/src/lib/components/asset-viewer/actions/delete-action.svelte b/web/src/lib/components/asset-viewer/actions/delete-action.svelte index 90322c00f0..99a9461528 100644 --- a/web/src/lib/components/asset-viewer/actions/delete-action.svelte +++ b/web/src/lib/components/asset-viewer/actions/delete-action.svelte @@ -73,7 +73,7 @@ }; - trashOrDelete(asset.isTrashed) }, { shortcut: { key: 'Delete', shift: true }, onShortcut: () => trashOrDelete(true) }, diff --git a/web/src/lib/components/asset-viewer/actions/download-action.svelte b/web/src/lib/components/asset-viewer/actions/download-action.svelte index c32766a725..1dfcc8b0f6 100644 --- a/web/src/lib/components/asset-viewer/actions/download-action.svelte +++ b/web/src/lib/components/asset-viewer/actions/download-action.svelte @@ -19,7 +19,7 @@ const onDownloadFile = async () => downloadFile(await getAssetInfo({ id: asset.id, key: authManager.key })); - + {#if !menuItem} diff --git a/web/src/lib/components/asset-viewer/actions/favorite-action.svelte b/web/src/lib/components/asset-viewer/actions/favorite-action.svelte index bb1a9343d9..3c6c7d7621 100644 --- a/web/src/lib/components/asset-viewer/actions/favorite-action.svelte +++ b/web/src/lib/components/asset-viewer/actions/favorite-action.svelte @@ -46,7 +46,7 @@ }; - + - - - + diff --git a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte index 28ca71c806..eee76f4db5 100644 --- a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte +++ b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte @@ -40,7 +40,7 @@ const onConfirm = () => (typeof $showCancelConfirmDialog === 'boolean' ? null : $showCancelConfirmDialog()); - +
diff --git a/web/src/lib/components/asset-viewer/photo-viewer.svelte b/web/src/lib/components/asset-viewer/photo-viewer.svelte index bb817494de..cf846e7af6 100644 --- a/web/src/lib/components/asset-viewer/photo-viewer.svelte +++ b/web/src/lib/components/asset-viewer/photo-viewer.svelte @@ -202,7 +202,7 @@ let containerHeight = $state(0); - - - +
- - + {#if menuItem} diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte index 84bded9f4b..7b45019ec3 100644 --- a/web/src/lib/components/photos-page/asset-grid.svelte +++ b/web/src/lib/components/photos-page/asset-grid.svelte @@ -712,7 +712,7 @@ }); - + {#if isShowDeleteConfirmation} - import Icon from '$lib/components/elements/icon.svelte'; - import { generateId } from '$lib/utils/generate-id'; - import { optionClickCallbackStore, selectedIdStore } from '$lib/stores/context-menu.store'; import type { Shortcut } from '$lib/actions/shortcut'; - import { shortcutLabel as computeShortcutLabel, shortcut as bindShortcut } from '$lib/actions/shortcut'; + import { shortcut as bindShortcut, shortcutLabel as computeShortcutLabel } from '$lib/actions/shortcut'; + import Icon from '$lib/components/elements/icon.svelte'; + import { optionClickCallbackStore, selectedIdStore } from '$lib/stores/context-menu.store'; + import { generateId } from '$lib/utils/generate-id'; interface Props { text: string; @@ -44,7 +44,7 @@ : () => {}; - + 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 16bb364fb8..6b0a25a84b 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 @@ -446,7 +446,7 @@ }); - - input?.select() }, diff --git a/web/src/lib/components/utilities-page/duplicates/duplicates-compare-control.svelte b/web/src/lib/components/utilities-page/duplicates/duplicates-compare-control.svelte index dbfc2bdac7..c08abe106d 100644 --- a/web/src/lib/components/utilities-page/duplicates/duplicates-compare-control.svelte +++ b/web/src/lib/components/utilities-page/duplicates/duplicates-compare-control.svelte @@ -98,7 +98,7 @@ }; - - + +
{#if assetInteraction.selectionActive} diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte index 3a6320a265..c9e91f3beb 100644 --- a/web/src/routes/+layout.svelte +++ b/web/src/routes/+layout.svelte @@ -101,7 +101,7 @@ {/if} - copyToClipboard(getMyImmichLink().toString()),