Merge pull request #22 from brunocascio/master

Updated for React 16 compatibility

Author: tychota

package.json

@@ -8,7 +8,12 @@
     "test": "npm run lint && flow",
     "prettify": "prettier --single-quote --trailing-comma es5 --print-width 100 --write src/**.js"
   },
-  "files": ["README.md", "LICENCE", "src", "readmeAssets"],
+  "files": [
+    "README.md",
+    "LICENCE",
+    "src",
+    "readmeAssets"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/bamlab/react-native-image-header-scroll-view.git"
@@ -48,6 +53,7 @@
     "react-native": ">=0.20.0"
   },
   "dependencies": {
-    "lodash": "^4.17.4"
+    "lodash": "^4.17.4",
+    "prop-types": "^15.5.10"
   }
 }

src/ImageHeaderScrollView.js

@@ -1,5 +1,6 @@
 // @flow
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { Animated, ScrollView, StyleSheet, View } from 'react-native';
 import _ from 'lodash';
 
@@ -234,8 +235,8 @@ class ImageHeaderScrollView extends Component<DefaultProps, Props, State> {
 }
 
 ImageHeaderScrollView.childContextTypes = {
-  scrollY: React.PropTypes.instanceOf(Animated.Value),
-  scrollPageY: React.PropTypes.number,
+  scrollY: PropTypes.instanceOf(Animated.Value),
+  scrollPageY: PropTypes.number,
 };
 
 const styles = StyleSheet.create({

src/TriggeringView.js

@@ -1,5 +1,6 @@
 // @flow weak
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { View, Animated } from 'react-native';
 import _ from 'lodash';
 
@@ -89,12 +90,12 @@ class TriggeringView extends Component<*, *, *> {
   }
 }
 TriggeringView.propTypes = {
-  onBeginHidden: React.PropTypes.func,
-  onHide: React.PropTypes.func,
-  onBeginDisplayed: React.PropTypes.func,
-  onDisplay: React.PropTypes.func,
-  onTouchTop: React.PropTypes.func,
-  onTouchBottom: React.PropTypes.func,
+  onBeginHidden: PropTypes.func,
+  onHide: PropTypes.func,
+  onBeginDisplayed: PropTypes.func,
+  onDisplay: PropTypes.func,
+  onTouchTop: PropTypes.func,
+  onTouchBottom: PropTypes.func,
 };
 
 TriggeringView.defaultProps = {
@@ -107,8 +108,8 @@ TriggeringView.defaultProps = {
 };
 
 TriggeringView.contextTypes = {
-  scrollY: React.PropTypes.instanceOf(Animated.Value),
-  scrollPageY: React.PropTypes.number,
+  scrollY: PropTypes.instanceOf(Animated.Value),
+  scrollPageY: PropTypes.number,
 };
 
 export default TriggeringView;

yarn.lock

@@ -1400,7 +1400,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.6:
+prop-types@^15.5.10, prop-types@^15.5.6:
   version "15.5.10"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
   dependencies: