Decoupled native stack behavior from RNNStore

lib/ios/RNNCommandsHandler.m

 @implementation RNNCommandsHandler {
 	RNNControllerFactory *_controllerFactory;
 	RNNStore *_store;
-	RNNNavigationStackManager* _navigationStackManager;
 	RNNModalManager* _modalManager;
 	RNNOverlayManager* _overlayManager;
+	RNNNavigationStackManager* _stackManager;
 	RNNEventEmitter* _eventEmitter;
 }
 
 	_store = store;
 	_controllerFactory = controllerFactory;
 	_eventEmitter = eventEmitter;
-	_navigationStackManager = [[RNNNavigationStackManager alloc] initWithStore:_store];
 	_modalManager = [[RNNModalManager alloc] initWithStore:_store];
+	_stackManager = [[RNNNavigationStackManager alloc] init];
 	_overlayManager = [[RNNOverlayManager alloc] initWithStore:_store];
 	return self;
 }
 -(void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 
-	UIViewController<RNNRootViewProtocol, UIViewControllerPreviewingDelegate> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-
+	RNNRootViewController *newVc = (RNNRootViewController *)[_controllerFactory createLayoutAndSaveToStore:layout];
+	UIViewController *fromVC = [_store findComponentForId:componentId];
+	
 	if (newVc.options.preview.elementId) {
 		UIViewController* vc = [_store findComponentForId:componentId];
 
 			[rootVc registerForPreviewingWithDelegate:(id)rootVc sourceView:elementView];
 		}
 	} else {
-		[_navigationStackManager push:newVc onTop:componentId completion:^{
-			[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
-			completion();
-		} rejection:rejection];
+		[newVc onReactViewReady:^{
+			id animationDelegate = (newVc.options.animations.push.hasCustomAnimation || newVc.isCustomTransitioned) ? newVc : nil;
+			[_stackManager push:newVc onTop:fromVC animated:newVc.options.animations.push.enable animationDelegate:animationDelegate completion:^{
+				[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
+				completion();
+			} rejection:rejection];
+		}];
 	}
 }
 
 -(void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	
-	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
+	UIViewController<RNNRootViewProtocol> *newVC = [_controllerFactory createLayoutAndSaveToStore:layout];
+	UIViewController *fromVC = [_store findComponentForId:componentId];
 	__weak typeof(RNNEventEmitter*) weakEventEmitter = _eventEmitter;
-	[_navigationStackManager setStackRoot:newVc fromComponent:componentId completion:^{
+	[_stackManager setStackRoot:newVC fromViewController:fromVC animated:newVC.options.animations.push.enable completion:^{
 		[weakEventEmitter sendOnNavigationCommandCompletion:setStackRoot params:@{@"componentId": componentId}];
 		completion();
 	} rejection:rejection];
 -(void)pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 
-	[CATransaction begin];
-	[CATransaction setCompletionBlock:^{
+	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
+	UINavigationController *nvc = vc.navigationController;
+
+	if ([nvc topViewController] == vc) {
+		if (vc.options.animations.pop) {
+			nvc.delegate = vc;
+		} else {
+			nvc.delegate = nil;
+		}
+	} else {
+		NSMutableArray * vcs = nvc.viewControllers.mutableCopy;
+		[vcs removeObject:vc];
+		[nvc setViewControllers:vcs animated:vc.options.animations.pop.enable];
+	}
+	
+	[_stackManager pop:vc animated:vc.options.animations.pop.enable completion:^{
+		[_store removeComponent:componentId];
 		[_eventEmitter sendOnNavigationCommandCompletion:pop params:@{@"componentId": componentId}];
 		completion();
+	} rejection:^(NSString *code, NSString *message, NSError *error) {
+		
 	}];
-	
-	NSDictionary* animationData = options[@"customTransition"];
-	RNNAnimationOptions* transitionOptions = [[RNNAnimationOptions alloc] initWithDict:animationData];
-	
-	if (transitionOptions.animations){
-		[_navigationStackManager pop:componentId withTransitionOptions:transitionOptions rejection:rejection];
-	} else {
-		[_navigationStackManager pop:componentId withTransitionOptions:nil rejection:rejection];
-	}
-	[CATransaction commit];
 }
 
 -(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
-	[CATransaction begin];
-	[CATransaction setCompletionBlock:^{
+	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
+
+	[_stackManager popTo:vc animated:vc.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
 		[_eventEmitter sendOnNavigationCommandCompletion:popTo params:@{@"componentId": componentId}];
+		[self removePopedViewControllers:poppedViewControllers];
 		completion();
+	} rejection:^(NSString *code, NSString *message, NSError *error) {
+		
 	}];
-	
-	[_navigationStackManager popTo:componentId rejection:rejection];
-	
-	[CATransaction commit];
 }
 
 -(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
+	RNNRootViewController *newVc = (RNNRootViewController*)[_store findComponentForId:componentId];
 
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		completion();
 	}];
 	
-	[_navigationStackManager popToRoot:componentId rejection:rejection];
+	[_stackManager popToRoot:newVc animated:newVc.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
+		[self removePopedViewControllers:poppedViewControllers];
+	} rejection:^(NSString *code, NSString *message, NSError *error) {
+		
+	}];
 	
 	[CATransaction commit];
 }
 
 #pragma mark - private
 
+-(void)removePopedViewControllers:(NSArray*)viewControllers {
+	for (UIViewController *popedVC in viewControllers) {
+		[_store removeComponentByViewControllerInstance:popedVC];
+	}
+}
+
 -(void) assertReady {
 	if (!_store.isReadyToReceiveCommands) {
 		[[NSException exceptionWithName:@"BridgeNotLoadedError"

lib/ios/RNNNavigationController.m

 	return ((UIViewController<RNNRootViewProtocol>*)self.topViewController);
 }
 
-- (BOOL)isCustomTransitioned {
-	return NO;
+- (UINavigationController *)navigationController {
+	return self;
 }
 
 - (BOOL)isCustomViewController {

lib/ios/RNNNavigationStackManager.h

 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "RNNStore.h"
+
+typedef void (^RNNTransitionCompletionBlock)(void);
+typedef void (^RNNPopCompletionBlock)(NSArray* poppedViewControllers);
+typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, NSError *error);
 
 @interface RNNNavigationStackManager : NSObject
 
-@property (nonatomic) int loadCount;
--(instancetype)initWithStore:(RNNStore*)store;
+- (void)push:(UIViewController *)newTop onTop:(UIViewController *)onTopViewController animated:(BOOL)animated animationDelegate:(id)animationDelegate completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection;
+
+- (void)pop:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection;
+
+- (void)popTo:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection;
 
+- (void)popToRoot:(UIViewController*)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection;
 
--(void)push:(UIViewController<RNNRootViewProtocol>*)newTop onTop:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
--(void)pop:(NSString*)componentId withTransitionOptions:(RNNAnimationOptions*)transitionOptions rejection:(RCTPromiseRejectBlock)rejection;
--(void)popTo:(NSString*)componentId rejection:(RCTPromiseRejectBlock)rejection;
--(void)popToRoot:(NSString*)componentId rejection:(RCTPromiseRejectBlock)rejection;
--(void)setStackRoot:(UIViewController<RNNRootViewProtocol> *)newRoot fromComponent:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
+- (void)setStackRoot:(UIViewController *)newRoot fromViewController:(UIViewController *)fromViewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection;
 
 @end

lib/ios/RNNNavigationStackManager.m

 #import "RNNNavigationStackManager.h"
-#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
+typedef void (^RNNAnimationBlock)(void);
 
-@implementation RNNNavigationStackManager {
-	RNNStore *_store;
-	RNNTransitionCompletionBlock _completionBlock;
-}
+@implementation RNNNavigationStackManager
 
--(instancetype)initWithStore:(RNNStore*)store {
-	self = [super init];
-	_store = store;
-	return self;
-}
+- (void)push:(UIViewController *)newTop onTop:(UIViewController *)onTopViewController animated:(BOOL)animated animationDelegate:(id)animationDelegate completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+	UINavigationController *nvc = onTopViewController.navigationController;
 
--(void)push:(UIViewController<RNNRootViewProtocol> *)newTop onTop:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)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 {
-		[self waitForContentToAppearAndThen:@selector(pushAfterLoad:)];
-	}
-}
-
--(void)preparePush:(UIViewController<RNNRootViewProtocol> *)newTop onTopVC:(RNNNavigationController*)nvc completion:(RNNTransitionCompletionBlock)completion {
-	self.toVC = (RNNRootViewController*)newTop;
-	self.nvc = nvc;
-	
-	
-	if (self.toVC.options.animations.push.hasCustomAnimation || self.toVC.isCustomTransitioned) {
-		nvc.delegate = newTop;
+	if (animationDelegate) {
+		nvc.delegate = animationDelegate;
 	} else {
 		nvc.delegate = nil;
 		nvc.interactivePopGestureRecognizer.delegate = nil;
 	}
 	
-	_completionBlock = completion;
+	[self performAnimationBlock:^{
+		[nvc pushViewController:newTop animated:animated];
+	} completion:completion];
 }
 
--(void)waitForContentToAppearAndThen:(SEL)nameOfSelector {
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:nameOfSelector
-												 name: @"RCTContentDidAppearNotification"
-											   object:nil];
+- (void)pop:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection {
+	[self performAnimationBlock:^{
+		[viewController.navigationController popViewControllerAnimated:animated];
+	} completion:completion];
 }
 
--(void)pushAfterLoad:(NSDictionary*)notif {
-	[[NSNotificationCenter defaultCenter] removeObserver:self name:@"RCTContentDidAppearNotification" object:nil];
-	[CATransaction begin];
-	[CATransaction setCompletionBlock:^{
-		if (_completionBlock) {
-			_completionBlock();
-			_completionBlock = nil;
+- (void)popTo:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection; {
+	__block NSArray* poppedVCs;
+	
+	[self performAnimationBlock:^{
+		poppedVCs = [viewController.navigationController popToViewController:viewController animated:animated];
+	} completion:^{
+		if (completion) {
+			completion(poppedVCs);
 		}
 	}];
-	
-	[self.nvc pushViewController:self.toVC animated:self.toVC.options.animations.push.enable];
-	[CATransaction commit];
-	
-	self.toVC = 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];
-	UINavigationController* nvc = [self getComponentStack:componentId];
-	[self assertNavigationControllerExist:nvc reject:rejection];
+- (void)popToRoot:(UIViewController*)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection {
+	__block NSArray* poppedVCs;
 	
-	if ([nvc topViewController] == vc) {
-		if (vc.options.animations.pop) {
-			nvc.delegate = vc;
-			[nvc popViewControllerAnimated:vc.options.animations.pop.enable];
-		} else {
-			nvc.delegate = nil;
-			[nvc popViewControllerAnimated:vc.options.animations.pop.enable];
-		}
-	} else {
-		NSMutableArray * vcs = nvc.viewControllers.mutableCopy;
-		[vcs removeObject:vc];
-		[nvc setViewControllers:vcs animated:vc.options.animations.pop.enable];
-	}
-	[_store removeComponent:componentId];
+	[self performAnimationBlock:^{
+		poppedVCs = [viewController.navigationController popToRootViewControllerAnimated:animated];
+	} completion:^{
+		completion(poppedVCs);
+	}];
 }
 
--(void)popTo:(NSString*)componentId rejection:(RCTPromiseRejectBlock)rejection {
-	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	RNNNavigationController *nvc = [self getComponentStack:componentId];
-	[self assertNavigationControllerExist:nvc reject:rejection];
+- (void)setStackRoot:(UIViewController *)newRoot fromViewController:(UIViewController *)fromViewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection {
+	UINavigationController* nvc = fromViewController.navigationController;
 	
-	if (vc && nvc) {
-		NSArray *poppedVCs = [nvc popToViewController:vc animated:vc.options.animations.pop.enable];
-		[self removePopedViewControllers:poppedVCs];
-	}
+	[self performAnimationBlock:^{
+		[nvc setViewControllers:@[newRoot] animated:animated];
+	} completion:completion];
 }
 
--(void)popToRoot:(NSString*)componentId rejection:(RCTPromiseRejectBlock)rejection {
-	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	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 {
-	RNNNavigationController* nvc = [self getComponentStack:componentId];
+# pragma mark Private
 
-	[self assertNavigationControllerExist:nvc reject:rejection];
-	
+- (void)performAnimationBlock:(RNNAnimationBlock)animationBlock completion:(RNNTransitionCompletionBlock)completion {
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		if (completion) {
 		}
 	}];
 	
-	[nvc setViewControllers:@[newRoot] animated:newRoot.options.animations.push.enable];
+	animationBlock();
 	
 	[CATransaction commit];
 }
 
-- (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];
-	}
-}
 
 @end

lib/ios/RNNRootViewController.h

 #import "RNNTopTabsViewController.h"
 #import "RNNRootViewProtocol.h"
 
+@class RNNRootViewController;
+
+typedef void (^RNNReactViewReadyCompletionBlock)(void);
+
 @interface RNNRootViewController : UIViewController	<RNNRootViewProtocol, UIViewControllerPreviewingDelegate, UISearchResultsUpdating>
 
 @property (nonatomic, strong) RNNNavigationOptions* options;
 			   eventEmitter:(RNNEventEmitter*)eventEmitter
 		  isExternalComponent:(BOOL)isExternalComponent;
 
+- (void)onReactViewReady:(RNNReactViewReadyCompletionBlock)readyBlock;
 
 -(void)applyTabBarItem;
 -(void)applyTopTabsOptions;
 
--(BOOL)isCustomTransitioned;
-
 @end

lib/ios/RNNRootViewController.m

 	UIView* _customTopBar;
 	UIView* _customTopBarBackground;
 }
+
 @property (nonatomic, strong) NSString* componentName;
 @property (nonatomic) BOOL _statusBarHidden;
 @property (nonatomic) BOOL isExternalComponent;
 @property (nonatomic) BOOL _optionsApplied;
 @property (nonatomic, copy) void (^rotationBlock)(void);
+@property (nonatomic, copy) RNNReactViewReadyCompletionBlock reactViewReadyBlock;
+
 @end
 
 @implementation RNNRootViewController
 	
 	if (!self.isExternalComponent) {
 		self.view = [creator createRootView:self.componentName rootViewId:self.componentId];
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(reactViewReady)
+													 name: @"RCTContentDidAppearNotification"
+												   object:nil];
 	}
 	
 	[[NSNotificationCenter defaultCenter] addObserver:self
 	[self.eventEmitter sendComponentDidDisappear:self.componentId componentName:self.componentName];
 }
 
+- (void)reactViewReady {
+	if (_reactViewReadyBlock) {
+		_reactViewReadyBlock();
+		_reactViewReadyBlock = nil;
+	}
+	
+	[[NSNotificationCenter defaultCenter] removeObserver:self name:@"RCTContentDidAppearNotification" object:nil];
+}
+
+- (void)onReactViewReady:(RNNReactViewReadyCompletionBlock)readyBlock {
+	if (self.isCustomViewController) {
+		readyBlock();
+	} else {
+		self.reactViewReadyBlock = readyBlock;
+	}
+}
+
 -(void)updateSearchResultsForSearchController:(UISearchController *)searchController {
 	[self.eventEmitter sendOnSearchBarUpdated:self.componentId
 										 text:searchController.searchBar.text

lib/ios/RNNRootViewProtocol.h

 - (void)performOnRotation:(void (^)(void))block;
 - (void)optionsUpdated;
 - (void)applyModalOptions;
-
-@required
 - (BOOL)isCustomTransitioned;
 - (RNNNavigationOptions*)options;
+
+@required
 - (NSString *)componentId;
 
 @end

lib/ios/RNNSideMenuChildVC.m

 	return self.child.preferredStatusBarStyle;
 }
 
-- (BOOL)isCustomTransitioned {
-	return NO;
-}
-
-- (RNNOptions *)options {
-	return nil;
-}
-
 - (NSString *)componentId {
 	return _child.componentId;
 }

lib/ios/RNNSideMenuController.m

 	}
 }
 
-- (BOOL)isCustomTransitioned {
-	return NO;
-}
-
-- (RNNOptions *)options {
-	return nil;
-}
-
 - (NSString *)componentId {
 	return _center.componentId;
 }

lib/ios/RNNSplitViewController.h

 			rootViewCreator:(id<RNNRootViewCreator>)creator
 				  eventEmitter:(RNNEventEmitter*)eventEmitter;
 
--(BOOL)isCustomTransitioned;
-
 @end

lib/ios/RNNSplitViewController.m

 	[self.options mergeIfEmptyWith:options];
 }
 
--(BOOL)isCustomTransitioned {
-	return false;
-}
-
 @end

lib/ios/RNNStore.h

 #import "ReactNativeNavigation.h"
 
 typedef void (^RNNTransitionCompletionBlock)(void);
-//typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, NSError *error);
 
 @interface RNNStore : NSObject
 

lib/ios/RNNTabBarController.m

 	}
 }
 
-- (BOOL)isCustomTransitioned {
-	return NO;
-}
-
-- (RNNOptions *)options {
-	return nil;
-}
-
 - (void)mergeOptions:(NSDictionary *)options {
 	[((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) mergeOptions:options];
 }

lib/ios/RNNTopTabsViewController.m

     [super viewDidLoad];
 }
 
-- (BOOL)isCustomTransitioned {
-	return NO;
-}
-
-- (RNNOptions *)options {
-	return nil;
-}
-
 - (NSString *)componentId {
 	return _currentViewController.componentId;
 }

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

 #import "RNNNavigationOptions.h"
 #import "RNNTestRootViewCreator.h"
 #import "RNNRootViewController.h"
-#import "RNNNavigationController.h"
+#import "RNNNavigationStackManager.h"
+
+@interface MockUINavigationController : UINavigationController
+@property (nonatomic, strong) NSArray* willReturnVCs;
+@end
+
+@implementation MockUINavigationController
+
+-(NSArray<UIViewController *> *)popToViewController:(UIViewController *)viewController animated:(BOOL)animated {
+	return self.willReturnVCs;
+}
+
+-(NSArray<UIViewController *> *)popToRootViewControllerAnimated:(BOOL)animated {
+	return self.willReturnVCs;
+}
+
+@end
 
 @interface RNNCommandsHandlerTest : XCTestCase
 
 @property (nonatomic, strong) RNNStore* store;
 @property (nonatomic, strong) RNNCommandsHandler* uut;
+@property (nonatomic, strong) RNNRootViewController* vc1;
+@property (nonatomic, strong) RNNRootViewController* vc2;
+@property (nonatomic, strong) RNNRootViewController* vc3;
+@property (nonatomic, strong) MockUINavigationController* nvc;
 
 @end
 
 //	[self.store setReadyToReceiveCommands:true];
 	self.store = [[RNNStore alloc] init];
 	self.uut = [[RNNCommandsHandler alloc] initWithStore:self.store controllerFactory:nil eventEmitter:nil];
+	self.vc1 = [RNNRootViewController new];
+	self.vc2 = [RNNRootViewController new];
+	self.vc3 = [RNNRootViewController new];
+	_nvc = [[MockUINavigationController alloc] init];
+	[_nvc setViewControllers:@[self.vc1, self.vc2, self.vc3]];
+	[self.store setComponent:self.vc1 componentId:@"vc1"];
+	[self.store setComponent:self.vc2 componentId:@"vc2"];
+	[self.store setComponent:self.vc3 componentId:@"vc3"];
 }
 
 
 
 	[skipMethods addObject:@"initWithStore:controllerFactory:eventEmitter:"];
 	[skipMethods addObject:@"assertReady"];
+	[skipMethods addObject:@"removePopedViewControllers:"];
 	[skipMethods addObject:@".cxx_destruct"];
 
 	NSMutableArray* result = [NSMutableArray new];
 															rootViewCreator:[[RNNTestRootViewCreator alloc] init]
 															   eventEmitter:nil
 														  isExternalComponent:NO];
-	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:vc];
+	UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:vc];
 	[vc viewWillAppear:false];
 	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
 
 	}];
 }
 
