💬 🚀 📚 Abort resetting handler resolution state if it has already been…

… reset
greena13 · May 18, 2019 · 7d5b752 · 7d5b752
1 parent eeabff3
commit 7d5b752
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/lib/strategies/AbstractKeyEventStrategy.js b/src/lib/strategies/AbstractKeyEventStrategy.js
@@ -167,6 +167,14 @@ class AbstractKeyEventStrategy {
    * @protected
    */
   _initHandlerResolutionState() {
+    if (this.keyMaps === null) {
+      /**
+       * If this.keyMaps is already set to null, then the state has already been reset
+       * and we need not do it again
+       */
+      return;
+    }
+
     /**
      * List of mappings from key sequences to handlers that is constructed on-the-fly
      * as key events propagate up the render tree

diff --git a/src/lib/strategies/GlobalKeyEventStrategy.js b/src/lib/strategies/GlobalKeyEventStrategy.js
@@ -73,6 +73,9 @@ class GlobalKeyEventStrategy extends AbstractKeyEventStrategy {
 
     this._updateDocumentHandlers();
 
+    /**
+     * Reset handler resolution state
+     */
     this._initHandlerResolutionState();
 
     this.logger.debug(

diff --git a/test/GlobalHotKeys/MatchingKeyMapAfterRemount.spec.js b/test/GlobalHotKeys/MatchingKeyMapAfterRemount.spec.js
@@ -54,7 +54,7 @@ describe('Matching key map after remount for a GlobalHotKeys component:', functi
     document.body.removeChild(this.reactDiv);
   });
 
-  describe.only('when two GlobalHotKeys components are mounted, unmounted and remounted', () => {
+  describe('when two GlobalHotKeys components are mounted, unmounted and remounted', () => {
     it('then both of their key maps work while they are mounted and not, when they aren\'t (BUG: https://github.com/greena13/react-hotkeys/issues/150)', function() {
       simulant.fire(this.reactDiv, 'keydown', { key: KeyCode.A });
       simulant.fire(this.reactDiv, 'keypress', { key: KeyCode.A });