Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-10-31 10:37:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): paste event in input fields (#12297)

Browse Source
This commit is contained in:
Jason Rasmussen 2024-09-03 23:53:34 -04:00 committed by GitHub
parent c3a8ddaaf2
commit c7ddd0b44a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/lib/actions/shortcut.ts
View File

@ -15,7 +15,7 @@ export type ShortcutOptions<T = HTMLElement> = {
preventDefault?: boolean; preventDefault?: boolean;
}; };
export const shouldIgnoreShortcut = (event: KeyboardEvent): boolean => { export const shouldIgnoreEvent = (event: KeyboardEvent | ClipboardEvent): boolean => {
if (event.target === event.currentTarget) { if (event.target === event.currentTarget) {
return false; return false;
} }
@ -52,7 +52,7 @@ export const shortcuts = <T extends HTMLElement>(
options: ShortcutOptions<T>[], options: ShortcutOptions<T>[],
): ActionReturn<ShortcutOptions<T>[]> => { ): ActionReturn<ShortcutOptions<T>[]> => {
function onKeydown(event: KeyboardEvent) { function onKeydown(event: KeyboardEvent) {
const ignoreShortcut = shouldIgnoreShortcut(event); const ignoreShortcut = shouldIgnoreEvent(event);
for (const { shortcut, onShortcut, ignoreInputFields = true, preventDefault = true } of options) { for (const { shortcut, onShortcut, ignoreInputFields = true, preventDefault = true } of options) {
if (ignoreInputFields && ignoreShortcut) { if (ignoreInputFields && ignoreShortcut) {
continue; continue;

13
web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
View File

@ -1,11 +1,12 @@
<script lang="ts"> <script lang="ts">
import { fade } from 'svelte/transition';
import ImmichLogo from './immich-logo.svelte';
import { page } from '$app/stores'; import { page } from '$app/stores';
import { shouldIgnoreEvent } from '$lib/actions/shortcut';
import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store'; import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
import { fileUploadHandler } from '$lib/utils/file-uploader'; import { fileUploadHandler } from '$lib/utils/file-uploader';
import { isAlbumsRoute, isSharedLinkRoute } from '$lib/utils/navigation'; import { isAlbumsRoute, isSharedLinkRoute } from '$lib/utils/navigation';
import { t } from 'svelte-i18n'; import { t } from 'svelte-i18n';
import { fade } from 'svelte/transition';
import ImmichLogo from './immich-logo.svelte';
$: albumId = isAlbumsRoute($page.route?.id) ? $page.params.albumId : undefined; $: albumId = isAlbumsRoute($page.route?.id) ? $page.params.albumId : undefined;
$: isShare = isSharedLinkRoute($page.route?.id); $: isShare = isSharedLinkRoute($page.route?.id);
@ -29,7 +30,13 @@
await handleDataTransfer(e.dataTransfer); await handleDataTransfer(e.dataTransfer);
}; };
const onPaste = ({ clipboardData }: ClipboardEvent) => handleDataTransfer(clipboardData); const onPaste = (event: ClipboardEvent) => {
if (shouldIgnoreEvent(event)) {
return;
}
return handleDataTransfer(event.clipboardData);
};
const handleDataTransfer = async (dataTransfer?: DataTransfer | null) => { const handleDataTransfer = async (dataTransfer?: DataTransfer | null) => {
if (!dataTransfer) { if (!dataTransfer) {