1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-01-04 02:46:47 +01:00

fix(web): Prevent DELETE key from clearing DateInput in modal (#8846)

* fix(web): Prevent DELETE key from clearing DateInput in modal (#8804)

* chore: test prettier

* fix: stop propagation

* fix: stop propagation in modal

* fix: remove unnecessary function and revise lint issue

* chore: cleanup

---------

Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
This commit is contained in:
Yoonjae Choi 2024-04-30 06:59:32 +09:00 committed by GitHub
parent 5722c830ff
commit 461f2595b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 31 additions and 38 deletions

View file

@ -53,16 +53,9 @@
dispatch('confirm', value); dispatch('confirm', value);
} }
}; };
const handleKeydown = (event: KeyboardEvent) => {
if (['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(event.key)) {
event.stopPropagation();
}
};
</script> </script>
<div role="presentation" on:keydown={handleKeydown}> <ConfirmDialogue
<ConfirmDialogue
id="edit-date-time-modal" id="edit-date-time-modal"
confirmColor="primary" confirmColor="primary"
title="Edit date and time" title="Edit date and time"
@ -70,7 +63,7 @@
disabled={!date.isValid} disabled={!date.isValid}
onConfirm={handleConfirm} onConfirm={handleConfirm}
onClose={handleCancel} onClose={handleCancel}
> >
<div class="flex flex-col text-md px-4 text-center gap-2" slot="prompt"> <div class="flex flex-col text-md px-4 text-center gap-2" slot="prompt">
<div class="flex flex-col"> <div class="flex flex-col">
<label for="datetime">Date and Time</label> <label for="datetime">Date and Time</label>
@ -91,5 +84,4 @@
/> />
</div> </div>
</div> </div>
</ConfirmDialogue> </ConfirmDialogue>
</div>

View file

@ -45,6 +45,7 @@
<FocusTrap> <FocusTrap>
<section <section
role="presentation"
in:fade={{ duration: 100 }} in:fade={{ duration: 100 }}
out:fade={{ duration: 100 }} out:fade={{ duration: 100 }}
class="fixed left-0 top-0 z-[9990] flex h-screen w-screen place-content-center place-items-center bg-black/40" class="fixed left-0 top-0 z-[9990] flex h-screen w-screen place-content-center place-items-center bg-black/40"

View file

@ -20,7 +20,7 @@ export const shouldIgnoreShortcut = (event: KeyboardEvent): boolean => {
return false; return false;
} }
const type = (event.target as HTMLInputElement).type; const type = (event.target as HTMLInputElement).type;
return ['textarea', 'text'].includes(type); return ['textarea', 'text', 'date', 'datetime-local'].includes(type);
}; };
export const matchesShortcut = (event: KeyboardEvent, shortcut: Shortcut) => { export const matchesShortcut = (event: KeyboardEvent, shortcut: Shortcut) => {