zhongwuzw
diff --git a/‎.appveyor/config.yml
Lines changed: 5 additions & 6 deletions b/‎.appveyor/config.yml
Lines changed: 5 additions & 6 deletions
diff --git a/‎.circleci/Dockerfiles/Dockerfile.android
Lines changed: 7 additions & 12 deletions b/‎.circleci/Dockerfiles/Dockerfile.android
Lines changed: 7 additions & 12 deletions
diff --git a/‎.flowconfig
Lines changed: 5 additions & 1 deletion b/‎.flowconfig
Lines changed: 5 additions & 1 deletion
diff --git a/‎.flowconfig.android
Lines changed: 5 additions & 1 deletion b/‎.flowconfig.android
Lines changed: 5 additions & 1 deletion
diff --git a/‎IntegrationTests/SyncMethodTest.js
Lines changed: 17 additions & 3 deletions b/‎IntegrationTests/SyncMethodTest.js
Lines changed: 17 additions & 3 deletions
diff --git a/‎Libraries/Animated/src/__tests__/AnimatedMock-test.js
Lines changed: 29 additions & 6 deletions b/‎Libraries/Animated/src/__tests__/AnimatedMock-test.js
Lines changed: 29 additions & 6 deletions
diff --git a/‎Libraries/Animated/src/components/AnimatedScrollView.js
Lines changed: 1 addition & 1 deletion b/‎Libraries/Animated/src/components/AnimatedScrollView.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎Libraries/Animated/src/createAnimatedComponent.js
Lines changed: 2 additions & 1 deletion b/‎Libraries/Animated/src/createAnimatedComponent.js
Lines changed: 2 additions & 1 deletion
diff --git a/‎Libraries/BatchedBridge/MessageQueue.js
Lines changed: 39 additions & 11 deletions b/‎Libraries/BatchedBridge/MessageQueue.js
Lines changed: 39 additions & 11 deletions
diff --git a/‎Libraries/BatchedBridge/NativeModules.js
Lines changed: 17 additions & 20 deletions b/‎Libraries/BatchedBridge/NativeModules.js
Lines changed: 17 additions & 20 deletions
@@ -30,17 +30,16 @@ install:
   - appveyor DownloadFile "%NDK_TOOLS_URL%" -FileName "%TMP%/ndk.zip"
   - 7z x "%TMP%/ndk.zip" -o"%ANDROID_HOME%" > nul
 
-  - ps: Install-Product node $env:nodejs_version
-  - node --version
-  - yarn --version
+  - ps: Install-Product node $env:nodejs_version x64
+  - npx envinfo@latest
   - appveyor-retry yarn install
 
 build_script:
+  - yarn run flow-check-android
+  - yarn run flow-check-ios
+  - yarn run test
   - gradlew.bat RNTester:android:app:assembleRelease
 
-test_script:
-  - npm test
-
 cache:
   - node_modules
   - "%LOCALAPPDATA%/Yarn"
 
@@ -8,10 +8,10 @@
 #
 # The base image is expected to remain relatively stable, and only
 # needs to be updated when major dependencies such as the Android
-# SDK or NDK are updated. 
+# SDK or NDK are updated.
 #
-# In this Android Test image, we download the latest dependencies 
-# and build a Android application that can be used to run the 
+# In this Android Test image, we download the latest dependencies
+# and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
 FROM reactnativecommunity/react-native-android
@@ -42,16 +42,11 @@ RUN buck fetch ReactAndroid/src/androidTest/...
 RUN buck build ReactAndroid/src/main/java/com/facebook/react
 RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
 
-ADD gradle /app/gradle
-ADD gradlew /app/gradlew
-ADD settings.gradle /app/settings.gradle
-ADD build.gradle /app/build.gradle
-ADD react.gradle /app/react.gradle
+ADD . /app
 
-RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog :ReactAndroid:downloadJSC
+RUN yarn
 
-RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1
+RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog
 
-ADD . /app
+RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1
 
-RUN yarn
@@ -44,6 +44,10 @@ emoji=true
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable
 
+module.file_ext=.js
+module.file_ext=.json
+module.file_ext=.ios.js
+
 module.system=haste
 module.system.haste.use_name_reducers=true
 # keep the following in sync with server/haste/hasteImpl.js
