Merge branch 'master' into android-support

Author: Swordsman-Inaction

.eslintrc

@@ -14,7 +14,12 @@
   },
 
   "plugins": [
-    "react"
+    "react",
+    "flowtype"
+  ],
+
+  "extends": [
+    "plugin:flowtype/recommended"
   ],
 
   "globals": {

.flowconfig

@@ -93,4 +93,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-3]\\|1[0-9]\\|[0-9
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 [version]
-0.33.0
+0.47.0

lib/KeyboardAwareListView.js

@@ -10,16 +10,24 @@ const KeyboardAwareListView = createReactClass({
   propTypes: {
     viewIsInsideTabBar: PropTypes.bool,
     resetScrollToCoords: PropTypes.shape({
-      x: PropTypes.number,
-      y: PropTypes.number,
+      x: PropTypes.number.isRequired,
+      y: PropTypes.number.isRequired,
     }),
-    enableOnAndroid: React.PropTypes.bool,
+    onScroll: PropTypes.func,
+    enableOnAndroid: PropTypes.bool,
   },
   mixins: [KeyboardAwareMixin],
 
   componentWillMount: function () {
-    this.setViewIsInsideTabBar(this.props.viewIsInsideTabBar)
-    this.setResetScrollToCoords(this.props.resetScrollToCoords)
+    this.setViewIsInsideTabBar(!!this.props.viewIsInsideTabBar)
+    if (this.props.resetScrollToCoords) {
+      this.setResetScrollToCoords(this.props.resetScrollToCoords)
+    }
+  },
+
+  onScroll: function (e: SyntheticEvent & {nativeEvent: {contentOffset: number}}) {
+    this.handleOnScroll(e)
+    this.props.onScroll && this.props.onScroll(e)
   },
 
   render: function () {
@@ -49,10 +57,7 @@ const KeyboardAwareListView = createReactClass({
         scrollEventThrottle={0}
         {...this.props}
         contentContainerStyle={newContentContainerStyle || contentContainerStyle}
-        onScroll={e => {
-          this.handleOnScroll(e)
-          this.props.onScroll && this.props.onScroll(e)
-        }}
+        onScroll={this.onScroll}
       />
     )
   },

lib/KeyboardAwareMixin.js

@@ -4,8 +4,6 @@ import PropTypes from 'prop-types'
 import ReactNative, { TextInput, Keyboard, UIManager, Platform } from 'react-native'
 import TimerMixin from 'react-timer-mixin'
 
-import type { Event } from 'react-native'
-
 const _KAM_DEFAULT_TAB_BAR_HEIGHT: number = 49
 const _KAM_KEYBOARD_OPENING_TIME: number = 250
 const _KAM_EXTRA_HEIGHT: number = 75
@@ -30,7 +28,7 @@ const KeyboardAwareMixin = {
     }
   },
 
-  setViewIsInsideTabBar: function (viewIsInsideTabBar: bool) {
+  setViewIsInsideTabBar: function (viewIsInsideTabBar: boolean) {
     this.viewIsInsideTabBar = viewIsInsideTabBar
     const keyboardSpace = viewIsInsideTabBar ? _KAM_DEFAULT_TAB_BAR_HEIGHT : 0
     if (this.state.keyboardSpace !== keyboardSpace) {
@@ -42,7 +40,7 @@ const KeyboardAwareMixin = {
     this.resetCoords = coords
   },
 
-  getInitialState: function (props: Object) {
+  getInitialState: function () {
     this.viewIsInsideTabBar = false
     this.keyboardWillShowEvent = undefined
     this.keyboardWillHideEvent = undefined
@@ -146,12 +144,12 @@ const KeyboardAwareMixin = {
     return this.refs._rnkasv_keyboardView && this.refs._rnkasv_keyboardView.getScrollResponder()
   },
 
-  scrollToPosition: function (x: number, y: number, animated: bool = true) {
+  scrollToPosition: function (x: number, y: number, animated: boolean = true) {
     const responder = this.getScrollResponder();
     responder && responder.scrollResponderScrollTo({x: x, y: y, animated: animated})
   },
 
-  scrollToEnd: function (animated?: bool = true) {
+  scrollToEnd: function (animated?: boolean = true) {
     const responder = this.getScrollResponder();
     responder && responder.scrollResponderScrollToEnd({animated: animated})
   },
@@ -198,7 +196,7 @@ const KeyboardAwareMixin = {
 
   defaultResetScrollToCoords: null, // format: {x: 0, y: 0}
 
-  handleOnScroll: function (e: Event) {
+  handleOnScroll: function (e: SyntheticEvent & {nativeEvent: {contentOffset: number}}) {
     this.position = e.nativeEvent.contentOffset
   },
 }

package.json

@@ -43,7 +43,8 @@
   "devDependencies": {
     "babel-eslint": "^6.0.4",
     "eslint": "^3.17.1",
-    "eslint-plugin-react": "^6.10.0",
-    "flow-bin": "0.33.0"
+    "eslint-plugin-flowtype": "^2.35.0",
+    "eslint-plugin-react": "^7.1.0",
+    "flow-bin": "0.47.0"
   }
 }