Merge pull request #1 from react-native-oh-library/sig_dev

sig_dev合入sig

Author: ding-chengjie

lib/NestedScrollView.js

@@ -22,10 +22,8 @@ const {
   requireNativeComponent,
 } = ReactNative;
 
-const AnimatedImplementation = require('react-native/Libraries/Animated/src/AnimatedImplementation');
-const ScrollResponder = require('react-native/Libraries/Components/ScrollResponder');
+const AnimatedImplementation = require('react-native/Libraries/Animated/AnimatedImplementation');
 const ScrollViewStickyHeader = require('react-native/Libraries/Components/ScrollView/ScrollViewStickyHeader');
-
 const createReactClass = require('create-react-class');
 const dismissKeyboard = require('react-native/Libraries/Utilities/dismissKeyboard');
 const flattenStyle = require('react-native/Libraries/StyleSheet/flattenStyle');
@@ -34,14 +32,12 @@ const processDecelerationRate = require('react-native/Libraries/Components/Scrol
 const warning = require('fbjs/lib/warning');
 const resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
 
-import type {PressEvent} from 'CoreEventTypes';
-import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
+import type {PressEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+import type {EdgeInsetsProp} from 'react-native/Libraries/StyleSheet/EdgeInsetsPropType';
 import type {NativeMethodsMixinType} from 'ReactNativeTypes';
-import type {ViewStyleProp} from 'StyleSheet';
-import type {ViewProps} from 'ViewPropTypes';
-import type {PointProp} from 'PointPropType';
-
-import type {ColorValue} from 'StyleSheetTypes';
+import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
+import type {PointProp} from 'react-native/Libraries/StyleSheet/PointPropType';
+import type {ColorValue} from 'react-native/Libraries/StyleSheet/StyleSheet';
 
 let AndroidScrollView;
 let AndroidHorizontalScrollContentView;
@@ -553,8 +549,8 @@ type State = {|
 |};
 function createScrollResponder(
   node: React.ElementRef<typeof ScrollView>,
-): typeof ScrollResponder.Mixin {
-  const scrollResponder = {...ScrollResponder.Mixin};
+): typeof View.props.onResponderGrant {
+  const scrollResponder = {...View.props.onResponderGrant};
   for (const key in scrollResponder) {
     if (typeof scrollResponder[key] === 'function') {
       scrollResponder[key] = scrollResponder[key].bind(node);
@@ -611,7 +607,7 @@ class ScrollView extends React.Component<Props, State> {
    *    component instance.
    * 3. Continued...
    */
-  _scrollResponder: typeof ScrollResponder.Mixin = createScrollResponder(this);
+  _scrollResponder: typeof View.props.onResponderGrant = createScrollResponder(this);
   constructor(props: Props) {
     super(props);
     /**
@@ -625,13 +621,13 @@ class ScrollView extends React.Component<Props, State> {
      *    Since the object returned from that method is the ScrollView instance,
      *    we need to bind all mixin methods to the ScrollView instance.
      */
-    for (const key in ScrollResponder.Mixin) {
+    for (const key in View.props.onResponderGrant) {
       if (
-        typeof ScrollResponder.Mixin[key] === 'function' &&
+        typeof View.props.onResponderGrant[key] === 'function' &&
         key.startsWith('scrollResponder')
       ) {
         // $FlowFixMe - dynamically adding properties to a class
-        (this: any)[key] = ScrollResponder.Mixin[key].bind(this);
+        (this: any)[key] = View.props.onResponderGrant[key].bind(this);
       }
     }
     /**
@@ -640,11 +636,11 @@ class ScrollView extends React.Component<Props, State> {
      * 4. Mixins can initialize properties and use properties on the component
      *    instance.
      */
-    Object.keys(ScrollResponder.Mixin)
-      .filter(key => typeof ScrollResponder.Mixin[key] !== 'function')
+    Object.keys(View.props.onResponderGrant)
+      .filter(key => typeof View.props.onResponderGrant[key] !== 'function')
       .forEach(key => {
         // $FlowFixMe - dynamically adding properties to a class
-        (this: any)[key] = ScrollResponder.Mixin[key];
+        (this: any)[key] = View.props.onResponderGrant[key];
       });
   }
 
@@ -658,7 +654,7 @@ class ScrollView extends React.Component<Props, State> {
 
   state = {
     layoutHeight: null,
-    ...ScrollResponder.Mixin.scrollResponderMixinGetInitialState(),
+    ...View.props.onResponderGrant.scrollResponderMixinGetInitialState(),
   };
 
   UNSAFE_componentWillMount() {
@@ -713,7 +709,7 @@ class ScrollView extends React.Component<Props, State> {
    * to the underlying scroll responder's methods.
    */
   getScrollResponder(): ScrollResponderType {
-    // $FlowFixMe - overriding type to include ScrollResponder.Mixin
+    // $FlowFixMe - overriding type to include View.props.onResponderGrant
     return ((this: any): ScrollResponderType);
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nested-scroll-view",
-  "version": "9.0.0",
+  "version": "9.0.0-0.0.1",
   "description": "React Native ScrollView replacement with NestedScrollView",
   "main": "index.js",
   "keywords": [
@@ -9,5 +9,8 @@
     "nested-scroll"
   ],
   "author": "Cesar Augusto <cesardeazevedo@outlook.com>",
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "fbjs": "^3.0.5"
+  }
 }