Ensure mousetrap instance exists in unbindShortcut

(cherry picked from commit 930742ae2c69a530afe60f76a5824f2722540df8)
4 years ago · 90e92c0b66
parent 7eac11f57a
commit 90e92c0b66
1 changed files with 4 additions and 2 deletions
--- a/frontend/src/Components/keyboardShortcuts.js
+++ b/frontend/src/Components/keyboardShortcuts.js
@ -67,8 +67,10 @@ function keyboardShortcuts(WrappedComponent) {
    };

    unbindShortcut = (key) => {
-      delete this._mousetrapBindings[key];
-      this._mousetrap.unbind(key);
+      if (this._mousetrap != null) {
+        delete this._mousetrapBindings[key];
+        this._mousetrap.unbind(key);
+      }
    };

    unbindAllShortcuts = () => {