rename container-->component ios

lib/ios/RNNAnimator.m

@@ -59,7 +59,7 @@
 
 -(NSArray*)prepareSharedElementTransition:(NSArray*)RNNSharedElementsToVC
 						andfromVCElements:(NSArray*)RNNSharedElementsFromVC
-						withContainerView:(UIView*)containerView
+						withComponentView:(UIView*)componentView
 {
 	NSMutableArray* transitions = [NSMutableArray new];
 	for (NSDictionary* transition in self.animations) {
@@ -69,8 +69,8 @@
 		RNNViewLocation* animatedViewLocations = [[RNNViewLocation alloc] initWithTransition:transitionStateHolder andVC:self.fromVC];
 		RNNAnimatedView* animatedView = [[RNNAnimatedView alloc] initWithTransition:transitionStateHolder andLocation:animatedViewLocations andIsBackButton:self.backButton];
 		transitionStateHolder.locations = animatedViewLocations;
-		[containerView addSubview:animatedView];
-		[containerView bringSubviewToFront:animatedView];
+		[componentView addSubview:animatedView];
+		[componentView bringSubviewToFront:animatedView];
 		transitionStateHolder.animatedView = animatedView;
 		[transitions addObject:transitionStateHolder];
 		if (transitionStateHolder.isSharedElementTransition){
@@ -147,18 +147,18 @@
 {
 	UIViewController* toVC   = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
 	UIViewController* fromVC  = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
-	UIView* containerView = [transitionContext containerView];
+	UIView* componentView = [transitionContext componentView];
 	self.fromVC = fromVC;
 	self.toVC = toVC;
 	toVC.view.frame = fromVC.view.frame;
 	UIView* fromSnapshot = [fromVC.view snapshotViewAfterScreenUpdates:true];
 	fromSnapshot.frame = fromVC.view.frame;
-	[containerView addSubview:fromSnapshot];
-	[containerView addSubview:toVC.view];
+	[componentView addSubview:fromSnapshot];
+	[componentView addSubview:toVC.view];
 	toVC.view.alpha = 0;
 	NSArray* onlyForTesting = @[];
 	NSArray* onlyForTesting2 = @[];
-	NSArray* transitions = [self prepareSharedElementTransition:onlyForTesting andfromVCElements:onlyForTesting2 withContainerView:containerView];
+	NSArray* transitions = [self prepareSharedElementTransition:onlyForTesting andfromVCElements:onlyForTesting2 withComponentView:componentView];
 	[self animateComplition:transitions fromVCSnapshot:fromSnapshot andTransitioningContext:transitionContext];
 	[self animateTransitions:transitions];
 }

lib/ios/RNNBottomTabsOptions.m

@@ -10,7 +10,7 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 	}
 	
 	if (self.currentTabId) {
-		[(RNNTabBarController*)viewController.tabBarController setSelectedIndexByContainerID:self.currentTabId];
+		[(RNNTabBarController*)viewController.tabBarController setSelectedIndexByComponentID:self.currentTabId];
 	}
 	
 	if (self.hidden) {

lib/ios/RNNBridgeModule.m

@@ -24,33 +24,33 @@ RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock
 	}];
 }
 
