Merge pull request #775 from vjeux/up22

Updates from Thu 9 Apr

Author: vjeux

Examples/2048/Game2048.js

@@ -73,19 +73,29 @@ class Tile extends React.Component {
     if (tile.isNew()) {
       offset.opacity = 0;
     } else {
-      var point = [
-        animationPosition(tile.toColumn()),
-        animationPosition(tile.toRow()),
-      ];
-      AnimationExperimental.startAnimation(this.refs['this'], 100, 0, 'easeInOutQuad', {position: point});
+      var point = {
+        x: animationPosition(tile.toColumn()),
+        y: animationPosition(tile.toRow()),
+      };
+      AnimationExperimental.startAnimation({
+        node: this.refs['this'],
+        duration: 100,
+        easing: 'easeInOutQuad',
+        property: 'position',
+        toValue: point,
+      });
     }
-
     return offset;
   }
 
-
   componentDidMount() {
-    AnimationExperimental.startAnimation(this.refs['this'], 100, 0, 'easeInOutQuad', {opacity: 1});
+    AnimationExperimental.startAnimation({
+      node: this.refs['this'],
+      duration: 100,
+      easing: 'easeInOutQuad',
+      property: 'opacity',
+      toValue: 1,
+    });
   }
 
   render() {

Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		00481BE81AC0C86700671115 /* libRCTWebSocketDebugger.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00481BE61AC0C7FA00671115 /* libRCTWebSocketDebugger.a */; };
-		00481BEA1AC0C89D00671115 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 00481BE91AC0C89D00671115 /* libicucore.dylib */; };
 		008F07F31AC5B25A0029DE68 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 008F07F21AC5B25A0029DE68 /* main.jsbundle */; };
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
 		00C302E61ABCBA2D00DB3ED1 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302B41ABCB8E700DB3ED1 /* libRCTAdSupport.a */; };
@@ -116,7 +115,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				00481BEA1AC0C89D00671115 /* libicucore.dylib in Frameworks */,
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
 				00481BE81AC0C86700671115 /* libRCTWebSocketDebugger.a in Frameworks */,
 				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,

Examples/SampleApp/iOS/Info.plist

@@ -36,5 +36,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string></string>
 </dict>
 </plist>

Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj

@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		004D28A31AAF61C70097A701 /* UIExplorerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 004D28A21AAF61C70097A701 /* UIExplorerTests.m */; };
 		00D2771A1AB8C3E100DC1E48 /* libRCTWebSocketDebugger.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00D277131AB8C2C700DC1E48 /* libRCTWebSocketDebugger.a */; };
-		00D2771C1AB8C55500DC1E48 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 00D2771B1AB8C55500DC1E48 /* libicucore.dylib */; };
 		13417FE91AA91432003F314A /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FE81AA91428003F314A /* libRCTImage.a */; };
 		134180011AA9153C003F314A /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FEF1AA914B8003F314A /* libRCTText.a */; };
 		1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1341802B1AA91779003F314A /* libRCTNetwork.a */; };
@@ -118,7 +117,6 @@
 		004D28A11AAF61C70097A701 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		004D28A21AAF61C70097A701 /* UIExplorerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIExplorerTests.m; sourceTree = "<group>"; };
 		00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocketDebugger.xcodeproj; path = ../../Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj; sourceTree = "<group>"; };
-		00D2771B1AB8C55500DC1E48 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
 		13417FE31AA91428003F314A /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
 		13417FEA1AA914B8003F314A /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
 		134180261AA91779003F314A /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
@@ -150,7 +148,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				00D2771C1AB8C55500DC1E48 /* libicucore.dylib in Frameworks */,
 				14AADF051AC3DBB1002390C9 /* libReact.a in Frameworks */,
 				00D2771A1AB8C3E100DC1E48 /* libRCTWebSocketDebugger.a in Frameworks */,
 				58005BF21ABA80A60062E044 /* libRCTTest.a in Frameworks */,
@@ -207,7 +204,6 @@
 				13417FEA1AA914B8003F314A /* RCTText.xcodeproj */,
 				00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */,
 				D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */,
-				00D2771B1AB8C55500DC1E48 /* libicucore.dylib */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";

Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme

@@ -72,7 +72,8 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
@@ -90,7 +91,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"

Libraries/ActionSheetIOS/RCTActionSheetManager.m

@@ -11,14 +11,17 @@
 
 #import "RCTLog.h"
 
-@interface RCTActionSheetManager() <UIActionSheetDelegate>
+@interface RCTActionSheetManager () <UIActionSheetDelegate>
 
 @end
 
