fix enableAutoAutomaticScroll prop (#215)

* fix enableAutoAutomaticScroll prop

* update enableAutoAutomaticScroll prop name to enableAutomaticScroll

* fix prettier formatting

Author: antoinegrelard

README.md

@@ -111,7 +111,7 @@ Android Support is not perfect, here is the supported list:
 |----------|-----------------|
 | `viewIsInsideTabBar` | Yes |
 | `resetScrollToCoords` | Yes |
-| `enableAutoAutomaticScroll` | Yes |
+| `enableAutomaticScroll` | Yes |
 | `extraHeight` | Yes |
 | `extraScrollHeight` | Yes |
 | `enableResetScrollToCoords` | Yes |
@@ -127,7 +127,7 @@ All the `ScrollView`/`ListView`/`FlatList` props will be passed.
 | `innerRef` | `Function` | Catch the reference of the component. |
 | `viewIsInsideTabBar` | `boolean` | Adds an extra offset that represents the `TabBarIOS` height. |
 | `resetScrollToCoords` | `Object: {x: number, y: number}` | Coordinates that will be used to reset the scroll when the keyboard hides. |
-| `enableAutoAutomaticScroll` | `boolean` | When focus in `TextInput` will scroll the position, default is enabled. |
+| `enableAutomaticScroll` | `boolean` | When focus in `TextInput` will scroll the position, default is enabled. |
 | `extraHeight` | `number` | Adds an extra offset when focusing the `TextInput`s. |
 | `extraScrollHeight` | `number` | Adds an extra offset to the keyboard. Useful if you want to stick elements above the keyboard. |
 | `enableResetScrollToCoords` | `boolean` | Lets the user enable or disable automatic resetScrollToCoords. |

index.d.ts

@@ -46,8 +46,8 @@ interface KeyboardAwareProps {
      * @type {boolean}
      * @memberof KeyboardAwareProps
      */
-  enableAutoAutomaticScroll?: boolean
-
+  
+  enableAutomaticScroll?: boolean
     /**
      * Enables keyboard aware settings for Android
      *

lib/KeyboardAwareHOC.js

@@ -23,7 +23,7 @@ export type KeyboardAwareHOCProps = {
     y: number
   },
   enableResetScrollToCoords?: boolean,
-  enableAutoAutomaticScroll?: boolean,
+  enableAutomaticScroll?: boolean,
   extraHeight?: number,
   extraScrollHeight?: number,
   keyboardOpeningTime?: number,
@@ -40,7 +40,7 @@ function listenToKeyboardEvents(ScrollableComponent: React$Component) {
   return class extends React.Component<
     KeyboardAwareHOCProps,
     KeyboardAwareHOCState
-  > implements KeyboardAwareInterface {
+    > implements KeyboardAwareInterface {
     _rnkasv_keyboardView: any
     keyboardWillShowEvent: ?Function
     keyboardWillHideEvent: ?Function
@@ -58,7 +58,7 @@ function listenToKeyboardEvents(ScrollableComponent: React$Component) {
         y: PropTypes.number.isRequired
       }),
       enableResetScrollToCoords: PropTypes.bool,
-      enableAutoAutomaticScroll: PropTypes.bool,
+      enableAutomaticScroll: PropTypes.bool,
       extraHeight: PropTypes.number,
       extraScrollHeight: PropTypes.number,
       keyboardOpeningTime: PropTypes.number,
@@ -69,7 +69,7 @@ function listenToKeyboardEvents(ScrollableComponent: React$Component) {
     }
 
     static defaultProps = {
-      enableAutoAutomaticScroll: true,
+      enableAutomaticScroll: true,
       extraHeight: _KAM_EXTRA_HEIGHT,
       extraScrollHeight: 0,
       enableResetScrollToCoords: true,
@@ -182,14 +182,13 @@ function listenToKeyboardEvents(ScrollableComponent: React$Component) {
 
     // Keyboard actions
     _updateKeyboardSpace = (frames: Object) => {
-      let keyboardSpace: number =
-        frames.endCoordinates.height + this.props.extraScrollHeight
-      if (this.props.viewIsInsideTabBar) {
-        keyboardSpace -= _KAM_DEFAULT_TAB_BAR_HEIGHT
-      }
-      this.setState({ keyboardSpace })
       // Automatically scroll to focused TextInput
-      if (this.props.enableAutoAutomaticScroll) {
+      if (this.props.enableAutomaticScroll) {
+        let keyboardSpace: number = frames.endCoordinates.height + this.props.extraScrollHeight
+        if (this.props.viewIsInsideTabBar) {
+          keyboardSpace -= _KAM_DEFAULT_TAB_BAR_HEIGHT
+        }
+        this.setState({ keyboardSpace })
         const currentlyFocusedField = TextInput.State.currentlyFocusedField()
         const responder = this.getScrollResponder()
         if (!currentlyFocusedField || !responder) {