+- (void)testPop_removeTopVCFromStore {
+	[self.store setReadyToReceiveCommands:true];
+	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
+
+	[self.uut pop:@"vc3" options:nil completion:^{
+		XCTAssertNil([self.store findComponentForId:@"vc3"]);
+		XCTAssertNotNil([self.store findComponentForId:@"vc2"]);
+		XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
+		[expectation fulfill];
+	} rejection:^(NSString *code, NSString *message, NSError *error) {
+		
+	}];
+	
+	[self waitForExpectationsWithTimeout:1 handler:nil];
+}
+
+- (void)testPopToSpecificVC_removeAllPopedVCFromStore {
+	[self.store setReadyToReceiveCommands:true];
+	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
+	_nvc.willReturnVCs = @[self.vc2, self.vc3];
+	[self.uut popTo:@"vc1" completion:^{
+		XCTAssertNil([self.store findComponentForId:@"vc2"]);
+		XCTAssertNil([self.store findComponentForId:@"vc3"]);
+		XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
+		[expectation fulfill];
+	} rejection:nil];
+	
+	[self waitForExpectationsWithTimeout:1 handler:nil];
+}
+
+- (void)testPopToRoot_removeAllTopVCsFromStore {
+	[self.store setReadyToReceiveCommands:true];
+	_nvc.willReturnVCs = @[self.vc2, self.vc3];
+	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
+	[self.uut popToRoot:@"vc3" completion:^{
+		XCTAssertNil([self.store findComponentForId:@"vc2"]);
+		XCTAssertNil([self.store findComponentForId:@"vc3"]);
+		XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
+		[expectation fulfill];
+	} rejection:nil];
+	
+	[self waitForExpectationsWithTimeout:1 handler:nil];
+}
+
 @end

