Second part of updates from Wed 24 Jun

facebook · Jun 24, 2015 · 0898bb4 · 0898bb4
2 parents 2e4cbc4 + eb9c723
commit 0898bb4
Show file tree

Hide file tree

Showing 7 changed files with 374 additions and 45 deletions.
diff --git a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationContext-test.js b/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationContext-test.js
@@ -26,6 +26,7 @@
 
 jest
   .dontMock('EmitterSubscription')
+  .dontMock('EventSubscription')
   .dontMock('EventEmitter')
   .dontMock('EventSubscriptionVendor')
   .dontMock('NavigationContext')

diff --git a/Libraries/ReactIOS/renderApplication.ios.js b/Libraries/ReactIOS/renderApplication.ios.js
@@ -73,6 +73,7 @@ function renderApplication<D, P, S>(
     <AppContainer rootTag={rootTag}>
       <RootComponent
         {...initialProps}
+        rootTag={rootTag}
       />
     </AppContainer>,
     rootTag

diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
@@ -187,7 +187,7 @@ + (NSDate *)NSDate:(id)json
   }
   id value = mapping[json];
   if (!value && [json description].length > 0) {
-    RCTLogError(@"Invalid %s '%@'. should be one of: %@", typeName, json, [mapping allKeys]);
+    RCTLogError(@"Invalid %s '%@'. should be one of: %@", typeName, json, [[mapping allKeys] sortedArrayUsingSelector: @selector(caseInsensitiveCompare:)]);
   }
   return value ?: defaultValue;
 }
@@ -550,27 +550,29 @@ + (UIColor *)UIColor:(id)json
     }
 
     // Parse color
-    uint32_t red = 0, green = 0, blue = 0;
-    CGFloat alpha = 1.0;
+    double red = 0, green = 0, blue = 0;
+    double alpha = 1.0;
     if ([colorString hasPrefix:@"#"]) {
+      uint32_t redInt = 0, greenInt = 0, blueInt = 0;
       if (colorString.length == 4) { // 3 digit hex
-        sscanf([colorString UTF8String], "#%01x%01x%01x", &red, &green, &blue);
+        sscanf([colorString UTF8String], "#%01x%01x%01x", &redInt, &greenInt, &blueInt);
         // expand to 6 digit hex
-        red = red | (red << 4);
-        green = green | (green << 4);
-        blue = blue | (blue << 4);
+        red = redInt | (redInt << 4);
+        green = greenInt | (greenInt << 4);
+        blue = blueInt | (blueInt << 4);
       } else if (colorString.length == 7) { // 6 digit hex
-        sscanf(colorString.UTF8String, "#%02x%02x%02x", &red, &green, &blue);
+        sscanf(colorString.UTF8String, "#%02x%02x%02x", &redInt, &greenInt, &blueInt);
+        red = redInt;
+        green = greenInt;
+        blue = blueInt;
       } else {
         RCTLogError(@"Invalid hex color %@. Hex colors should be 3 or 6 digits long.", colorString);
         alpha = -1;
       }
     } else if ([colorString hasPrefix:@"rgba("]) {
-      double tmpAlpha;
-      sscanf(colorString.UTF8String, "rgba(%u,%u,%u,%lf)", &red, &green, &blue, &tmpAlpha);
-      alpha = tmpAlpha;
+      sscanf(colorString.UTF8String, "rgba(%lf,%lf,%lf,%lf)", &red, &green, &blue, &alpha);
     } else if ([colorString hasPrefix:@"rgb("]) {
-      sscanf(colorString.UTF8String, "rgb(%u,%u,%u)", &red, &green, &blue);
+      sscanf(colorString.UTF8String, "rgb(%lf,%lf,%lf)", &red, &green, &blue);
     } else {
       RCTLogError(@"Unrecognized color format '%@', must be one of #hex|rgba|rgb or a valid CSS color name.", colorString);
       alpha = -1;

diff --git a/React/Modules/RCTUIManager.h b/React/Modules/RCTUIManager.h
@@ -34,6 +34,11 @@
  */
 - (void)registerRootView:(UIView *)rootView;
 
+/**
+ * Gets the view associated with a reactTag.
+ */
+- (UIView *)viewForReactTag:(NSNumber *)reactTag;
+
 /**
  * Update the frame of a root view. This might be in response to a screen rotation
  * or some other layout event outside of the React-managed view hierarchy.

diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
@@ -359,6 +359,12 @@ - (void)registerRootView:(UIView *)rootView
   });
 }
 
+- (UIView *)viewForReactTag:(NSNumber *)reactTag
+{
+  RCTAssertMainThread();
+  return _viewRegistry[reactTag];
+}
+
 - (void)setFrame:(CGRect)frame forRootView:(UIView *)rootView
 {
   RCTAssertMainThread();

diff --git a/React/Views/UIView+React.m b/React/Views/UIView+React.m
@@ -13,7 +13,6 @@
 
 #import "RCTAssert.h"
 #import "RCTLog.h"
-#import "RCTWrapperViewController.h"
 
 @implementation UIView (React)
 
@@ -91,8 +90,11 @@ - (void)reactSetInheritedBackgroundColor:(UIColor *)inheritedBackgroundColor
 - (UIViewController *)backingViewController
 {
   id responder = [self nextResponder];
-  if ([responder isKindOfClass:[RCTWrapperViewController class]]) {
-    return responder;
+  while (responder) {
+    if ([responder isKindOfClass:[UIViewController class]]) {
+      return responder;
+    }
+    responder = [responder nextResponder];
   }
   return nil;
 }