-RCT_EXPORT_METHOD(setOptions:(NSString*)containerId options:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler setOptions:containerId options:options completion:^{
-		resolve(containerId);
+RCT_EXPORT_METHOD(setOptions:(NSString*)componentId options:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	[_commandsHandler setOptions:componentId options:options completion:^{
+		resolve(componentId);
 	}];
 }
 
-RCT_EXPORT_METHOD(push:(NSString*)containerId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler push:containerId layout:layout completion:^{
-		resolve(containerId);
+RCT_EXPORT_METHOD(push:(NSString*)componentId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	[_commandsHandler push:componentId layout:layout completion:^{
+		resolve(componentId);
 	}];
 }
 
-RCT_EXPORT_METHOD(pop:(NSString*)containerId options:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler pop:containerId options:(NSDictionary*)options completion:^{
-		resolve(containerId);
+RCT_EXPORT_METHOD(pop:(NSString*)componentId options:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	[_commandsHandler pop:componentId options:(NSDictionary*)options completion:^{
+		resolve(componentId);
 	}];
 }
 
-RCT_EXPORT_METHOD(popTo:(NSString*)containerId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler popTo:containerId completion:^{
-		resolve(containerId);
+RCT_EXPORT_METHOD(popTo:(NSString*)componentId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	[_commandsHandler popTo:componentId completion:^{
+		resolve(componentId);
 	}];
 }
 
-RCT_EXPORT_METHOD(popToRoot:(NSString*)containerId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler popToRoot:containerId completion:^{
-		resolve(containerId);
+RCT_EXPORT_METHOD(popToRoot:(NSString*)componentId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	[_commandsHandler popToRoot:componentId completion:^{
+		resolve(componentId);
 	}];
 }
 
@@ -60,9 +60,9 @@ RCT_EXPORT_METHOD(showModal:(NSDictionary*)layout resolver:(RCTPromiseResolveBlo
 	}];
 }
 
-RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler dismissModal:containerId completion:^{
-		resolve(containerId);
+RCT_EXPORT_METHOD(dismissModal:(NSString*)componentId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	[_commandsHandler dismissModal:componentId completion:^{
+		resolve(componentId);
 	}];
 }
 

lib/ios/RNNCommandsHandler.h

@@ -10,19 +10,19 @@
 
 -(void) setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
 
--(void) setOptions:(NSString*)containerId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
+-(void) setOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
 
--(void) push:(NSString*)containerId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
+-(void) push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
 
--(void) pop:(NSString*)containerId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
+-(void) pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
 
--(void) popTo:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion;
+-(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
 
--(void) popToRoot:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion;
+-(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
 
 -(void) showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
 
--(void) dismissModal:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion;
+-(void) dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
 
 -(void) dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion;
 

lib/ios/RNNCommandsHandler.m

@@ -35,10 +35,10 @@
 	completion();
 }
 
--(void) setOptions:(NSString*)containerId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
+-(void) setOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
-	UIViewController* vc = [_store findContainerForId:containerId];
+	UIViewController* vc = [_store findComponentForId:componentId];
 	if([vc isKindOfClass:[RNNRootViewController class]]) {
 		RNNRootViewController* rootVc = (RNNRootViewController*)vc;
 		[rootVc.navigationOptions mergeWith:options];
@@ -51,46 +51,46 @@
 	}
 }
 
--(void) push:(NSString*)containerId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
+-(void) push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-	[_navigationStackManager push:newVc onTop:containerId completion:completion];
+	[_navigationStackManager push:newVc onTop:componentId completion:completion];
 }
 
--(void)pop:(NSString*)containerId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
+-(void)pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:completion];
 	NSDictionary* animationData = options[@"customTransition"];
 	if (animationData){
 		if ([animationData objectForKey:@"animations"]) {
-			[_navigationStackManager pop:containerId withAnimationData:animationData];
+			[_navigationStackManager pop:componentId withAnimationData:animationData];
 		} else {
 			[[NSException exceptionWithName:NSInvalidArgumentException reason:@"unsupported transitionAnimation" userInfo:nil] raise];
 		}
 	} else {
-		[_navigationStackManager pop:containerId withAnimationData:nil];
+		[_navigationStackManager pop:componentId withAnimationData:nil];
 	}
 	[CATransaction commit];
 }
 
--(void) popTo:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion {
+-(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:completion];
 	
-	[_navigationStackManager popTo:containerId];
+	[_navigationStackManager popTo:componentId];
 	
 	[CATransaction commit];
 }
 
--(void) popToRoot:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion {
+-(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:completion];
 	
-	[_navigationStackManager popToRoot:containerId];
+	[_navigationStackManager popToRoot:componentId];
 	
 	[CATransaction commit];
 }
@@ -102,12 +102,12 @@
 	[_modalManager showModal:newVc completion:completion];
 }
 
--(void) dismissModal:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion {
+-(void) dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:completion];
 	
-	[_modalManager dismissModal:containerId];
+	[_modalManager dismissModal:componentId];
 	
 	[CATransaction commit];
 }

lib/ios/RNNControllerFactory.m

@@ -45,7 +45,7 @@
 	UIViewController<RNNRootViewProtocol> *result;
 	
 	if ( node.isComponent) {
-		result = [self createContainer:node];
+		result = [self createComponent:node];
 	}
 	
 	else if (node.isStack)	{
@@ -79,22 +79,22 @@
 		@throw [NSException exceptionWithName:@"UnknownControllerType" reason:[@"Unknown controller type " stringByAppendingString:node.type] userInfo:nil];
 	}
 
-	[_store setContainer:result containerId:node.nodeId];
+	[_store setComponent:result componentId:node.nodeId];
 	
 	return result;
 }
 
-- (UIViewController<RNNRootViewProtocol> *)createContainer:(RNNLayoutNode*)node {
+- (UIViewController<RNNRootViewProtocol> *)createComponent:(RNNLayoutNode*)node {
 	NSString* name = node.data[@"name"];
 	NSDictionary* customTransition = node.data[@"customTransition"];
 	RNNAnimator* animator = [[RNNAnimator alloc] initWithAnimationsDictionary:customTransition];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"navigationOptions"]];
-	NSString* containerId = node.nodeId;
-	RNNRootViewController* container = [[RNNRootViewController alloc] initWithName:name withOptions:options withContainerId:containerId rootViewCreator:_creator eventEmitter:_eventEmitter animator:animator];
+	NSString* componentId = node.nodeId;
+	RNNRootViewController* component = [[RNNRootViewController alloc] initWithName:name withOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter animator:animator];
 	CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;
-	[_bridge.uiManager setAvailableSize:availableSize forRootView:container.view];
+	[_bridge.uiManager setAvailableSize:availableSize forRootView:component.view];
 	
-	return container;
+	return component;
 }
 
 - (UIViewController<RNNRootViewProtocol> *)createStack:(RNNLayoutNode*)node {

lib/ios/RNNEventEmitter.h

@@ -8,10 +8,10 @@
 
 -(void)sendOnAppLaunched;
 
--(void)sendContainerDidAppear:(NSString*)containerId;
+-(void)sendComponentDidAppear:(NSString*)componentId;
 
--(void)sendContainerDidDisappear:(NSString*)containerId;
+-(void)sendComponentDidDisappear:(NSString*)componentId;
 
--(void)sendOnNavigationButtonPressed:(NSString*)containerId buttonId:(NSString*)buttonId;
+-(void)sendOnNavigationButtonPressed:(NSString*)componentId buttonId:(NSString*)buttonId;
 
 @end

lib/ios/RNNEventEmitter.m

@@ -5,12 +5,12 @@
 RCT_EXPORT_MODULE();
 
 static NSString* const onAppLaunched	= @"RNN.appLaunched";
-static NSString* const containerDidAppear	= @"RNN.containerDidAppear";
-static NSString* const containerDidDisappear	= @"RNN.containerDidDisappear";
+static NSString* const componentDidAppear	= @"RNN.componentDidAppear";
+static NSString* const componentDidDisappear	= @"RNN.componentDidDisappear";
 static NSString* const onNavigationButtonPressed	= @"RNN.navigationButtonPressed";
 
 -(NSArray<NSString *> *)supportedEvents {
-	return @[onAppLaunched, containerDidAppear, containerDidDisappear, onNavigationButtonPressed];
+	return @[onAppLaunched, componentDidAppear, componentDidDisappear, onNavigationButtonPressed];
 }
 
 # pragma mark public
@@ -19,16 +19,16 @@ static NSString* const onNavigationButtonPressed	= @"RNN.navigationButtonPressed
 	[self send:onAppLaunched body:nil];
 }
 
--(void)sendContainerDidAppear:(NSString *)containerId {
-	[self send:containerDidAppear body:containerId];
+-(void)sendComponentDidAppear:(NSString *)componentId {
+	[self send:componentDidAppear body:componentId];
 }
 
--(void)sendContainerDidDisappear:(NSString *)containerId {
-	[self send:containerDidDisappear body:containerId];
+-(void)sendComponentDidDisappear:(NSString *)componentId {
+	[self send:componentDidDisappear body:componentId];
 }
 
--(void)sendOnNavigationButtonPressed:(NSString *)containerId buttonId:(NSString*)buttonId {
-	[self send:onNavigationButtonPressed body:@{@"containerId":containerId , @"buttonId": buttonId }];
+-(void)sendOnNavigationButtonPressed:(NSString *)componentId buttonId:(NSString*)buttonId {
+	[self send:onNavigationButtonPressed body:@{@"componentId":componentId , @"buttonId": buttonId }];
 }
 
 # pragma mark private

lib/ios/RNNInteractivePopAnimator.m

@@ -104,7 +104,7 @@
 	self.transitionContext = transitionContext;
 	UIViewController* toVC   = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
 	UIViewController* fromVC  = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
-	UIView* containerView = [transitionContext containerView];
+	UIView* componentView = [transitionContext componentView];
 	
 	toVC.view.frame = fromVC.view.frame;
 	UIView* topViewContent = [self.topView subviews][0];
@@ -122,8 +122,8 @@
 	[self.bottomView setHidden:YES];
 	UIView* toSnapshot = [toVC.view snapshotViewAfterScreenUpdates:true];
 	toSnapshot.frame = fromVC.view.frame;
-	[containerView insertSubview:(UIView *)toSnapshot atIndex:1];
-	[containerView addSubview:self.imageSnapshot];
+	[componentView insertSubview:(UIView *)toSnapshot atIndex:1];
+	[componentView addSubview:self.imageSnapshot];
 	toSnapshot.alpha = 0.0;
 	[self.topView setHidden:YES];
 	[UIView animateKeyframesWithDuration:(NSTimeInterval)[self transitionDuration:transitionContext]
@@ -141,13 +141,13 @@
 								  [self.imageSnapshot removeFromSuperview];
 								  self.totalTranslate = 0;
 								  if (![transitionContext transitionWasCancelled]) {
-									  [containerView addSubview: toVC.view];
+									  [componentView addSubview: toVC.view];
 									  [transitionContext completeTransition:![transitionContext transitionWasCancelled]];
 									  
 								  }
 								  if ([transitionContext transitionWasCancelled]) {
 									  [self.topView setHidden:NO];
-									  [containerView addSubview: fromVC.view];
+									  [componentView addSubview: fromVC.view];
 									  [transitionContext completeTransition:NO];
 								  }
 							  }];

lib/ios/RNNModalManager.h

@@ -8,7 +8,7 @@
 
 -(instancetype)initWithStore:(RNNStore*)store;
 -(void)showModal:(UIViewController*)viewController completion:(RNNTransitionCompletionBlock)completion;
--(void)dismissModal:(NSString*)containerId;
+-(void)dismissModal:(NSString*)componentId;
 -(void)dismissAllModals;
 
 @end

lib/ios/RNNModalManager.m

@@ -36,8 +36,8 @@
 	[self waitForContentToAppearAndThen:@selector(showModalAfterLoad:)];
 }
 
--(void)dismissModal:(NSString *)containerId {
-	[[_store pendingModalIdsToDismiss] addObject:containerId];
+-(void)dismissModal:(NSString *)componentId {
+	[[_store pendingModalIdsToDismiss] addObject:componentId];
 	[self removePendingNextModalIfOnTop];
 }
 
@@ -51,9 +51,9 @@
 
 
 -(void)removePendingNextModalIfOnTop {
-	NSString *containerId = [[_store pendingModalIdsToDismiss] lastObject];
+	NSString *componentId = [[_store pendingModalIdsToDismiss] lastObject];
 	
-	UIViewController *modalToDismiss = [_store findContainerForId:containerId];
+	UIViewController *modalToDismiss = [_store findComponentForId:componentId];
 	
 	if(!modalToDismiss) {
 		return;
@@ -63,7 +63,7 @@
 	
 	if (modalToDismiss == topPresentedVC || [[topPresentedVC childViewControllers] containsObject:modalToDismiss]) {
 		[modalToDismiss dismissViewControllerAnimated:YES completion:^{
-			[[_store pendingModalIdsToDismiss] removeObject:containerId];
+			[[_store pendingModalIdsToDismiss] removeObject:componentId];
 			[self removePendingNextModalIfOnTop];
 		}];
 	}

lib/ios/RNNNavigationButtons.m

@@ -104,7 +104,7 @@
 }
 
 -(void)onButtonPress:(RNNUIBarButtonItem*)barButtonItem {
-	[self.viewController.eventEmitter sendOnNavigationButtonPressed:self.viewController.containerId buttonId:barButtonItem.buttonId];
+	[self.viewController.eventEmitter sendOnNavigationButtonPressed:self.viewController.componentId buttonId:barButtonItem.buttonId];
 }
 
 @end

lib/ios/RNNNavigationStackManager.h

@@ -10,9 +10,9 @@
 -(instancetype)initWithStore:(RNNStore*)store;
 
 
--(void)push:(UIViewController<RNNRootViewProtocol>*)newTop onTop:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion;
--(void)pop:(NSString*)containerId withAnimationData:(NSDictionary*)animationData;
--(void)popTo:(NSString*)containerId;
--(void)popToRoot:(NSString*)containerId;
+-(void)push:(UIViewController<RNNRootViewProtocol>*)newTop onTop:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
+-(void)pop:(NSString*)componentId withAnimationData:(NSDictionary*)animationData;
+-(void)popTo:(NSString*)componentId;
+-(void)popToRoot:(NSString*)componentId;
 
 @end

lib/ios/RNNNavigationStackManager.m

@@ -15,8 +15,8 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	return self;
 }
 
--(void)push:(UIViewController<RNNRootViewProtocol> *)newTop onTop:(NSString *)containerId completion:(RNNTransitionCompletionBlock)completion {
-	UIViewController *vc = [_store findContainerForId:containerId];
+-(void)push:(UIViewController<RNNRootViewProtocol> *)newTop onTop:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion {
+	UIViewController *vc = [_store findComponentForId:componentId];
 	[self preparePush:newTop onTopVC:vc completion:completion];
 	[self waitForContentToAppearAndThen:@selector(pushAfterLoad:)];
 }
@@ -60,8 +60,8 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	self.fromVC = nil;
 }
 
--(void)pop:(NSString *)containerId withAnimationData:(NSDictionary *)animationData {
-	UIViewController* vc = [_store findContainerForId:containerId];
+-(void)pop:(NSString *)componentId withAnimationData:(NSDictionary *)animationData {
+	UIViewController* vc = [_store findComponentForId:componentId];
 	UINavigationController* nvc = [vc navigationController];
 	if ([nvc topViewController] == vc) {
 		if (animationData) {
@@ -78,11 +78,11 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 		[vcs removeObject:vc];
 		[nvc setViewControllers:vcs animated:YES];
 	}
-	[_store removeContainer:containerId];
+	[_store removeComponent:componentId];
 }
 
--(void)popTo:(NSString*)containerId {
-	UIViewController *vc = [_store findContainerForId:containerId];
+-(void)popTo:(NSString*)componentId {
+	UIViewController *vc = [_store findComponentForId:componentId];
 	
 	if (vc) {
 		UINavigationController *nvc = [vc navigationController];
@@ -93,8 +93,8 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	}
 }
 
--(void) popToRoot:(NSString*)containerId {
-	UIViewController* vc = [_store findContainerForId:containerId];
+-(void) popToRoot:(NSString*)componentId {
+	UIViewController* vc = [_store findComponentForId:componentId];
 	UINavigationController* nvc = [vc navigationController];
 	NSArray* poppedVCs = [nvc popToRootViewControllerAnimated:YES];
 	[self removePopedViewControllers:poppedVCs];
@@ -102,7 +102,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 
 -(void)removePopedViewControllers:(NSArray*)viewControllers {
 	for (UIViewController *popedVC in viewControllers) {
-		[_store removeContainerByViewControllerInstance:popedVC];
+		[_store removeComponentByViewControllerInstance:popedVC];
 	}
 }
 

lib/ios/RNNReactRootViewCreator.m

@@ -30,7 +30,7 @@
 	
 	UIView *view = [[RNNReactRootView alloc] initWithBridge:_bridge
 										 moduleName:name
-								  initialProperties:@{@"containerId": rootViewId}];
+								  initialProperties:@{@"componentId": rootViewId}];
 	return view;
 }
 

lib/ios/RNNRootViewController.h

@@ -14,12 +14,12 @@
 @property (nonatomic, strong) RNNNavigationOptions* navigationOptions;
 @property (nonatomic, strong) RNNAnimator* animator;
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
-@property (nonatomic, strong) NSString* containerId;
+@property (nonatomic, strong) NSString* componentId;
 @property (nonatomic, strong) RNNTopTabsViewController* topTabsViewController;
 
 -(instancetype)initWithName:(NSString*)name
 				withOptions:(RNNNavigationOptions*)options
-			withContainerId:(NSString*)containerId
+			withComponentId:(NSString*)componentId
 			rootViewCreator:(id<RNNRootViewCreator>)creator
 			   eventEmitter:(RNNEventEmitter*)eventEmitter
 		   animator:(RNNAnimator*)animator;

lib/ios/RNNRootViewController.m

@@ -4,7 +4,7 @@
 #import "RNNAnimator.h"
 
 @interface RNNRootViewController()
-@property (nonatomic, strong) NSString* containerName;
+@property (nonatomic, strong) NSString* componentName;
 @property (nonatomic) BOOL _statusBarHidden;
 
 @end
@@ -13,17 +13,17 @@
 
 -(instancetype)initWithName:(NSString*)name
 				withOptions:(RNNNavigationOptions*)options
-			withContainerId:(NSString*)containerId
+			withComponentId:(NSString*)componentId
 			rootViewCreator:(id<RNNRootViewCreator>)creator
 			   eventEmitter:(RNNEventEmitter*)eventEmitter
 				   animator:(RNNAnimator *)animator {
 	self = [super init];
-	self.containerId = containerId;
-	self.containerName = name;
+	self.componentId = componentId;
+	self.componentName = name;
 	self.navigationOptions = options;
 	self.eventEmitter = eventEmitter;
 	self.animator = animator;
-	self.view = [creator createRootView:self.containerName rootViewId:self.containerId];
+	self.view = [creator createRootView:self.componentName rootViewId:self.componentId];
 	
 	[[NSNotificationCenter defaultCenter] addObserver:self
 											 selector:@selector(onJsReload)
@@ -71,12 +71,12 @@
 
 -(void)viewDidAppear:(BOOL)animated {
 	[super viewDidAppear:animated];
-	[self.eventEmitter sendContainerDidAppear:self.containerId];
+	[self.eventEmitter sendComponentDidAppear:self.componentId];
 }
 
 -(void)viewDidDisappear:(BOOL)animated {
 	[super viewDidDisappear:animated];
-	[self.eventEmitter sendContainerDidDisappear:self.containerId];
+	[self.eventEmitter sendComponentDidDisappear:self.componentId];
 }
 
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{

lib/ios/RNNStore.h

@@ -7,12 +7,12 @@ typedef void (^RNNTransitionCompletionBlock)(void);
 
 @interface RNNStore : NSObject
 
--(UIViewController*) findContainerForId:(NSString*)containerId;
--(void) setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;
--(void) removeContainer:(NSString*)containerId;
--(void) removeContainerByViewControllerInstance:(UIViewController*)containerInstance;
+-(UIViewController*) findComponentForId:(NSString*)componentId;
+-(void) setComponent:(UIViewController*)viewController componentId:(NSString*)componentId;
+-(void) removeComponent:(NSString*)componentId;
+-(void) removeComponentByViewControllerInstance:(UIViewController*)componentInstance;
 
--(NSString*)containerKeyForInstance:(UIViewController*)instance;
+-(NSString*)componentKeyForInstance:(UIViewController*)instance;
 
 -(void) setReadyToReceiveCommands:(BOOL)isReady;
 -(BOOL) isReadyToReceiveCommands;

lib/ios/RNNStore.m

@@ -6,7 +6,7 @@
 @end
 
 @implementation RNNStore {
-	NSMapTable* _containerStore;
+	NSMapTable* _componentStore;
 	NSMutableArray* _pendingModalIdsToDismiss;
 	BOOL _isReadyToReceiveCommands;
 }
@@ -14,32 +14,32 @@
 -(instancetype)init {
 	self = [super init];
 	_isReadyToReceiveCommands = false;
-	_containerStore = [NSMapTable strongToWeakObjectsMapTable];
+	_componentStore = [NSMapTable strongToWeakObjectsMapTable];
 	_pendingModalIdsToDismiss = [NSMutableArray new];
 	return self;
 }
 
--(UIViewController *)findContainerForId:(NSString *)containerId {
-	return [_containerStore objectForKey:containerId];
+-(UIViewController *)findComponentForId:(NSString *)componentId {
+	return [_componentStore objectForKey:componentId];
 }
 
-- (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId {
-	UIViewController *existingVewController = [self findContainerForId:containerId];
+- (void)setComponent:(UIViewController*)viewController componentId:(NSString*)componentId {
+	UIViewController *existingVewController = [self findComponentForId:componentId];
 	if (existingVewController) {
-		@throw [NSException exceptionWithName:@"MultipleContainerId" reason:[@"Container id already exists " stringByAppendingString:containerId] userInfo:nil];
+		@throw [NSException exceptionWithName:@"MultipleComponentId" reason:[@"Component id already exists " stringByAppendingString:componentId] userInfo:nil];
 	}
 	
-	[_containerStore setObject:viewController forKey:containerId];
+	[_componentStore setObject:viewController forKey:componentId];
 }
 
-- (void)removeContainer:(NSString*)containerId {
-	[_containerStore removeObjectForKey:containerId];
+- (void)removeComponent:(NSString*)componentId {
+	[_componentStore removeObjectForKey:componentId];
 }
 
-- (void)removeContainerByViewControllerInstance:(UIViewController*)containerInstance {
-	NSString *foundKey = [self containerKeyForInstance:containerInstance];
+- (void)removeComponentByViewControllerInstance:(UIViewController*)componentInstance {
+	NSString *foundKey = [self componentKeyForInstance:componentInstance];
 	if (foundKey) {
-		[self removeContainer:foundKey];
+		[self removeComponent:foundKey];
 	}
 }
 
@@ -58,12 +58,12 @@
 -(void)clean {
 	_isReadyToReceiveCommands = false;
 	[_pendingModalIdsToDismiss removeAllObjects];
-	[_containerStore removeAllObjects];
+	[_componentStore removeAllObjects];
 }
 
--(NSString*)containerKeyForInstance:(UIViewController*)instance {
-	for (NSString *key in _containerStore) {
-		UIViewController *value = [_containerStore objectForKey:key];
+-(NSString*)componentKeyForInstance:(UIViewController*)instance {
+	for (NSString *key in _componentStore) {
+		UIViewController *value = [_componentStore objectForKey:key];
 		if (value == instance) {
 			return key;
 		}

lib/ios/RNNTabBarController.h

@@ -5,6 +5,6 @@
 @interface RNNTabBarController : UITabBarController <RNNRootViewProtocol>
 
 - (void)setTabBarHidden:(BOOL)hidden animated:(BOOL)animated;
-- (void)setSelectedIndexByContainerID:(NSString *)containerID;
+- (void)setSelectedIndexByComponentID:(NSString *)componentID;
 
 @end

lib/ios/RNNTabBarController.m

@@ -21,13 +21,13 @@
 	}];
 }
 
-- (void)setSelectedIndexByContainerID:(NSString *)containerID {
+- (void)setSelectedIndexByComponentID:(NSString *)componentID {
 	for (id child in self.childViewControllers) {
 		RNNRootViewController* vc = child;
 		if ([child isKindOfClass:[UINavigationController class]]) {
 			vc = ((UINavigationController *)child).childViewControllers.firstObject;
 		}
-		if ([vc.containerId isEqualToString:containerID]) {
+		if ([vc.componentId isEqualToString:componentID]) {
 			[self setSelectedIndex:[self.childViewControllers indexOfObject:child]];
 		}
 	}

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -66,7 +66,7 @@
 	[initialOptions.topBar setTitle:@"the title"];
 	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithName:@"name"
 																withOptions:initialOptions
-															withContainerId:@"containerId"
+															withComponentId:@"componentId"
 															rootViewCreator:[[RNNTestRootViewCreator alloc] init]
 															   eventEmitter:nil
 																   animator:nil];
@@ -75,12 +75,12 @@
 	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
 
 	[self.store setReadyToReceiveCommands:true];
-	[self.store setContainer:vc containerId:@"containerId"];
+	[self.store setComponent:vc componentId:@"componentId"];
 	
 	NSDictionary* dictFromJs = @{@"topBar": @{@"backgroundColor" :@(0xFFFF0000)}};
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 
-	[self.uut setOptions:@"containerId" options:dictFromJs completion:^{
+	[self.uut setOptions:@"componentId" options:dictFromJs completion:^{
 		XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
 		XCTAssertTrue([nav.navigationBar.barTintColor isEqual:expectedColor]);
 	}];

lib/ios/ReactNativeNavigationTests/RNNControllerFactoryTest.m

@@ -33,33 +33,33 @@
 }
 
 
-- (void)testCreateLayout_ContainerLayout {
+- (void)testCreateLayout_ComponentLayout {
 	
 	id ans = [self.factory createLayoutAndSaveToStore:
 			  @{@"id": @"cntId",
-				@"type": @"Container",
+				@"type": @"Component",
 				@"data": @{},
 				@"children": @[]}];
 	XCTAssertTrue([ans isMemberOfClass:[RNNRootViewController class]]);
 }
 
-- (void)testCreateLayout_ContainerStackLayout {
+- (void)testCreateLayout_ComponentStackLayout {
 	id ans = [self.factory createLayoutAndSaveToStore:
 			  @{@"id": @"cntId",
-				@"type": @"ContainerStack",
+				@"type": @"ComponentStack",
 				@"data": @{},
 				@"children": @[]}];
 	XCTAssertTrue([ans isMemberOfClass:[RNNNavigationController class]]);
 }
 
-- (void)testCreateLayout_ContainerStackLayoutRecursive {
+- (void)testCreateLayout_ComponentStackLayoutRecursive {
 	RNNNavigationController* ans = (RNNNavigationController*) [self.factory createLayoutAndSaveToStore:
 															 @{@"id": @"cntId",
-															   @"type": @"ContainerStack",
+															   @"type": @"ComponentStack",
 															   @"data": @{},
 															   @"children": @[
 																	   @{@"id": @"cntId_2",
-																		 @"type": @"Container",
+																		 @"type": @"Component",
 																		 @"data": @{},
 																		 @"children": @[]}]}];
 	
@@ -76,11 +76,11 @@
 														  @"data": @{},
 														  @"children": @[
 																  @{@"id": @"cntId_2",
-																	@"type": @"ContainerStack",
+																	@"type": @"ComponentStack",
 																	@"data": @{},
 																	@"children": @[
 																			@{@"id": @"cntId_3",
-																			  @"type": @"Container",
+																			  @"type": @"Component",
 																			  @"data": @{},
 																			  @"children": @[]}]}]}];
 	
@@ -96,7 +96,7 @@
 }
 
 
-- (void)testCreateLayout_ContainerSideMenuLayoutCenterLeftRight {
+- (void)testCreateLayout_ComponentSideMenuLayoutCenterLeftRight {
 	RNNSideMenuController *ans = (RNNSideMenuController*) [self.factory createLayoutAndSaveToStore:
 														   @{@"id": @"cntId",
 															 @"type": @"SideMenuRoot",
@@ -107,7 +107,7 @@
 																	   @"data": @{},
 																	   @"children": @[
 																			   @{@"id": @"cntId_3",
-																				 @"type": @"Container",
+																				 @"type": @"Component",
 																				 @"data": @{},
 																				 @"children": @[]}]},
 																	 @{@"id": @"cntI_4",
@@ -115,7 +115,7 @@
 																	   @"data": @{},
 																	   @"children": @[
 																			   @{@"id": @"cntId_5",
-																				 @"type": @"Container",
+																				 @"type": @"Component",
 																				 @"data": @{},
 																				 @"children": @[]}]},
 																	 @{@"id": @"cntI_6",
@@ -123,7 +123,7 @@
 																	   @"data": @{},
 																	   @"children": @[
 																			   @{@"id": @"cntId_7",
-																				 @"type": @"Container",
+																				 @"type": @"Component",
 																				 @"data": @{},
 																				 @"children": @[]}]}]}];
 	XCTAssertTrue([ans isMemberOfClass:[RNNSideMenuController class]]);
@@ -145,15 +145,15 @@
 
 
 
-- (void)testCreateLayout_addContainerToStore {
-	NSString *containerId = @"cntId";
+- (void)testCreateLayout_addComponentToStore {
+	NSString *componentId = @"cntId";
 	UIViewController *ans = [self.factory createLayoutAndSaveToStore:
-							 @{@"id": containerId,
-							   @"type": @"Container",
+							 @{@"id": componentId,
+							   @"type": @"Component",
 							   @"data": @{},
 							   @"children": @[]}];
 	
-	UIViewController *storeAns = [self.store findContainerForId:containerId];
+	UIViewController *storeAns = [self.store findComponentForId:componentId];
 	XCTAssertEqualObjects(ans, storeAns);
 }
 

lib/ios/ReactNativeNavigationTests/RNNNavigationStackManagerTest.m

@@ -44,9 +44,9 @@
 	NSArray *vcArray = @[self.vc1, self.vc2, self.vc3];
 	[self.nvc setViewControllers:vcArray];
 	
-	[self.store setContainer:self.vc1 containerId:@"vc1"];
-	[self.store setContainer:self.vc2 containerId:@"vc2"];
-	[self.store setContainer:self.vc3 containerId:@"vc3"];
+	[self.store setComponent:self.vc1 componentId:@"vc1"];
+	[self.store setComponent:self.vc2 componentId:@"vc2"];
+	[self.store setComponent:self.vc3 componentId:@"vc3"];
 	
 	
 }
@@ -54,18 +54,18 @@
 
 - (void)testPop_removeTopVCFromStore {
 	[self.uut pop:@"vc3" withAnimationData:(NSDictionary*)nil];
-	XCTAssertNil([self.store findContainerForId:@"vc3"]);
-	XCTAssertNotNil([self.store findContainerForId:@"vc2"]);
-	XCTAssertNotNil([self.store findContainerForId:@"vc1"]);
+	XCTAssertNil([self.store findComponentForId:@"vc3"]);
+	XCTAssertNotNil([self.store findComponentForId:@"vc2"]);
+	XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
 }
 
 - (void)testPopToSpecificVC_removeAllPopedVCFromStore {
 	self.nvc.willReturnVCs = @[self.vc2, self.vc3];
 	[self.uut popTo:@"vc1"];
 	
-	XCTAssertNil([self.store findContainerForId:@"vc2"]);
-	XCTAssertNil([self.store findContainerForId:@"vc3"]);
-	XCTAssertNotNil([self.store findContainerForId:@"vc1"]);
+	XCTAssertNil([self.store findComponentForId:@"vc2"]);
+	XCTAssertNil([self.store findComponentForId:@"vc3"]);
+	XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
 	
 }
 
@@ -73,9 +73,9 @@
 	self.nvc.willReturnVCs = @[self.vc2, self.vc3];
 	[self.uut popToRoot:@"vc3"];
 	
-	XCTAssertNil([self.store findContainerForId:@"vc2"]);
-	XCTAssertNil([self.store findContainerForId:@"vc3"]);
-	XCTAssertNotNil([self.store findContainerForId:@"vc1"]);
+	XCTAssertNil([self.store findComponentForId:@"vc2"]);
+	XCTAssertNil([self.store findComponentForId:@"vc3"]);
+	XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
 
 }
 

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -12,7 +12,7 @@
 
 @property (nonatomic, strong) id<RNNRootViewCreator> creator;
 @property (nonatomic, strong) NSString* pageName;
-@property (nonatomic, strong) NSString* containerId;
+@property (nonatomic, strong) NSString* componentId;
 @property (nonatomic, strong) id emitter;
 @property (nonatomic, strong) RNNNavigationOptions* options;
 @property (nonatomic, strong) RNNRootViewController* uut;
@@ -24,10 +24,10 @@
 	[super setUp];
 	self.creator = [[RNNTestRootViewCreator alloc] init];
 	self.pageName = @"somename";
-	self.containerId = @"cntId";
+	self.componentId = @"cntId";
 	self.emitter = nil;
 	self.options = [RNNNavigationOptions new];
-	self.uut = [[RNNRootViewController alloc] initWithName:self.pageName withOptions:self.options withContainerId:self.containerId rootViewCreator:self.creator eventEmitter:self.emitter animator:nil];
+	self.uut = [[RNNRootViewController alloc] initWithName:self.pageName withOptions:self.options withComponentId:self.componentId rootViewCreator:self.creator eventEmitter:self.emitter animator:nil];
 }
 
 -(void)testTopBarBackgroundColor_validColor{

lib/ios/ReactNativeNavigationTests/RNNStoreTest.m

@@ -17,86 +17,86 @@
 }
 
 
-- (void)testFindContainerForId_setAndGetsimpleContainerId {
-	NSString *containerId1 = @"cntId1";
-	NSString *containerId2 = @"cntId2";
+- (void)testFindComponentForId_setAndGetsimpleComponentId {
+	NSString *componentId1 = @"cntId1";
+	NSString *componentId2 = @"cntId2";
 	
 	UIViewController *vc1 = [UIViewController new];
 	UIViewController *vc2 = [UIViewController new];
 	
-	[self.store setContainer:vc1 containerId:containerId1];
-	[self.store setContainer:vc2 containerId:containerId2];
+	[self.store setComponent:vc1 componentId:componentId1];
+	[self.store setComponent:vc2 componentId:componentId2];
 	
-	UIViewController *ans = [self.store findContainerForId:containerId1];
+	UIViewController *ans = [self.store findComponentForId:componentId1];
 	
 	XCTAssertEqualObjects(vc1, ans);
 	XCTAssertNotEqualObjects(vc2, ans);
 }
 
-- (void)testSetContainer_setNilContainerId {
-	NSString *containerId1 = nil;
+- (void)testSetComponent_setNilComponentId {
+	NSString *componentId1 = nil;
 	UIViewController *vc1 = [UIViewController new];
-	[self.store setContainer:vc1 containerId:containerId1];
-	XCTAssertNil([self.store findContainerForId:containerId1]);
+	[self.store setComponent:vc1 componentId:componentId1];
+	XCTAssertNil([self.store findComponentForId:componentId1]);
 	
 }
 
-- (void)testSetContainer_setDoubleContainerId {
-	NSString *containerId1 = @"cntId1";
+- (void)testSetComponent_setDoubleComponentId {
+	NSString *componentId1 = @"cntId1";
 	
 	UIViewController *vc1 = [UIViewController new];
 	UIViewController *vc2 = [UIViewController new];
 	
-	[self.store setContainer:vc1 containerId:containerId1];
+	[self.store setComponent:vc1 componentId:componentId1];
 	
-	UIViewController *ans = [self.store findContainerForId:containerId1];
+	UIViewController *ans = [self.store findComponentForId:componentId1];
 	XCTAssertEqualObjects(vc1, ans);
-	XCTAssertThrows([self.store setContainer:vc2 containerId:containerId1]);
+	XCTAssertThrows([self.store setComponent:vc2 componentId:componentId1]);
 }
 
-- (void)testRemoveContainer_removeExistContainer {
-	NSString *containerId1 = @"cntId1";
+- (void)testRemoveComponent_removeExistComponent {
+	NSString *componentId1 = @"cntId1";
 	UIViewController *vc1 = [UIViewController new];
 	
-	[self.store setContainer:vc1 containerId:containerId1];
+	[self.store setComponent:vc1 componentId:componentId1];
 	
-	UIViewController *ans = [self.store findContainerForId:containerId1];
+	UIViewController *ans = [self.store findComponentForId:componentId1];
 	XCTAssertEqualObjects(vc1, ans);
 	
-	[self.store removeContainer:containerId1];
-	XCTAssertNil([self.store findContainerForId:containerId1]);
+	[self.store removeComponent:componentId1];
+	XCTAssertNil([self.store findComponentForId:componentId1]);
 }
 
 -(void)testPopWillRemoveVcFromStore {
 	NSString *vcId = @"cnt_vc_2";
 	
-	[self setContainerAndRelease:vcId];
+	[self setComponentAndRelease:vcId];
 	
 	
-	XCTAssertNil([self.store findContainerForId:vcId]);
+	XCTAssertNil([self.store findComponentForId:vcId]);
 }
 
 
--(void)testRemoveContainerByInstance {
-	NSString *containerId1 = @"cntId1";
+-(void)testRemoveComponentByInstance {
+	NSString *componentId1 = @"cntId1";
 	UIViewController *vc1 = [UIViewController new];
 	
-	[self.store setContainer:vc1 containerId:containerId1];
-	[self.store removeContainerByViewControllerInstance:vc1];
+	[self.store setComponent:vc1 componentId:componentId1];
+	[self.store removeComponentByViewControllerInstance:vc1];
 	
-	XCTAssertNil([self.store findContainerForId:@"cntId1"]);
+	XCTAssertNil([self.store findComponentForId:@"cntId1"]);
 }
 
 
 #pragma mark - private
 
 
--(void)setContainerAndRelease:(NSString*)vcId {
+-(void)setComponentAndRelease:(NSString*)vcId {
 	@autoreleasepool {
 		UIViewController *vc2 = [UIViewController new];
-		[self.store setContainer:vc2 containerId:vcId];
+		[self.store setComponent:vc2 componentId:vcId];
 		
-		XCTAssertNotNil([self.store findContainerForId:vcId]);
+		XCTAssertNotNil([self.store findComponentForId:vcId]);
 	}
 }