lib/ios/ReactNativeNavigationTests/RNNNavigationStackManagerTest.m

 #import "RNNStore.h"
 #import "RNNNavigationStackManager.h"
 
-@interface MockUINavigationController : UINavigationController
-@property (nonatomic, strong) NSArray* willReturnVCs;
-@end
-
-@implementation MockUINavigationController
-
--(NSArray<UIViewController *> *)popToViewController:(UIViewController *)viewController animated:(BOOL)animated {
-	return self.willReturnVCs;
-}
-
--(NSArray<UIViewController *> *)popToRootViewControllerAnimated:(BOOL)animated {
-	return self.willReturnVCs;
-}
-
-@end
-
 
 @interface RNNNavigationStackManagerTest : XCTestCase
 
 @property (nonatomic, strong) RNNStore *store;
-@property (nonatomic, strong) RNNNavigationStackManager *uut;
-@property (nonatomic, strong) MockUINavigationController *nvc;
+@property (nonatomic, strong) UINavigationController *nvc;
 @property (nonatomic, strong) UIViewController *vc1;
 @property (nonatomic, strong) UIViewController *vc2;
 @property (nonatomic, strong) UIViewController *vc3;
+@property (nonatomic, strong) RNNNavigationStackManager *stackManager;
 
 @end
 
 - (void)setUp {
     [super setUp];
 	self.store = [RNNStore new];
-	self.uut = [[RNNNavigationStackManager alloc] initWithStore:self.store];
 	
-	self.nvc = [[MockUINavigationController alloc] init];
+	self.nvc = [[UINavigationController alloc] init];
 	self.vc1 = [RNNRootViewController new];
 	self.vc2 = [RNNRootViewController new];
 	self.vc3 = [RNNRootViewController new];
+	self.stackManager = [RNNNavigationStackManager new];
+	
 	NSArray *vcArray = @[self.vc1, self.vc2, self.vc3];
 	[self.nvc setViewControllers:vcArray];
-	
-	[self.store setComponent:self.vc1 componentId:@"vc1"];
-	[self.store setComponent:self.vc2 componentId:@"vc2"];
-	[self.store setComponent:self.vc3 componentId:@"vc3"];
-	
-	
 }
 
 