@@ -99,4 +103,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.95.0
+^0.96.0
@@ -44,6 +44,10 @@ emoji=true
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable
 
+module.file_ext=.js
+module.file_ext=.json
+module.file_ext=.android.js
+
 module.system=haste
 module.system.haste.use_name_reducers=true
 # keep the following in sync with server/haste/hasteImpl.js
@@ -99,4 +103,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.95.0
+^0.96.0
@@ -21,12 +21,26 @@ class SyncMethodTest extends React.Component<{}> {
     if (
       RNTesterTestModule.echoString('test string value') !== 'test string value'
     ) {
-      throw new Error('Something wrong with sync method export');
+      throw new Error('Something wrong with echoString sync method');
     }
     if (RNTesterTestModule.methodThatReturnsNil() != null) {
-      throw new Error('Something wrong with sync method export');
+      throw new Error('Something wrong with methodThatReturnsNil sync method');
     }
-    TestModule.markTestCompleted();
+    let response;
+    RNTesterTestModule.methodThatCallsCallbackWithString('test', echo => {
+      response = echo;
+    });
+    requestAnimationFrame(() => {
+      if (response === 'test') {
+        TestModule.markTestCompleted();
+      } else {
+        throw new Error(
+          'Something wrong with methodThatCallsCallbackWithString sync method, ' +
+            'got response ' +
+            JSON.stringify(response),
+        );
+      }
+    });
   }
 
   render(): React.Node {
 
@@ -19,11 +19,34 @@ describe('Animated Mock', () => {
       Object.keys(AnimatedImplementation),
     );
   });
-  it('matches implementation params', () => {
-    Object.keys(AnimatedImplementation).forEach(key =>
-      expect(AnimatedImplementation[key].length).toEqual(
-        AnimatedMock[key].length,
-      ),
-    );
+  it('matches implementation params', done => {
+    Object.keys(AnimatedImplementation).forEach(key => {
+      if (AnimatedImplementation[key].length !== AnimatedMock[key].length) {
+        done(
+          new Error(
+            'key ' +
+              key +
+              ' had different lengths: ' +
+              JSON.stringify(
+                {
+                  impl: {
+                    len: AnimatedImplementation[key].length,
+                    type: typeof AnimatedImplementation[key],
+                    val: AnimatedImplementation[key].toString(),
+                  },
+                  mock: {
+                    len: AnimatedMock[key].length,
+                    type: typeof AnimatedMock[key],
+                    val: AnimatedMock[key].toString(),
+                  },
+                },
+                null,
+                2,
+              ),
+          ),
+        );
+      }
+    });
+    done();
   });
 });
@@ -14,4 +14,4 @@ const ScrollView = require('ScrollView');
 
 const createAnimatedComponent = require('createAnimatedComponent');
 
-module.exports = createAnimatedComponent(ScrollView);
+module.exports = createAnimatedComponent(ScrollView, {scrollEventThrottle: 16});
@@ -16,7 +16,7 @@ const DeprecatedViewStylePropTypes = require('DeprecatedViewStylePropTypes');
 
 const invariant = require('invariant');
 
