Refactored getCurrentLeaf and getCurrentChild (#4242)

lib/ios/RNNCommandsHandler.m

@@ -138,8 +138,8 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 			});
 		}
 	} else {
-		id animationDelegate = (newVc.resolveOptions.animations.push.hasCustomAnimation || newVc.getCurrentChild.isCustomTransitioned) ? newVc : nil;
-		[newVc.getCurrentChild waitForReactViewRender:(newVc.resolveOptions.animations.push.waitForRender || animationDelegate) perform:^{
+		id animationDelegate = (newVc.resolveOptions.animations.push.hasCustomAnimation || newVc.getCurrentLeaf.isCustomTransitioned) ? newVc : nil;
+		[newVc.getCurrentLeaf waitForReactViewRender:(newVc.resolveOptions.animations.push.waitForRender || animationDelegate) perform:^{
 			[_stackManager push:newVc onTop:fromVC animated:newVc.resolveOptions.animations.push.enable animationDelegate:animationDelegate completion:^{
 				[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
 				completion();
@@ -228,7 +228,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	UIViewController<RNNParentProtocol> *newVc = [_controllerFactory createLayout:layout saveToStore:_store];
 	
-	[newVc.getCurrentChild waitForReactViewRender:newVc.getCurrentChild.resolveOptions.animations.showModal.waitForRender perform:^{
+	[newVc.getCurrentLeaf waitForReactViewRender:newVc.getCurrentLeaf.resolveOptions.animations.showModal.waitForRender perform:^{
 		[_modalManager showModal:newVc animated:newVc.getCurrentChild.resolveOptions.animations.showModal.enable hasCustomAnimation:newVc.getCurrentChild.resolveOptions.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
 			[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
 			completion(componentId);

lib/ios/RNNLayoutProtocol.h

@@ -11,7 +11,9 @@
 @property (nonatomic, strong) RNNNavigationOptions* options;
 @property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 
-- (UIViewController<RNNLeafProtocol, RNNLayoutProtocol> *)getCurrentChild;
+- (UIViewController<RNNLayoutProtocol> *)getCurrentChild;
+
+- (UIViewController<RNNLeafProtocol, RNNLayoutProtocol> *)getCurrentLeaf;
 
 - (void)mergeOptions:(RNNNavigationOptions *)options;
 

lib/ios/RNNNavigationController.m

@@ -97,6 +97,10 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	return ((UIViewController<RNNParentProtocol>*)self.topViewController);
 }
 
+- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
+	return [[self getCurrentChild] getCurrentLeaf];
+}
+
 - (UIViewController *)childViewControllerForStatusBarStyle {
 	return self.topViewController;
 }

lib/ios/RNNRootViewController.m

@@ -133,6 +133,10 @@
 	return self;
 }
 
+- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
+	return self;
+}
+
 - (void)onReactViewReady:(RNNReactViewReadyCompletionBlock)readyBlock {
 	if (self.isExternalViewController) {
 		readyBlock();

lib/ios/RNNSideMenuChildVC.h

@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
 @interface RNNSideMenuChildVC : UIViewController <RNNParentProtocol>
 
 @property (readonly) RNNSideMenuChildType type;
-@property (readonly) UIViewController<RNNParentProtocol> *child;
+@property (readonly) UIViewController<RNNLayoutProtocol> *child;
 
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNViewControllerPresenter* presenter;

lib/ios/RNNSideMenuChildVC.m

@@ -3,7 +3,7 @@
 @interface RNNSideMenuChildVC ()
 
 @property (readwrite) RNNSideMenuChildType type;
-@property (nonatomic, retain) UIViewController<RNNParentProtocol> *child;
+@property (nonatomic, retain) UIViewController<RNNLayoutProtocol> *child;
 
 @end
 
@@ -56,7 +56,7 @@
 	return self.child.tabBarItem;
 }
 
-- (void)bindChildViewController:(UIViewController<RNNParentProtocol>*)child {
+- (void)bindChildViewController:(UIViewController<RNNLayoutProtocol>*)child {
 	self.child = child;
 	[self addChildViewController:self.child];
 	[self.child.view setFrame:self.view.bounds];
@@ -65,7 +65,11 @@
 }
 
 - (UIViewController *)getCurrentChild {
-	return [self.child getCurrentChild];
+	return self.child;
+}
+
+- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
+	return [[self getCurrentChild] getCurrentLeaf];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {

lib/ios/RNNSideMenuController.m

@@ -158,7 +158,11 @@
 }
 
 - (UIViewController<RNNLayoutProtocol> *)getCurrentChild {
-	return [self.center getCurrentChild];
+	return self.center;
+}
+
+- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
+	return [[self getCurrentChild] getCurrentLeaf];
 }
 
 @end

lib/ios/RNNSplitViewController.m

@@ -48,7 +48,11 @@
 }
 
 - (UIViewController *)getCurrentChild {
-	return self;
+	return self.viewControllers[0];
+}
+
+- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
+	return [[self getCurrentChild] getCurrentLeaf];
 }
 
 @end

lib/ios/RNNTabBarController.m

@@ -79,7 +79,11 @@
 }
 
 - (UIViewController *)getCurrentChild {
-	return ((UIViewController<RNNParentProtocol>*)self.selectedViewController).getCurrentChild;
+	return self.selectedViewController;
+}
+
+- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
+	return [[self getCurrentChild] getCurrentLeaf];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {

lib/ios/RNNTopTabsViewController.m

@@ -111,4 +111,8 @@
 	return _currentViewController;
 }
 
+- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
+	return [[self getCurrentChild] getCurrentLeaf];
+}
+
 @end

lib/ios/ReactNativeNavigationTests/RNNNavigationControllerTest.m

@@ -11,6 +11,7 @@
 
 @implementation RNNNavigationControllerTest {
 	RNNRootViewController* _vc1;
+	id _vc2Mock;
 	RNNRootViewController* _vc2;
 	UIViewController* _vc3;
 	RNNNavigationOptions* _options;
@@ -21,6 +22,7 @@
 	
 	_vc1 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[OCMockObject partialMockForObject:[[RNNViewControllerPresenter alloc] init]] options:[[RNNNavigationOptions alloc] initEmptyOptions]  defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
 	_vc2 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNViewControllerPresenter alloc] init] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
+	_vc2Mock = [OCMockObject partialMockForObject:_vc2];
 	_vc3 = [UIViewController new];
 	_options = [OCMockObject partialMockForObject:[[RNNNavigationOptions alloc] initEmptyOptions]];
 	self.uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[_vc1, _vc2] options:_options defaultOptions:nil presenter:[OCMockObject partialMockForObject:[[RNNNavigationControllerPresenter alloc] init]]];
@@ -39,6 +41,16 @@
 	XCTAssertTrue(self.uut.childViewControllerForStatusBarStyle == self.uut.topViewController);
 }
 
+- (void)testCurrentChild_shouldReturnTopViewController {
+	XCTAssertTrue(self.uut.getCurrentChild == self.uut.topViewController);
+}
+
+- (void)testCurrentLeaf_shouldReturnCurrentChildLeaf {
+	[[_vc2Mock expect] getCurrentLeaf];
+	[self.uut getCurrentLeaf];
+	[_vc2Mock verify];
+}
+
 - (void)testGetLeafViewController_shouldReturnTopViewController {
 	XCTAssertTrue(self.uut.getCurrentChild == self.uut.topViewController);
 }

lib/ios/ReactNativeNavigationTests/RNNTabBarControllerTest.m

@@ -123,16 +123,14 @@
 	[parentMock verify];
 }
 
-- (void)testGetCurrentChild_shouldInvokeSelectedViewControllerGetCurrentChild {
-	[[self.mockChildViewController expect] getCurrentChild];
-	[self.mockUut getCurrentChild];
+- (void)testGetCurrentLeaf_shouldInvokeSelectedViewControllerGetCurrentLeaf {
+	[[self.mockChildViewController expect] getCurrentLeaf];
+	[self.mockUut getCurrentLeaf];
 	[self.mockChildViewController verify];
 }
 
-- (void)testGetCurrentChild_shouldInvokeOnSelectedViewController {
-	[[self.mockChildViewController expect] getCurrentChild];
-	[self.mockUut getCurrentChild];
-	[self.mockChildViewController verify];
+- (void)testGetCurrentChild_shouldReturnSelectedViewController {
+	XCTAssertEqual([self.mockUut getCurrentChild], [(RNNTabBarController *)self.mockUut selectedViewController]);
 }
 
 - (void)testPreferredStatusBarStyle_shouldInvokeSelectedViewControllerPreferredStatusBarStyle {