-- (void)testPop_removeTopVCFromStore {
-	[self.uut pop:@"vc3" withTransitionOptions:nil rejection:nil];
-	XCTAssertNil([self.store findComponentForId:@"vc3"]);
-	XCTAssertNotNil([self.store findComponentForId:@"vc2"]);
-	XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
+- (void)testPop_removeTopVCFromStack {
+	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
+	XCTAssertTrue([self.nvc.topViewController isEqual:self.vc3]);
+	[_stackManager popTo:self.vc2 animated:YES completion:^(NSArray *poppedViewControllers) {
+		XCTAssertTrue([self.nvc.topViewController isEqual:self.vc2]);
+		[expectation fulfill];
+	} rejection:nil];
+	
+	[self waitForExpectationsWithTimeout:1 handler:nil];
 }
 
-- (void)testPopToSpecificVC_removeAllPopedVCFromStore {
-	self.nvc.willReturnVCs = @[self.vc2, self.vc3];
-	[self.uut popTo:@"vc1" rejection:nil];
-	
-	XCTAssertNil([self.store findComponentForId:@"vc2"]);
-	XCTAssertNil([self.store findComponentForId:@"vc3"]);
-	XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
+- (void)testPopToSpecificVC_removeAllPopedVCFromStack {
+	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
+	XCTAssertFalse([self.nvc.topViewController isEqual:self.vc1]);
+	[_stackManager popTo:self.vc1 animated:NO completion:^(NSArray *poppedViewControllers) {
+		XCTAssertTrue([self.nvc.topViewController isEqual:self.vc1]);
+		[expectation fulfill];
+	} rejection:nil];
 	
+	[self waitForExpectationsWithTimeout:1 handler:nil];
 }
 
-- (void)testPopToRoot_removeAllTopVCsFromStore {
-	self.nvc.willReturnVCs = @[self.vc2, self.vc3];
-	[self.uut popToRoot:@"vc3" rejection:nil];
+- (void)testPopToRoot_removeAllTopVCsFromStack {
+	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
+	[_stackManager popToRoot:self.vc3 animated:NO completion:^(NSArray *poppedViewControllers) {
+		XCTAssertTrue(self.nvc.childViewControllers.count == 1);
+		XCTAssertTrue([self.nvc.topViewController isEqual:self.vc1]);
+		[expectation fulfill];
+	} rejection:nil];
 	
-	XCTAssertNil([self.store findComponentForId:@"vc2"]);
-	XCTAssertNil([self.store findComponentForId:@"vc3"]);
-	XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
-
+	[self waitForExpectationsWithTimeout:1 handler:nil];
 }
 
 - (void)testStackRoot_shouldUpdateNavigationControllerChildrenViewControllers {
-	self.nvc.willReturnVCs = @[self.vc1, self.vc2, self.vc3];
-	
-	[self.uut setStackRoot:self.vc2 fromComponent:@"vc1" completion:nil rejection:nil];
-	
-	XCTAssertEqual(self.nvc.viewControllers.lastObject, self.vc2);
-	XCTAssertEqual(self.nvc.viewControllers.count, 1);
+	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
+	[_stackManager setStackRoot:self.vc2 fromViewController:self.vc1 animated:NO completion:^{
+		XCTAssertTrue(self.nvc.childViewControllers.count == 1);
+		XCTAssertTrue([self.nvc.topViewController isEqual:self.vc2]);
+		[expectation fulfill];
+	} rejection:nil];
+
+	[self waitForExpectationsWithTimeout:1 handler:nil];
 }
 
 @end