[rn] Pass props when creating a view in RCTViewManager

mjmahone · mjmahone · commit 36c106403372 · 2015-08-25T08:08:17.000-08:00
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
@@ -758,7 +758,7 @@ - (void)_manageChildren:(NSNumber *)containerReactTag
   UIColor *backgroundColor = shadowView.backgroundColor;
 
   [self addUIBlock:^(RCTUIManager *uiManager, RCTSparseArray *viewRegistry){
-    id<RCTComponent> view = [componentData createViewWithTag:reactTag];
+    id<RCTComponent> view = [componentData createViewWithTag:reactTag props:props];
     if ([view respondsToSelector:@selector(setBackgroundColor:)]) {
       ((UIView *)view).backgroundColor = backgroundColor;
     }
diff --git a/React/Views/RCTComponentData.h b/React/Views/RCTComponentData.h
@@ -22,7 +22,7 @@
 
 - (instancetype)initWithManager:(RCTViewManager *)manager NS_DESIGNATED_INITIALIZER;
 
-- (id<RCTComponent>)createViewWithTag:(NSNumber *)tag;
+- (id<RCTComponent>)createViewWithTag:(NSNumber *)tag props:(NSDictionary *)props;
 - (RCTShadowView *)createShadowViewWithTag:(NSNumber *)tag;
 - (void)setProps:(NSDictionary *)props forView:(id<RCTComponent>)view;
 - (void)setProps:(NSDictionary *)props forShadowView:(RCTShadowView *)shadowView;
diff --git a/React/Views/RCTComponentData.m b/React/Views/RCTComponentData.m
@@ -62,11 +62,11 @@ - (instancetype)initWithManager:(RCTViewManager *)manager
 
 RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
-- (id<RCTComponent>)createViewWithTag:(NSNumber *)tag
+- (id<RCTComponent>)createViewWithTag:(NSNumber *)tag props:(NSDictionary *)props
 {
   RCTAssertMainThread();
 
-  id<RCTComponent> view = (id<RCTComponent>)[_manager view];
+  id<RCTComponent> view = (id<RCTComponent>)(props ? [_manager viewWithProps:props] : [_manager view]);
   view.reactTag = tag;
   if ([view isKindOfClass:[UIView class]]) {
     ((UIView *)view).multipleTouchEnabled = YES;
@@ -264,7 +264,7 @@ - (void)setProps:(NSDictionary *)props forView:(id<RCTComponent>)view
   }
 
   if (!_defaultView) {
-    _defaultView = [self createViewWithTag:nil];
+    _defaultView = [self createViewWithTag:nil props:nil];
   }
 
   [props enumerateKeysAndObjectsUsingBlock:^(NSString *key, id json, __unused BOOL *stop) {
diff --git a/React/Views/RCTViewManager.h b/React/Views/RCTViewManager.h
@@ -39,6 +39,15 @@ typedef void (^RCTViewManagerUIBlock)(RCTUIManager *uiManager, RCTSparseArray *v
  */
 - (UIView *)view;
 
+/**
+ * This method instantiates a native view using the props passed into the component.
+ * This method should be used when you need to know about specific props in order to
+ * initialize a view. By default, this just calls the -view method. Each prop will
+ * still be set individually, after the view is created. Like the -view method,
+ * -viewWithProps: should return a fresh instance each time it is called.
+ */
+- (UIView *)viewWithProps:(NSDictionary *)props;
+
 /**
  * This method instantiates a shadow view to be managed by the module. If omitted,
  * an ordinary RCTShadowView instance will be created, which is typically fine for
diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
@@ -54,6 +54,11 @@ - (dispatch_queue_t)methodQueue
   return _bridge.uiManager.methodQueue;
 }
 
+- (UIView *)viewWithProps:(NSDictionary *)props
+{
+  return [self view];
+}
+
 - (UIView *)view
 {
   return [RCTView new];

Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ - (void)_manageChildren:(NSNumber *)containerReactTag`
`758`	`758`	`UIColor *backgroundColor = shadowView.backgroundColor;`
`759`	`759`
`760`	`760`	`[self addUIBlock:^(RCTUIManager uiManager, RCTSparseArray viewRegistry){`
`761`		`- id<RCTComponent> view = [componentData createViewWithTag:reactTag];`
	`761`	`+ id<RCTComponent> view = [componentData createViewWithTag:reactTag props:props];`
`762`	`762`	`if ([view respondsToSelector:@selector(setBackgroundColor:)]) {`
`763`	`763`	`((UIView *)view).backgroundColor = backgroundColor;`
`764`	`764`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,11 @@ - (instancetype)initWithManager:(RCTViewManager *)manager`
`62`	`62`
`63`	`63`	`RCT_NOT_IMPLEMENTED(- (instancetype)init)`
`64`	`64`
`65`		`-- (id<RCTComponent>)createViewWithTag:(NSNumber *)tag`
	`65`	`+- (id<RCTComponent>)createViewWithTag:(NSNumber )tag props:(NSDictionary )props`
`66`	`66`	`{`
`67`	`67`	`RCTAssertMainThread();`
`68`	`68`
`69`		`- id<RCTComponent> view = (id<RCTComponent>)[_manager view];`
	`69`	`+ id<RCTComponent> view = (id<RCTComponent>)(props ? [_manager viewWithProps:props] : [_manager view]);`
`70`	`70`	`view.reactTag = tag;`
`71`	`71`	`if ([view isKindOfClass:[UIView class]]) {`
`72`	`72`	`((UIView *)view).multipleTouchEnabled = YES;`
`@@ -264,7 +264,7 @@ - (void)setProps:(NSDictionary *)props forView:(id<RCTComponent>)view`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`if (!_defaultView) {`
`267`		`- _defaultView = [self createViewWithTag:nil];`
	`267`	`+ _defaultView = [self createViewWithTag:nil props:nil];`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`[props enumerateKeysAndObjectsUsingBlock:^(NSString key, id json, __unused BOOL stop) {`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,11 @@ - (dispatch_queue_t)methodQueue`
`54`	`54`	`return _bridge.uiManager.methodQueue;`
`55`	`55`	`}`
`56`	`56`
	`57`	`+- (UIView )viewWithProps:(NSDictionary )props`
	`58`	`+{`
	`59`	`+ return [self view];`
	`60`	`+}`
	`61`	`+`
`57`	`62`	`- (UIView *)view`
`58`	`63`	`{`
`59`	`64`	`return [RCTView new];`