midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Don't ignore escape if a textfield is selected

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-10-09 00:52:06 +02:00
parent 52e6476694
commit dab8d6cd5d
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/UI/Base/Hotkeys.ts
View file

@ -22,7 +22,14 @@ export default class Hotkeys {
}[] }[]
>([]) >([])
private static textElementSelected(): boolean { private static textElementSelected(event: KeyboardEvent): boolean {
if(event.ctrlKey || event.altKey){
// This is an event with a modifier-key, lets not ignore it
return false
}
if(event.key === "Escape"){
return false // Another not-printable character that should not be ignored
}
return ["input", "textarea"].includes(document?.activeElement?.tagName?.toLowerCase()) return ["input", "textarea"].includes(document?.activeElement?.tagName?.toLowerCase())
} }
public static RegisterHotkey( public static RegisterHotkey(
@ -68,7 +75,7 @@ export default class Hotkeys {
}) })
} else if (key["shift"] !== undefined) { } else if (key["shift"] !== undefined) {
document.addEventListener(type, function (event) { document.addEventListener(type, function (event) {
if (Hotkeys.textElementSelected()) { if (Hotkeys.textElementSelected(event)) {
// A text element is selected, we don't do anything special // A text element is selected, we don't do anything special
return return
} }
@ -86,7 +93,7 @@ export default class Hotkeys {
}) })
} else if (key["nomod"] !== undefined) { } else if (key["nomod"] !== undefined) {
document.addEventListener(type, function (event) { document.addEventListener(type, function (event) {
if (Hotkeys.textElementSelected()) { if (Hotkeys.textElementSelected(event)) {
// A text element is selected, we don't do anything special // A text element is selected, we don't do anything special
return return
} }