Merge pull request #110 from streamich/fix-keyboardjs

fix: 🐛 better async loading for keyboardjs
streamich · Feb 19, 2019 · e795f6e · e795f6e
2 parents 72867fd + 2096bae
commit e795f6e
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/useKeyPress.ts b/src/useKeyPress.ts
@@ -11,14 +11,11 @@ const defaults: Options = {
 
 const useKeyPress = (targetKey: string, config: Options = defaults) => {
   const [state, setState] = useState(false);
-  const { useKeyboardJS } = config;
-
-  let keyboardjs;
+  const [keyboardjs, setKeyboardJs] = useState<any>(null);
+  const {useKeyboardJS} = config;
 
   if (useKeyboardJS) {
-    import("keyboardjs").then(module => {
-      keyboardjs = module;
-    });
+    import("keyboardjs").then(setKeyboardJs);
   }
 
   const regularDownHandler = ({ key }: KeyboardEvent) => {
@@ -42,20 +39,24 @@ const useKeyPress = (targetKey: string, config: Options = defaults) => {
 
   useEffect(() => {
     if (useKeyboardJS) {
-      keyboardjs.bind(targetKey, customDownHandler, customUpHandler);
+      if (keyboardjs) {
+        keyboardjs.bind(targetKey, customDownHandler, customUpHandler);
+      }
     } else {
       window.addEventListener("keydown", regularDownHandler);
       window.addEventListener("keyup", regularUpHandler);
     }
     return () => {
       if (useKeyboardJS) {
-        keyboardjs.unbind(targetKey, customDownHandler, customUpHandler);
+        if (keyboardjs) {
+          keyboardjs.unbind(targetKey, customDownHandler, customUpHandler);
+        }
       } else {
         window.removeEventListener("keydown", regularDownHandler);
         window.removeEventListener("keyup", regularUpHandler);
       }
     };
-  }, [targetKey, useKeyPress]);
+  }, [targetKey, useKeyPress, keyboardjs]);
 
   return state;
 };