helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-10-17 18:19:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(web): disable shortcut when writting (#4057)

Browse source 
* Revert "fix: disable shortcut when writting text (#4053)"

This reverts commit fd6ade2b5d.

* refactor: disable shortcut when writting

* pr feedback

* pr feedback
This commit is contained in:
martin 2023-09-12 16:26:53 +02:00 • committed by GitHub
parent bd226e9e2c
commit a678590ccd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 32 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@
import CircleIconButton from '../elements/buttons/circle-icon-button.svelte';
import Close from 'svelte-material-icons/Close.svelte';
import ProgressBar, { ProgressBarStatus } from '../shared-components/progress-bar/progress-bar.svelte';
import { disableShortcut } from '$lib/stores/shortcut.store';
import { shouldIgnoreShortcut } from '$lib/utils/shortcut';
export let assetStore: AssetStore | null = null;
export let asset: AssetResponseDto;
@ -53,7 +53,7 @@
let shouldShowDownloadButton = sharedLink ? sharedLink.allowDownload : true;
let canCopyImagesToClipboard: boolean;
const onKeyboardPress = (keyInfo: KeyboardEvent) => handleKeyboardPress(keyInfo.key, keyInfo.shiftKey);
const onKeyboardPress = (keyInfo: KeyboardEvent) => handleKeyboardPress(keyInfo);
onMount(async () => {
document.addEventListener('keydown', onKeyboardPress);
@ -89,11 +89,14 @@
}
};
const handleKeyboardPress = (key: string, shiftKey: boolean) => {
if ($disableShortcut) {
const handleKeyboardPress = (event: KeyboardEvent) => {
if (shouldIgnoreShortcut(event)) {
return;
}
const key = event.key;
const shiftKey = event.shiftKey;
switch (key) {
case 'a':
case 'A':
@ -212,13 +215,11 @@
const openAlbumPicker = (shared: boolean) => {
isShowAlbumPicker = true;
$disableShortcut = true;
addToSharedAlbum = shared;
};
const handleAddToNewAlbum = (event: CustomEvent) => {
isShowAlbumPicker = false;
$disableShortcut = false;
const { albumName }: { albumName: string } = event.detail;
api.albumApi.createAlbum({ createAlbumDto: { albumName, assetIds: [asset.id] } }).then((response) => {
@ -229,7 +230,6 @@
const handleAddToAlbum = async (event: CustomEvent<{ album: AlbumResponseDto }>) => {
isShowAlbumPicker = false;
$disableShortcut = false;
const album = event.detail.album;
await addAssetsToAlbum(album.id, [asset.id]);
@ -457,10 +457,7 @@
on:newAlbum={handleAddToNewAlbum}
on:newSharedAlbum={handleAddToNewAlbum}
on:album={handleAddToAlbum}
on:close={() => {
isShowAlbumPicker = false;
$disableShortcut = false;
}}
on:close={() => (isShowAlbumPicker = false)}
/>
{/if}