keyboard deprecations

Author: bleonard

App/Mixins/KeyboardListener.js

@@ -1,6 +1,9 @@
 import React from 'react';
-import KeyboardEvents from 'react-native-keyboardevents';
-var KeyboardEventEmitter = KeyboardEvents.Emitter;
+
+import {
+  Keyboard,
+} from 'react-native';
+
 
 var KeyboardListener = {
   getInitialState: function() {
@@ -13,9 +16,13 @@ var KeyboardListener = {
     return this.state.keyboardSpace > 0;
   },
 
-  updateKeyboardSpace: function(frames) {
-    if (this.isMounted() && frames && frames.end) {
-      this.setState({keyboardSpace: frames.end.height});
+  isKeyboardVisible: function() {
+    return this.state.keyboardSpace > 0;
+  },
+
+  updateKeyboardSpace: function(e) {
+    if (this.isMounted() && e && e.endCoordinates) {
+      this.setState({keyboardSpace: e.endCoordinates.height});
     }
   },
 
@@ -25,15 +32,32 @@ var KeyboardListener = {
     }
   },
 
+  // onKeyboardHideCallback: function() {
+  //   // TODO handle case when the keyboard never showed up in the first place
+  //   // Might want to use state to check that it did showed up
+  //   if (this.params.onKeyboardHide) {
+  //     this.params.onKeyboardHide.call(this.originalComponent());
+  //   }
+  // },
+
+
   componentDidMount: function() {
-    KeyboardEventEmitter.on(KeyboardEvents.KeyboardDidShowEvent, this.updateKeyboardSpace);
-    KeyboardEventEmitter.on(KeyboardEvents.KeyboardWillHideEvent, this.resetKeyboardSpace);
+    this._keyboardSubscriptions = [];
+    this._keyboardSubscriptions.push(Keyboard.addListener('keyboardWillShow', this.updateKeyboardSpace));
+    this._keyboardSubscriptions.push(Keyboard.addListener('keyboardDidShow', this.updateKeyboardSpace));
+    this._keyboardSubscriptions.push(Keyboard.addListener('keyboardWillHide', this.resetKeyboardSpace));
+    this._keyboardSubscriptions.push(Keyboard.addListener('keyboardDidHide', this.resetKeyboardSpace));
+    //if (this.params.onKeyboardHide) {
+    //  this._keyboardSubscriptions.push(Keyboard.addListener('keyboardDidHide', this.onKeyboardHideCallback));
+    //}
   },
 
   componentWillUnmount: function() {
-    KeyboardEventEmitter.off(KeyboardEvents.KeyboardDidShowEvent, this.updateKeyboardSpace);
-    KeyboardEventEmitter.off(KeyboardEvents.KeyboardWillHideEvent, this.resetKeyboardSpace);
+    this._keyboardSubscriptions.forEach((subscription) => {
+      subscription.remove();
+    });
   },
+
 };
 
 export default KeyboardListener;