From 1cb425462a96a5b092cc833a96a4d37a535e67c3 Mon Sep 17 00:00:00 2001
From: Pablo Sichert <mail@pablosichert.com>
Date: Mon, 20 Nov 2017 16:02:58 +0100
Subject: [PATCH] Reset key combo when tab loses focus

Issue #1283
---
 src/components/Shortcuts/ShortcutProvider.js      |  7 +++++++
 src/components/Shortcuts/ShortcutProvider.test.js | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/Shortcuts/ShortcutProvider.js b/src/components/Shortcuts/ShortcutProvider.js
index 7ce753d0d..ee2de3006 100644
--- a/src/components/Shortcuts/ShortcutProvider.js
+++ b/src/components/Shortcuts/ShortcutProvider.js
@@ -30,11 +30,13 @@ export default class ShortcutProvider extends Component {
     componentWillMount() {
         document.addEventListener('keydown', this.handleKeyDown);
         document.addEventListener('keyup', this.handleKeyUp);
+        window.addEventListener('blur', this.handleBlur);
     }
 
     componentWillUnmount() {
         document.removeEventListener('keydown', this.handleKeyDown);
         document.removeEventListener('keyup', this.handleKeyUp);
+        window.removeEventListener('blur', this.handleBlur);
     }
 
     handleKeyDown = event => {
@@ -76,6 +78,11 @@ export default class ShortcutProvider extends Component {
         this.fired = {};
     };
 
+    handleBlur = () => {
+        this.keySequence = [];
+        this.fired = {};
+    };
+
     subscribe = (name, handler) => {
         const { hotkeys, keymap } = this.props;
 
diff --git a/src/components/Shortcuts/ShortcutProvider.test.js b/src/components/Shortcuts/ShortcutProvider.test.js
index bc0c2591f..c2837ca09 100644
--- a/src/components/Shortcuts/ShortcutProvider.test.js
+++ b/src/components/Shortcuts/ShortcutProvider.test.js
@@ -27,7 +27,7 @@ describe('ShortcutProvider', () => {
     it('should clean up event listeners', () => {
         const listeners = [];
 
-        global.document = {
+        const listenerAPI = {
             addEventListener: (event, handler) => {
                 listeners.push([event, handler]);
             },
@@ -52,6 +52,9 @@ describe('ShortcutProvider', () => {
             }
         };
 
+        global.document = listenerAPI;
+        global.window = listenerAPI;
+
         try {
             const shortcutProvider = new ShortcutProvider;
 
@@ -64,6 +67,7 @@ describe('ShortcutProvider', () => {
             throw error;
         } finally {
             delete global.document;
+            delete global.window;
         }
     });
 
@@ -316,7 +320,7 @@ describe('ShortcutProvider', () => {
         });
     });
 
-    describe('handleKeyUp', () => {
+    describe('handleBlur', () => {
         it('should reset key sequence', () => {
             const shortcutProvider = new ShortcutProvider;
 
@@ -327,7 +331,7 @@ describe('ShortcutProvider', () => {
 
             shortcutProvider.keySequence = [ key1, key2, key3, key4 ];
 
-            shortcutProvider.handleKeyUp();
+            shortcutProvider.handleBlur();
 
             expect(shortcutProvider.keySequence).to.deep.equal([]);
             expect(shortcutProvider.fired).to.deep.equal({});