Merge pull request #48 from pistou/patch-1

Improve unsubscription
react-native-community · Feb 22, 2020 · e448290 · e448290
2 parents 850d595 + c1ffdde
commit e448290
Showing 1 changed file with 11 additions and 22 deletions.
diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts
@@ -30,30 +30,19 @@ export default function useKeyboard() {
   }
 
   useEffect(() => {
-    const keyboardWillShowListener = Keyboard.addListener(
-      'keyboardWillShow',
-      handleKeyboardWillShow,
-    )
-    const keyboardDidShowListener = Keyboard.addListener(
-      'keyboardDidShow',
-      handleKeyboardDidShow,
-    )
-    const keyboardWillHideListener = Keyboard.addListener(
-      'keyboardWillHide',
-      handleKeyboardWillHide,
-    )
-    const keyboardDidHideListener = Keyboard.addListener(
-      'keyboardDidHide',
-      handleKeyboardDidHide,
-    )
+    Keyboard.addListener('keyboardWillShow', handleKeyboardWillShow);
+    Keyboard.addListener('keyboardDidShow', handleKeyboardDidShow);
+    Keyboard.addListener('keyboardWillHide', handleKeyboardWillHide);
+    Keyboard.addListener('keyboardDidHide', handleKeyboardDidHide);
 
     return () => {
-      keyboardWillShowListener.remove()
-      keyboardDidShowListener.remove()
-      keyboardWillHideListener.remove()
-      keyboardDidHideListener.remove()
-    }
-  }, [])
+      Keyboard.removeListener('keyboardWillShow', handleKeyboardWillShow);
+      Keyboard.removeListener('keyboardDidShow', handleKeyboardDidShow);
+      Keyboard.removeListener('keyboardWillHide', handleKeyboardWillHide);
+      Keyboard.removeListener('keyboardDidHide', handleKeyboardDidHide);
+    };
+  }, []);
+
 
   return {
     keyboardShown: shown,