-@implementation RCTActionSheetManager {
+@implementation RCTActionSheetManager
+{
   NSMutableDictionary *_callbacks;
 }
 
+RCT_EXPORT_MODULE()
+
 - (instancetype)init
 {
   if ((self = [super init])) {
@@ -27,12 +30,10 @@ - (instancetype)init
   return self;
 }
 
-- (void)showActionSheetWithOptions:(NSDictionary *)options
-                          failureCallback:(RCTResponseSenderBlock)failureCallback
-                          successCallback:(RCTResponseSenderBlock)successCallback
+RCT_EXPORT_METHOD(showActionSheetWithOptions:(NSDictionary *)options
+                  failureCallback:(RCTResponseSenderBlock)failureCallback
+                  successCallback:(RCTResponseSenderBlock)successCallback)
 {
-  RCT_EXPORT();
-
   dispatch_async(dispatch_get_main_queue(), ^{
     UIActionSheet *actionSheet = [[UIActionSheet alloc] init];
 
@@ -62,12 +63,10 @@ - (void)showActionSheetWithOptions:(NSDictionary *)options
   });
 }
 
-- (void)showShareActionSheetWithOptions:(NSDictionary *)options
-                        failureCallback:(RCTResponseSenderBlock)failureCallback
-                        successCallback:(RCTResponseSenderBlock)successCallback
+RCT_EXPORT_METHOD(showShareActionSheetWithOptions:(NSDictionary *)options
+                  failureCallback:(RCTResponseSenderBlock)failureCallback
+                  successCallback:(RCTResponseSenderBlock)successCallback)
 {
-  RCT_EXPORT();
-
   dispatch_async(dispatch_get_main_queue(), ^{
     NSMutableArray *items = [NSMutableArray array];
     id message = options[@"message"];
@@ -134,7 +133,7 @@ - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger
 
 #pragma mark Private
 
-static NSString *keyForInstance(id instance)
+NS_INLINE NSString *keyForInstance(id instance)
 {
   return [NSString stringWithFormat:@"%p", instance];
 }

Libraries/AdSupport/RCTAdSupport.m

@@ -11,23 +11,23 @@
 
 @implementation RCTAdSupport
 
-- (void)getAdvertisingId:(RCTResponseSenderBlock)callback withErrorCallback:(RCTResponseSenderBlock)errorCallback
-{
-  RCT_EXPORT();
+RCT_EXPORT_MODULE()
 
+RCT_EXPORT_METHOD(getAdvertisingId:(RCTResponseSenderBlock)callback
+                  withErrorCallback:(RCTResponseSenderBlock)errorCallback)
+{
   if ([ASIdentifierManager class]) {
     callback(@[[[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString]]);
   } else {
     return errorCallback(@[@"as_identifier_unavailable"]);
   }
 }
 
-- (void)getAdvertisingTrackingEnabled:(RCTResponseSenderBlock)callback withErrorCallback:(RCTResponseSenderBlock)errorCallback
+RCT_EXPORT_METHOD(getAdvertisingTrackingEnabled:(RCTResponseSenderBlock)callback
+                  withErrorCallback:(RCTResponseSenderBlock)errorCallback)
 {
-  RCT_EXPORT();
-
   if ([ASIdentifierManager class]) {
-    bool hasTracking = [[ASIdentifierManager sharedManager] isAdvertisingTrackingEnabled];
+    BOOL hasTracking = [[ASIdentifierManager sharedManager] isAdvertisingTrackingEnabled];
     callback(@[@(hasTracking)]);
   } else {
     return errorCallback(@[@"as_identifier_unavailable"]);

Libraries/Animation/AnimationExperimental.js

@@ -16,6 +16,17 @@ var AnimationUtils = require('AnimationUtils');
 
 type EasingFunction = (t: number) => number;
 
+var Properties = {
+  opacity: true,
+  position: true,
+  positionX: true,
+  positionY: true,
+  rotation: true,
+  scaleXY: true,
+};
+
+type ValueType = number | Array<number> | {[key: string]: number};
+
 /**
  * This is an experimental module that is under development, incomplete,
  * potentially buggy, not used in any production apps, and will probably change
@@ -24,24 +35,34 @@ type EasingFunction = (t: number) => number;
  * Use at your own risk.
  */
 var AnimationExperimental = {
-  Mixin: require('AnimationExperimentalMixin'),
-
   startAnimation: function(
-    node: any,
-    duration: number,
-    delay: number,
-    easing: (string | EasingFunction),
-    properties: {[key: string]: any}
+    anim: {
+      node: any;
+      duration: number;
+      easing: ($Enum<typeof AnimationUtils.Defaults> | EasingFunction);
+      property: $Enum<typeof Properties>;
+      toValue: ValueType;
+      fromValue?: ValueType;
+      delay?: number;
+    },
+    callback?: ?(finished: bool) => void
   ): number {
-    var nodeHandle = +node.getNodeHandle();
-    var easingSample = AnimationUtils.evaluateEasingFunction(duration, easing);
-    var tag: number = RCTAnimationManager.startAnimation(
+    var nodeHandle = anim.node.getNodeHandle();
+    var easingSample = AnimationUtils.evaluateEasingFunction(
+      anim.duration,
+      anim.easing
+    );
+    var tag: number = AnimationUtils.allocateTag();
+    var props = {};
+    props[anim.property] = {to: anim.toValue};
+    RCTAnimationManager.startAnimation(
       nodeHandle,
-      AnimationUtils.allocateTag(),
-      duration,
-      delay,
+      tag,
+      anim.duration,
+      anim.delay,
       easingSample,
-      properties
+      props,
+      callback
     );
     return tag;
   },
@@ -51,4 +72,18 @@ var AnimationExperimental = {
   },
 };
 
+if (__DEV__) {
+  if (RCTAnimationManager && RCTAnimationManager.Properties) {
+    var a = Object.keys(Properties);
+    var b = RCTAnimationManager.Properties;
+    var diff = a.filter((i) => b.indexOf(i) < 0).concat(
+      b.filter((i) => a.indexOf(i) < 0)
+    );
+    if (diff.length > 0) {
+      throw new Error('JS animation properties don\'t match native properties.' +
+        JSON.stringify(diff, null, '  '));
+    }
+  }
+}
+
 module.exports = AnimationExperimental;