helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-07 17:27:20 +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

12
web/src/lib/components/photos-page/actions/add-to-album.svelte
View file

@ -10,7 +10,6 @@
import { AlbumResponseDto, api } from '@api';
import { getMenuContext } from '../asset-select-context-menu.svelte';
import { getAssetControlContext } from '../asset-select-control-bar.svelte';
import { disableShortcut } from '$lib/stores/shortcut.store';
export let shared = false;
let showAlbumPicker = false;
@ -20,13 +19,11 @@
const handleHideAlbumPicker = () => {
showAlbumPicker = false;
$disableShortcut = false;
closeMenu();
};
const handleAddToNewAlbum = (event: CustomEvent) => {
showAlbumPicker = false;
$disableShortcut = false;
const { albumName }: { albumName: string } = event.detail;
const assetIds = Array.from(getAssets()).map((asset) => asset.id);
@ -46,7 +43,6 @@
const handleAddToAlbum = async (event: CustomEvent<{ album: AlbumResponseDto }>) => {
showAlbumPicker = false;
$disableShortcut = false;
const album = event.detail.album;
const assetIds = Array.from(getAssets()).map((asset) => asset.id);
await addAssetsToAlbum(album.id, assetIds);
@ -54,13 +50,7 @@
};
</script>
<MenuOption
on:click={() => {
showAlbumPicker = true;
$disableShortcut = true;
}}
text={shared ? 'Add to Shared Album' : 'Add to Album'}
/>
<MenuOption on:click={() => (showAlbumPicker = true)} text={shared ? 'Add to Shared Album' : 'Add to Album'} />
{#if showAlbumPicker}
<AlbumSelectionModal

4
web/src/lib/components/photos-page/asset-grid.svelte
View file

@ -17,7 +17,7 @@
import Scrollbar from '../shared-components/scrollbar/scrollbar.svelte';
import ShowShortcuts from '../shared-components/show-shortcuts.svelte';
import AssetDateGroup from './asset-date-group.svelte';
import { disableShortcut } from '$lib/stores/shortcut.store';
import { shouldIgnoreShortcut } from '$lib/utils/shortcut';
export let isSelectionMode = false;
export let singleSelect = false;
@ -55,7 +55,7 @@
});
const handleKeyboardPress = (event: KeyboardEvent) => {
if ($isSearchEnabled || $disableShortcut) {
if ($isSearchEnabled || shouldIgnoreShortcut(event)) {
return;
}