feat(EscapeKey): Only accept ESC key if it was pressed while the app …

…had focus quasarframework#7335
pdanpdan · Jul 8, 2020 · eac838a · eac838a
1 parent b711db5
commit eac838a
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/ui/src/utils/escape-key.js b/ui/src/utils/escape-key.js
@@ -1,13 +1,24 @@
 import { isKeyCode } from './key-composition.js'
 
 let handlers = []
+let escDown = false
 
 export default {
   __install () {
     this.__installed = true
+    window.addEventListener('keydown', evt => {
+      escDown = evt.keyCode === 27
+    })
+    window.addEventListener('blur', () => {
+      escDown === true && (escDown = false)
+    })
     window.addEventListener('keyup', evt => {
-      if (handlers.length !== 0 && isKeyCode(evt, 27) === true) {
-        handlers[handlers.length - 1].fn(evt)
+      if (escDown === true) {
+        escDown = false
+
+        if (handlers.length !== 0 && isKeyCode(evt, 27) === true) {
+          handlers[handlers.length - 1].fn(evt)
+        }
       }
     })
   },