mirror of
https://github.com/immich-app/immich.git
synced 2025-05-31 20:25:32 -04:00
feat(web): add ctrl+a / ctrl+d shortcuts to select / deselect all assets (#8105)
* feat(web): use ctrl+a / ctrl+d to select / deselect all assets * fix(web): use shortcutList for ctrl+a / ctrl+d * fix(web): remove useless get() * feat(web): asset interaction store can now select many assets at once
This commit is contained in:
parent
b588a87d4a
commit
4de0b2f44e
@ -1,42 +1,24 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte';
|
import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte';
|
||||||
import type { AssetInteractionStore } from '$lib/stores/asset-interaction.store';
|
import type { AssetInteractionStore } from '$lib/stores/asset-interaction.store';
|
||||||
import { BucketPosition, type AssetStore, isSelectAllCancelled } from '$lib/stores/assets.store';
|
import { type AssetStore, isSelectingAllAssets } from '$lib/stores/assets.store';
|
||||||
import { handleError } from '$lib/utils/handle-error';
|
import { mdiSelectAll, mdiTimerSand } from '@mdi/js';
|
||||||
import { get } from 'svelte/store';
|
import { selectAllAssets } from '$lib/utils/asset-utils';
|
||||||
import { mdiTimerSand, mdiSelectAll } from '@mdi/js';
|
|
||||||
|
|
||||||
export let assetStore: AssetStore;
|
export let assetStore: AssetStore;
|
||||||
export let assetInteractionStore: AssetInteractionStore;
|
export let assetInteractionStore: AssetInteractionStore;
|
||||||
|
|
||||||
let selecting = false;
|
|
||||||
|
|
||||||
const handleSelectAll = async () => {
|
const handleSelectAll = async () => {
|
||||||
try {
|
await selectAllAssets(assetStore, assetInteractionStore);
|
||||||
$isSelectAllCancelled = false;
|
};
|
||||||
selecting = true;
|
|
||||||
|
|
||||||
const assetGridState = get(assetStore);
|
const handleCancel = () => {
|
||||||
for (const bucket of assetGridState.buckets) {
|
$isSelectingAllAssets = false;
|
||||||
if ($isSelectAllCancelled) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
await assetStore.loadBucket(bucket.bucketDate, BucketPosition.Unknown);
|
|
||||||
for (const asset of bucket.assets) {
|
|
||||||
assetInteractionStore.selectAsset(asset);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
selecting = false;
|
|
||||||
} catch (error) {
|
|
||||||
handleError(error, 'Error selecting all assets');
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if selecting}
|
{#if $isSelectingAllAssets}
|
||||||
<CircleIconButton title="Delete" icon={mdiTimerSand} />
|
<CircleIconButton title="Cancel" icon={mdiTimerSand} on:click={handleCancel} />
|
||||||
{/if}
|
{:else}
|
||||||
{#if !selecting}
|
|
||||||
<CircleIconButton title="Select all" icon={mdiSelectAll} on:click={handleSelectAll} />
|
<CircleIconButton title="Select all" icon={mdiSelectAll} on:click={handleSelectAll} />
|
||||||
{/if}
|
{/if}
|
||||||
|
@ -3,12 +3,12 @@
|
|||||||
import { AppRoute, AssetAction } from '$lib/constants';
|
import { AppRoute, AssetAction } from '$lib/constants';
|
||||||
import type { AssetInteractionStore } from '$lib/stores/asset-interaction.store';
|
import type { AssetInteractionStore } from '$lib/stores/asset-interaction.store';
|
||||||
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
|
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
|
||||||
import { BucketPosition, type AssetStore, type Viewport } from '$lib/stores/assets.store';
|
import { BucketPosition, isSelectingAllAssets, type AssetStore, type Viewport } from '$lib/stores/assets.store';
|
||||||
import { locale, showDeleteModal } from '$lib/stores/preferences.store';
|
import { locale, showDeleteModal } from '$lib/stores/preferences.store';
|
||||||
import { isSearchEnabled } from '$lib/stores/search.store';
|
import { isSearchEnabled } from '$lib/stores/search.store';
|
||||||
import { featureFlags } from '$lib/stores/server-config.store';
|
import { featureFlags } from '$lib/stores/server-config.store';
|
||||||
import { deleteAssets } from '$lib/utils/actions';
|
import { deleteAssets } from '$lib/utils/actions';
|
||||||
import { shortcuts, type ShortcutOptions, matchesShortcut } from '$lib/utils/shortcut';
|
import { type ShortcutOptions, shortcuts } from '$lib/utils/shortcut';
|
||||||
import { formatGroupTitle, splitBucketIntoDateGroups } from '$lib/utils/timeline-util';
|
import { formatGroupTitle, splitBucketIntoDateGroups } from '$lib/utils/timeline-util';
|
||||||
import type { AlbumResponseDto, AssetResponseDto } from '@immich/sdk';
|
import type { AlbumResponseDto, AssetResponseDto } from '@immich/sdk';
|
||||||
import { DateTime } from 'luxon';
|
import { DateTime } from 'luxon';
|
||||||
@ -20,6 +20,7 @@
|
|||||||
import AssetDateGroup from './asset-date-group.svelte';
|
import AssetDateGroup from './asset-date-group.svelte';
|
||||||
import DeleteAssetDialog from './delete-asset-dialog.svelte';
|
import DeleteAssetDialog from './delete-asset-dialog.svelte';
|
||||||
import { handlePromiseError } from '$lib/utils';
|
import { handlePromiseError } from '$lib/utils';
|
||||||
|
import { selectAllAssets } from '$lib/utils/asset-utils';
|
||||||
|
|
||||||
export let isSelectionMode = false;
|
export let isSelectionMode = false;
|
||||||
export let singleSelect = false;
|
export let singleSelect = false;
|
||||||
@ -93,12 +94,14 @@
|
|||||||
{ shortcut: { key: 'Escape' }, onShortcut: () => dispatch('escape') },
|
{ shortcut: { key: 'Escape' }, onShortcut: () => dispatch('escape') },
|
||||||
{ shortcut: { key: '?', shift: true }, onShortcut: () => (showShortcuts = !showShortcuts) },
|
{ shortcut: { key: '?', shift: true }, onShortcut: () => (showShortcuts = !showShortcuts) },
|
||||||
{ shortcut: { key: '/' }, onShortcut: () => goto(AppRoute.EXPLORE) },
|
{ shortcut: { key: '/' }, onShortcut: () => goto(AppRoute.EXPLORE) },
|
||||||
|
{ shortcut: { key: 'A', ctrl: true }, onShortcut: () => selectAllAssets(assetStore, assetInteractionStore) },
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($isMultiSelectState) {
|
if ($isMultiSelectState) {
|
||||||
shortcuts.push(
|
shortcuts.push(
|
||||||
{ shortcut: { key: 'Delete' }, onShortcut: onDelete },
|
{ shortcut: { key: 'Delete' }, onShortcut: onDelete },
|
||||||
{ shortcut: { key: 'Delete', shift: true }, onShortcut: onForceDelete },
|
{ shortcut: { key: 'Delete', shift: true }, onShortcut: onForceDelete },
|
||||||
|
{ shortcut: { key: 'D', ctrl: true }, onShortcut: () => deselectAllAssets() },
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -202,12 +205,17 @@
|
|||||||
|
|
||||||
let shiftKeyIsDown = false;
|
let shiftKeyIsDown = false;
|
||||||
|
|
||||||
|
const deselectAllAssets = () => {
|
||||||
|
$isSelectingAllAssets = false;
|
||||||
|
assetInteractionStore.clearMultiselect();
|
||||||
|
};
|
||||||
|
|
||||||
const onKeyDown = (event: KeyboardEvent) => {
|
const onKeyDown = (event: KeyboardEvent) => {
|
||||||
if ($isSearchEnabled) {
|
if ($isSearchEnabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (matchesShortcut(event, { key: 'Shift', shift: true })) {
|
if (event.key === 'Shift') {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
shiftKeyIsDown = true;
|
shiftKeyIsDown = true;
|
||||||
}
|
}
|
||||||
@ -218,7 +226,7 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (matchesShortcut(event, { key: 'Shift', shift: false })) {
|
if (event.key === 'Shift') {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
shiftKeyIsDown = false;
|
shiftKeyIsDown = false;
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
import CircleIconButton from '../elements/buttons/circle-icon-button.svelte';
|
import CircleIconButton from '../elements/buttons/circle-icon-button.svelte';
|
||||||
import { fly } from 'svelte/transition';
|
import { fly } from 'svelte/transition';
|
||||||
import { mdiClose } from '@mdi/js';
|
import { mdiClose } from '@mdi/js';
|
||||||
import { isSelectAllCancelled } from '$lib/stores/assets.store';
|
import { isSelectingAllAssets } from '$lib/stores/assets.store';
|
||||||
|
|
||||||
export let showBackButton = true;
|
export let showBackButton = true;
|
||||||
export let backIcon = mdiClose;
|
export let backIcon = mdiClose;
|
||||||
@ -31,7 +31,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleClose = () => {
|
const handleClose = () => {
|
||||||
$isSelectAllCancelled = true;
|
$isSelectingAllAssets = false;
|
||||||
dispatch('close');
|
dispatch('close');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@ import { derived, writable } from 'svelte/store';
|
|||||||
|
|
||||||
export interface AssetInteractionStore {
|
export interface AssetInteractionStore {
|
||||||
selectAsset: (asset: AssetResponseDto) => void;
|
selectAsset: (asset: AssetResponseDto) => void;
|
||||||
|
selectAssets: (assets: AssetResponseDto[]) => void;
|
||||||
removeAssetFromMultiselectGroup: (asset: AssetResponseDto) => void;
|
removeAssetFromMultiselectGroup: (asset: AssetResponseDto) => void;
|
||||||
addGroupToMultiselectGroup: (group: string) => void;
|
addGroupToMultiselectGroup: (group: string) => void;
|
||||||
removeGroupFromMultiselectGroup: (group: string) => void;
|
removeGroupFromMultiselectGroup: (group: string) => void;
|
||||||
@ -76,6 +77,13 @@ export function createAssetInteractionStore(): AssetInteractionStore {
|
|||||||
selectedAssets.set(_selectedAssets);
|
selectedAssets.set(_selectedAssets);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const selectAssets = (assets: AssetResponseDto[]) => {
|
||||||
|
for (const asset of assets) {
|
||||||
|
_selectedAssets.add(asset);
|
||||||
|
}
|
||||||
|
selectedAssets.set(_selectedAssets);
|
||||||
|
};
|
||||||
|
|
||||||
const removeAssetFromMultiselectGroup = (asset: AssetResponseDto) => {
|
const removeAssetFromMultiselectGroup = (asset: AssetResponseDto) => {
|
||||||
_selectedAssets.delete(asset);
|
_selectedAssets.delete(asset);
|
||||||
selectedAssets.set(_selectedAssets);
|
selectedAssets.set(_selectedAssets);
|
||||||
@ -123,6 +131,7 @@ export function createAssetInteractionStore(): AssetInteractionStore {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
selectAsset,
|
selectAsset,
|
||||||
|
selectAssets,
|
||||||
removeAssetFromMultiselectGroup,
|
removeAssetFromMultiselectGroup,
|
||||||
addGroupToMultiselectGroup,
|
addGroupToMultiselectGroup,
|
||||||
removeGroupFromMultiselectGroup,
|
removeGroupFromMultiselectGroup,
|
||||||
|
@ -519,4 +519,4 @@ export class AssetStore {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const isSelectAllCancelled = writable(false);
|
export const isSelectingAllAssets = writable(false);
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
import { notificationController, NotificationType } from '$lib/components/shared-components/notification/notification';
|
import { notificationController, NotificationType } from '$lib/components/shared-components/notification/notification';
|
||||||
|
import type { AssetInteractionStore } from '$lib/stores/asset-interaction.store';
|
||||||
|
import { BucketPosition, isSelectingAllAssets, type AssetStore } from '$lib/stores/assets.store';
|
||||||
import { downloadManager } from '$lib/stores/download';
|
import { downloadManager } from '$lib/stores/download';
|
||||||
import { downloadRequest, getKey } from '$lib/utils';
|
import { downloadRequest, getKey } from '$lib/utils';
|
||||||
import {
|
import {
|
||||||
@ -13,6 +15,7 @@ import {
|
|||||||
type UserResponseDto,
|
type UserResponseDto,
|
||||||
} from '@immich/sdk';
|
} from '@immich/sdk';
|
||||||
import { DateTime } from 'luxon';
|
import { DateTime } from 'luxon';
|
||||||
|
import { get } from 'svelte/store';
|
||||||
import { handleError } from './handle-error';
|
import { handleError } from './handle-error';
|
||||||
|
|
||||||
export const addAssetsToAlbum = async (albumId: string, assetIds: Array<string>): Promise<BulkIdResponseDto[]> =>
|
export const addAssetsToAlbum = async (albumId: string, assetIds: Array<string>): Promise<BulkIdResponseDto[]> =>
|
||||||
@ -224,6 +227,35 @@ export const getSelectedAssets = (assets: Set<AssetResponseDto>, user: UserRespo
|
|||||||
return ids;
|
return ids;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const selectAllAssets = async (assetStore: AssetStore, assetInteractionStore: AssetInteractionStore) => {
|
||||||
|
if (get(isSelectingAllAssets)) {
|
||||||
|
// Selection is already ongoing
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
isSelectingAllAssets.set(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
for (const bucket of assetStore.buckets) {
|
||||||
|
await assetStore.loadBucket(bucket.bucketDate, BucketPosition.Unknown);
|
||||||
|
|
||||||
|
if (!get(isSelectingAllAssets)) {
|
||||||
|
break; // Cancelled
|
||||||
|
}
|
||||||
|
assetInteractionStore.selectAssets(bucket.assets);
|
||||||
|
|
||||||
|
// We use setTimeout to allow the UI to update. Otherwise, this may
|
||||||
|
// cause a long delay between the start of 'select all' and the
|
||||||
|
// effective update of the UI, depending on the number of assets
|
||||||
|
// to select
|
||||||
|
await delay(0);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
handleError(error, 'Error selecting all assets');
|
||||||
|
} finally {
|
||||||
|
isSelectingAllAssets.set(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
export const delay = async (ms: number) => {
|
export const delay = async (ms: number) => {
|
||||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user