Fix pushing screens to external components inside a modal (#5831)

* Fix pushing screens to external components inside modal

lib/ios/RNNStackController.m

@@ -21,10 +21,6 @@
 	[self.presenter applyOptionsOnViewDidLayoutSubviews:self.resolveOptions];
 }
 
-- (UIViewController *)getCurrentChild {
-	return self.topViewController;
-}
-
 - (UINavigationController *)navigationController {
 	return self;
 }

lib/ios/UIViewController+LayoutProtocol.m

@@ -80,11 +80,18 @@
 }
 
 - (UIViewController *)getCurrentChild {
+    for (UIViewController* childViewController in self.childViewControllers.reverseObjectEnumerator.allObjects) {
+        if (childViewController.layoutInfo) {
+            return childViewController;
+        }
+    }
+    
     return nil;
 }
 
 - (UIViewController *)presentedComponentViewController {
-    return self.getCurrentChild ? self.getCurrentChild.presentedComponentViewController : self;
+    UIViewController* currentChild = self.getCurrentChild;
+    return currentChild ? currentChild.presentedComponentViewController : self;
 }
 
 - (UIViewController *)topMostViewController {

playground/ios/NavigationTests/RNNModalManagerTest.m

@@ -43,6 +43,9 @@
 	_vc1 = [RNNComponentViewController new];
 	_vc2 = [RNNComponentViewController new];
 	_vc3 = [RNNComponentViewController new];
+	_vc1.layoutInfo = [RNNLayoutInfo new];
+	_vc2.layoutInfo = [RNNLayoutInfo new];
+	_vc3.layoutInfo = [RNNLayoutInfo new];
 	_modalManager = [[MockModalManager alloc] init];
 	_modalManager.topPresentedVC = [MockViewController new];
 }

playground/ios/NavigationTests/RNNNavigationControllerTest.m

@@ -24,8 +24,8 @@
     [super setUp];
 	_eventEmitter = [OCMockObject niceMockForClass:[RNNEventEmitter class]];
 	_creator = [[RNNTestRootViewCreator alloc] init];
-	_vc1 = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[OCMockObject partialMockForObject:[[RNNComponentPresenter alloc] init]] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
-	_vc2 = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNComponentPresenter alloc] init] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
+	_vc1 = [[RNNComponentViewController alloc] initWithLayoutInfo:[RNNLayoutInfo new] rootViewCreator:nil eventEmitter:nil presenter:[OCMockObject partialMockForObject:[[RNNComponentPresenter alloc] init]] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
+	_vc2 = [[RNNComponentViewController alloc] initWithLayoutInfo:[RNNLayoutInfo new] rootViewCreator:nil eventEmitter:nil presenter:[[RNNComponentPresenter alloc] init] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
 	_vc2Mock = [OCMockObject partialMockForObject:_vc2];
 	_vc3 = [UIViewController new];
 	_options = [OCMockObject partialMockForObject:[[RNNNavigationOptions alloc] initEmptyOptions]];
@@ -53,6 +53,12 @@
 	XCTAssertTrue(self.uut.getCurrentChild == self.uut.topViewController);
 }
 
+- (void)testCurrentChild_shouldReturnLastChildWithLayoutInfo {
+	[self.uut addChildViewController:[UIViewController new]];
+	XCTAssertTrue(self.uut.getCurrentChild != self.uut.topViewController);
+	XCTAssertTrue(self.uut.getCurrentChild == self.uut.childViewControllers[self.uut.childViewControllers.count-2]);
+}
+
 - (void)testPreferredStatusBarStyle_shouldReturnLeafPreferredStatusBarStyle {
 	self.uut.getCurrentChild.resolveOptions.statusBar.style = [[Text alloc] initWithValue:@"light"];
 	XCTAssertTrue(self.uut.preferredStatusBarStyle == self.uut.getCurrentChild.preferredStatusBarStyle);

playground/ios/NavigationTests/UIViewController+LayoutProtocolTest.m

@@ -52,8 +52,8 @@
 	RNNNavigationOptions* defaultOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
 		defaultOptions.bottomTab.text = [[Text alloc] initWithValue:@"default text"];
 		defaultOptions.bottomTab.selectedIconColor = [[Color alloc] initWithValue:UIColor.blueColor];
-
-	UIViewController* child = [[UIViewController alloc] initWithLayoutInfo:nil creator:nil options:childOptions defaultOptions:defaultOptions presenter:presenter eventEmitter:nil childViewControllers:nil];
+	
+	UIViewController* child = [[UIViewController alloc] initWithLayoutInfo:[RNNLayoutInfo new] creator:nil options:childOptions defaultOptions:defaultOptions presenter:presenter eventEmitter:nil childViewControllers:nil];
     RNNStackController* parent = [[RNNStackController alloc] initWithLayoutInfo:nil creator:nil options:parentOptions defaultOptions:defaultOptions presenter:presenter eventEmitter:nil childViewControllers:@[child]];
 
     XCTAssertEqual([parent getCurrentChild], child);
@@ -88,10 +88,10 @@
 
     RNNNavigationOptions * childOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
     childOptions.bottomTab.text = [[Text alloc] initWithValue:@"Child tab text"];
-    UIViewController* child = [[UIViewController alloc] initWithLayoutInfo:nil creator:nil options:childOptions defaultOptions:nil presenter:[RNNComponentPresenter new] eventEmitter:nil childViewControllers:nil];
+    UIViewController* child = [[UIViewController alloc] initWithLayoutInfo:[RNNLayoutInfo new] creator:nil options:childOptions defaultOptions:nil presenter:[RNNComponentPresenter new] eventEmitter:nil childViewControllers:nil];
     RNNNavigationOptions * initialOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
     initialOptions.topBar.title.text = [[Text alloc] initWithValue:@"Initial title"];
-    RNNStackController* uut = [[RNNStackController alloc] initWithLayoutInfo:nil creator:nil options:initialOptions defaultOptions:nil presenter:presenter eventEmitter:nil childViewControllers:@[child]];
+    RNNStackController* uut = [[RNNStackController alloc] initWithLayoutInfo:[RNNLayoutInfo new] creator:nil options:initialOptions defaultOptions:nil presenter:presenter eventEmitter:nil childViewControllers:@[child]];
     [parent addChildViewController:uut];
 
 	[uut mergeOptions:toMerge];