Fixes e2e

Author: yogevbd

lib/ios/RNNCommandsHandler.m

@@ -155,6 +155,9 @@ - (void)setStackRoot:(NSString*)componentId children:(NSArray*)children completi
 	[self assertReady];
 
  	NSArray<RNNLayoutProtocol> *childViewControllers = [_controllerFactory createChildrenLayout:children];
+	for (UIViewController<RNNLayoutProtocol>* viewController in childViewControllers) {
+		[viewController renderTreeAndWait:NO perform:nil];
+	}
 	RNNNavigationOptions* options = [childViewControllers.lastObject getCurrentChild].resolveOptions;
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	__weak typeof(RNNEventEmitter*) weakEventEmitter = _eventEmitter;

lib/ios/RNNRootViewController.m

@@ -89,20 +89,27 @@ - (void)viewDidDisappear:(BOOL)animated {
 }
 
 - (void)renderTreeAndWait:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	if (!wait || self.isExternalViewController) {
+	if (self.isExternalViewController && readyBlock) {
 		readyBlock();
-		readyBlock = nil;
+		return;
 	}
-	[_presenter renderComponents:self.resolveOptions perform:^{
-		if (self.creator) {
-			UIView* reactView = [_creator createRootView:self.layoutInfo.name rootViewId:self.layoutInfo.componentId reactViewReadyBlock:readyBlock];
-			reactView.backgroundColor = [UIColor clearColor];
-			reactView.frame = self.view.bounds;
-			[self.view addSubview:reactView];
-		} else if (readyBlock) {
-			readyBlock();
-		}
+	
+	__block RNNReactViewReadyCompletionBlock readyBlockCopy = readyBlock;
+	UIView* reactView = [_creator createRootView:self.layoutInfo.name rootViewId:self.layoutInfo.componentId reactViewReadyBlock:^{
+		[_presenter renderComponents:self.resolveOptions perform:^{
+			if (readyBlockCopy) {
+				readyBlockCopy();
+				readyBlockCopy = nil;
+			}
+		}];
 	}];
+	reactView.backgroundColor = [UIColor clearColor];
+	self.view = reactView;
+	
+	if (!wait && readyBlock) {
+		readyBlockCopy();
+		readyBlockCopy = nil;
+	}
 }
 
 - (UIViewController *)getCurrentChild {

lib/ios/RNNViewControllerPresenter.m

@@ -154,11 +154,11 @@ - (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavig
 		rootView.passThroughTouches = !newOptions.overlay.interceptTouchOutside.get;
 	}
 
+	[self setTitleViewWithSubtitle:newOptions];
+	
 	if (newOptions.topBar.title.component.name.hasValue) {
 		[self setCustomNavigationTitleView:newOptions perform:nil];
 	}
-	
-	[self setTitleViewWithSubtitle:newOptions];
 }
 
 - (void)renderComponents:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock {