Adresses #3171

e2e/ScreenStack.test.js

@@ -99,7 +99,7 @@ describe('screen stack', () => {
     await expect(elementByLabel('Stack Position: 2')).toBeVisible();
   });
 
-  it(':android: push to stack with static id from SideMenu', async () => {
+  it('push to stack with static id from SideMenu', async () => {
     await elementById(testIDs.TAB_BASED_APP_SIDE_BUTTON).tap();
     await elementById(testIDs.SHOW_LEFT_SIDE_MENU_BUTTON).tap();
     await elementById(testIDs.LEFT_SIDE_MENU_PUSH_BUTTON).tap();

lib/ios/RNNNavigationStackManager.h

@@ -4,8 +4,6 @@
 
 @interface RNNNavigationStackManager : NSObject
 
-@property (nonatomic, strong) UIViewController* fromVC;
-@property (nonatomic, strong) RNNRootViewController* toVC;
 @property (nonatomic) int loadCount;
 -(instancetype)initWithStore:(RNNStore*)store;
 

lib/ios/RNNNavigationStackManager.m

@@ -2,9 +2,14 @@
 #import "RNNRootViewController.h"
 #import "RNNAnimator.h"
 #import "RNNErrorHandler.h"
-
+#import "RNNNavigationController.h"
 
 dispatch_queue_t RCTGetUIManagerQueue(void);
+@interface RNNNavigationStackManager()
+@property (nonatomic, strong) RNNNavigationController* nvc;
+@property (nonatomic, strong) RNNRootViewController* toVC;
+@end
+
 @implementation RNNNavigationStackManager {
 	RNNStore *_store;
 	RNNTransitionCompletionBlock _completionBlock;
@@ -17,9 +22,9 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 }
 
 -(void)push:(UIViewController<RNNRootViewProtocol> *)newTop onTop:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
-	UIViewController *vc = [_store findComponentForId:componentId];
-	[self preparePush:newTop onTopVC:vc completion:completion];
-	[self assertNavigationControllerExist:vc reject:rejection];
+	RNNNavigationController *nvc = [self getComponentStack:componentId];
+	[self assertNavigationControllerExist:nvc reject:rejection];
+	[self preparePush:newTop onTopVC:nvc completion:completion];
 	if ([newTop isCustomViewController]) {
 		[self pushAfterLoad:nil];
 	} else {
@@ -27,16 +32,16 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	}
 }
 
--(void)preparePush:(UIViewController<RNNRootViewProtocol> *)newTop onTopVC:(UIViewController*)vc completion:(RNNTransitionCompletionBlock)completion {
+-(void)preparePush:(UIViewController<RNNRootViewProtocol> *)newTop onTopVC:(RNNNavigationController*)nvc completion:(RNNTransitionCompletionBlock)completion {
 	self.toVC = (RNNRootViewController*)newTop;
-	self.fromVC = vc;
+	self.nvc = nvc;
 	
 	
 	if (self.toVC.options.animations.push.hasCustomAnimation || self.toVC.isCustomTransitioned) {
-		vc.navigationController.delegate = newTop;
+		nvc.delegate = newTop;
 	} else {
-		vc.navigationController.delegate = nil;
-		self.fromVC.navigationController.interactivePopGestureRecognizer.delegate = nil;
+		nvc.delegate = nil;
+		nvc.interactivePopGestureRecognizer.delegate = nil;
 	}
 	
 	_completionBlock = completion;
@@ -59,18 +64,19 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 		}
 	}];
 	
-	[[self.fromVC navigationController] pushViewController:self.toVC animated:self.toVC.options.animations.push.enable];
+	[self.nvc pushViewController:self.toVC animated:self.toVC.options.animations.push.enable];
 	[CATransaction commit];
 	
 	self.toVC = nil;
-	self.fromVC.navigationController.interactivePopGestureRecognizer.delegate = nil;
-	self.fromVC = nil;
+	self.nvc.interactivePopGestureRecognizer.delegate = nil;
+	self.nvc = nil;
 }
 
 -(void)pop:(NSString *)componentId withTransitionOptions:(RNNAnimationOptions *)transitionOptions rejection:(RCTPromiseRejectBlock)rejection {
 	RNNRootViewController* vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	[self assertNavigationControllerExist:vc reject:rejection];
-	UINavigationController* nvc = [vc navigationController];
+	UINavigationController* nvc = [self getComponentStack:componentId];
+	[self assertNavigationControllerExist:nvc reject:rejection];
+	
 	if ([nvc topViewController] == vc) {
 		if (vc.options.animations.pop) {
 			nvc.delegate = vc;
@@ -89,28 +95,27 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 
 -(void)popTo:(NSString*)componentId rejection:(RCTPromiseRejectBlock)rejection {
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	[self assertNavigationControllerExist:vc reject:rejection];
-	if (vc) {
-		UINavigationController *nvc = [vc navigationController];
-		if(nvc) {
-			NSArray *poppedVCs = [nvc popToViewController:vc animated:vc.options.animations.pop.enable];
-			[self removePopedViewControllers:poppedVCs];
-		}
+	RNNNavigationController *nvc = [self getComponentStack:componentId];
+	[self assertNavigationControllerExist:nvc reject:rejection];
+	
+	if (vc && nvc) {
+		NSArray *poppedVCs = [nvc popToViewController:vc animated:vc.options.animations.pop.enable];
+		[self removePopedViewControllers:poppedVCs];
 	}
 }
 
 -(void)popToRoot:(NSString*)componentId rejection:(RCTPromiseRejectBlock)rejection {
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	[self assertNavigationControllerExist:vc reject:rejection];
-	UINavigationController* nvc = [vc navigationController];
+	RNNNavigationController *nvc = [self getComponentStack:componentId];
+	[self assertNavigationControllerExist:nvc reject:rejection];
 	NSArray* poppedVCs = [nvc popToRootViewControllerAnimated:vc.options.animations.pop.enable];
 	[self removePopedViewControllers:poppedVCs];
 }
 
 -(void)setStackRoot:(UIViewController<RNNRootViewProtocol> *)newRoot fromComponent:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
-	UIViewController* vc = [_store findComponentForId:componentId];
-	[self assertNavigationControllerExist:vc reject:rejection];
-	UINavigationController* nvc = [vc navigationController];
+	RNNNavigationController* nvc = [self getComponentStack:componentId];
+
+	[self assertNavigationControllerExist:nvc reject:rejection];
 	
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
@@ -124,13 +129,22 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	[CATransaction commit];
 }
 
-- (void)assertNavigationControllerExist:(UIViewController *)viewController reject:(RCTPromiseRejectBlock)reject {
-	if (!viewController.navigationController) {
+- (void)assertNavigationControllerExist:(UINavigationController *)viewController reject:(RCTPromiseRejectBlock)reject {
+	if (![viewController isKindOfClass:[UINavigationController class]]) {
 		_completionBlock = nil;
 		[RNNErrorHandler reject:reject withErrorCode:RNNCommandErrorCodeNoStack errorDescription:[NSString stringWithFormat:@"%@ should be called from a stack child component", [RNNErrorHandler getCallerFunctionName]]];
 	}
 }
 
+- (RNNNavigationController*)getComponentStack:(NSString *)componentId {
+	UIViewController* component = [_store findComponentForId:componentId];
+	if ([component isKindOfClass:[UINavigationController class]]) {
+		return (RNNNavigationController*)component;
+	} else {
+		return (RNNNavigationController*)component.navigationController;
+	}
+}
+
 -(void)removePopedViewControllers:(NSArray*)viewControllers {
 	for (UIViewController *popedVC in viewControllers) {
 		[_store removeComponentByViewControllerInstance:popedVC];