-function createAnimatedComponent(Component: any): any {
+function createAnimatedComponent(Component: any, defaultProps: any): any {
   invariant(
     typeof Component !== 'function' ||
       (Component.prototype && Component.prototype.isReactComponent),
@@ -149,6 +149,7 @@ function createAnimatedComponent(Component: any): any {
       const props = this._propsAnimated.__getValue();
       return (
         <Component
+          {...defaultProps}
           {...props}
           ref={this._setComponentRef}
           // The native driver updates views directly through the UI thread so we
 
@@ -165,7 +165,27 @@ class MessageQueue {
     return getValue ? getValue() : null;
   }
 
-  enqueueNativeCall(
+  callNativeSyncHook(
+    moduleID: number,
+    methodID: number,
+    params: any[],
+    onFail: ?Function,
+    onSucc: ?Function,
+  ) {
+    if (__DEV__) {
+      invariant(
+        global.nativeCallSyncHook,
+        'Calling synchronous methods on native ' +
+          'modules is not supported in Chrome.\n\n Consider providing alternative ' +
+          'methods to expose this method in debug mode, e.g. by exposing constants ' +
+          'ahead-of-time.',
+      );
+    }
+    this.processCallbacks(moduleID, methodID, params, onFail, onSucc);
+    return global.nativeCallSyncHook(moduleID, methodID, params);
+  }
+
+  processCallbacks(
     moduleID: number,
     methodID: number,
     params: any[],
@@ -188,7 +208,6 @@ class MessageQueue {
       this._successCallbacks[this._callID] = onSucc;
       this._failureCallbacks[this._callID] = onFail;
     }
-
     if (__DEV__) {
       global.nativeTraceBeginAsyncFlow &&
         global.nativeTraceBeginAsyncFlow(
@@ -198,6 +217,16 @@ class MessageQueue {
         );
     }
     this._callID++;
+  }
+
+  enqueueNativeCall(
+    moduleID: number,
+    methodID: number,
+    params: any[],
+    onFail: ?Function,
+    onSucc: ?Function,
+  ) {
+    this.processCallbacks(moduleID, methodID, params, onFail, onSucc);
 
     this._queue[MODULE_IDS].push(moduleID);
     this._queue[METHOD_IDS].push(methodID);
@@ -385,15 +414,14 @@ class MessageQueue {
       const debug = this._debugInfo[callID];
       const module = debug && this._remoteModuleTable[debug[0]];
       const method = debug && this._remoteMethodTable[debug[0]][debug[1]];
-      if (!callback) {
-        let errorMessage = `Callback with id ${cbID}: ${module}.${method}() not found`;
-        if (method) {
-          errorMessage =
-            `The callback ${method}() exists in module ${module}, ` +
-            'but only one callback may be registered to a function in a native module.';
-        }
-        invariant(callback, errorMessage);
-      }
+      invariant(
+        callback,
+        `No callback found with cbID ${cbID} and callID ${callID} for ` +
+          (method
+            ? ` ${module}.${method} - most likely the callback was already invoked`
+            : `module ${module || '<unknown>'}`) +
+          `. Args: '${stringifySafe(args)}'`,
+      );
       const profileName = debug
         ? '<callback for ' + module + '.' + method + '>'
         : cbID;
 
@@ -105,19 +105,6 @@ function genMethod(moduleID: number, methodID: number, type: MethodType) {
         );
       });
     };
-  } else if (type === 'sync') {
-    fn = function(...args: Array<any>) {
-      if (__DEV__) {
-        invariant(
-          global.nativeCallSyncHook,
-          'Calling synchronous methods on native ' +
-            'modules is not supported in Chrome.\n\n Consider providing alternative ' +
-            'methods to expose this method in debug mode, e.g. by exposing constants ' +
-            'ahead-of-time.',
-        );
-      }
-      return global.nativeCallSyncHook(moduleID, methodID, args);
-    };
   } else {
     fn = function(...args: Array<any>) {
       const lastArg = args.length > 0 ? args[args.length - 1] : null;
@@ -133,13 +120,23 @@ function genMethod(moduleID: number, methodID: number, type: MethodType) {
       const onFail = hasErrorCallback ? secondLastArg : null;
       const callbackCount = hasSuccessCallback + hasErrorCallback;
       args = args.slice(0, args.length - callbackCount);
-      BatchedBridge.enqueueNativeCall(
-        moduleID,
-        methodID,
-        args,
-        onFail,
-        onSuccess,
-      );
+      if (type === 'sync') {
+        return BatchedBridge.callNativeSyncHook(
+          moduleID,
+          methodID,
+          args,
+          onFail,
+          onSuccess,
+        );
+      } else {
+        BatchedBridge.enqueueNativeCall(
+          moduleID,
+          methodID,
+          args,
+          onFail,
+          onSuccess,
+        );
+      }
     };
   }
   fn.type = type;
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ const ScrollView = require('ScrollView');`
`14`	`14`
`15`	`15`	`const createAnimatedComponent = require('createAnimatedComponent');`
`16`	`16`
`17`		`-module.exports = createAnimatedComponent(ScrollView);`
	`17`	`+module.exports = createAnimatedComponent(ScrollView, {scrollEventThrottle: 16});`