Fix split view on iOS (#5961)

* Fix split view on iOS

* Fix units

* Remove stackManager

lib/ios/RNNBridgeManager.m

@@ -94,7 +94,7 @@
 	_componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator];
 	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator eventEmitter:eventEmitter store:_store componentRegistry:_componentRegistry andBridge:bridge bottomTabsAttachModeFactory:[BottomTabsAttachModeFactory new]];
 
-	_commandsHandler = [[RNNCommandsHandler alloc] initWithControllerFactory:controllerFactory eventEmitter:eventEmitter stackManager:[RNNNavigationStackManager new] modalManager:_modalManager overlayManager:_overlayManager mainWindow:_mainWindow];
+	_commandsHandler = [[RNNCommandsHandler alloc] initWithControllerFactory:controllerFactory eventEmitter:eventEmitter modalManager:_modalManager overlayManager:_overlayManager mainWindow:_mainWindow];
 	RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:_commandsHandler];
 
 	return [@[bridgeModule,eventEmitter] arrayByAddingObjectsFromArray:[self extraModulesFromDelegate]];

lib/ios/RNNCommandsHandler.h

@@ -1,14 +1,12 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-
 #import "RNNControllerFactory.h"
 #import "RNNModalManager.h"
-#import "RNNNavigationStackManager.h"
 #import "RNNOverlayManager.h"
 
 @interface RNNCommandsHandler : NSObject
 
-- (instancetype)initWithControllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter stackManager:(RNNNavigationStackManager *)stackManager modalManager:(RNNModalManager *)modalManager overlayManager:(RNNOverlayManager *)overlayManager mainWindow:(UIWindow *)mainWindow;
+- (instancetype)initWithControllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter modalManager:(RNNModalManager *)modalManager overlayManager:(RNNOverlayManager *)overlayManager mainWindow:(UIWindow *)mainWindow;
 
 @property (nonatomic) BOOL readyToReceiveCommands;
 

lib/ios/RNNCommandsHandler.m

@@ -7,6 +7,7 @@
 #import "UIViewController+LayoutProtocol.h"
 #import "RNNLayoutManager.h"
 #import "UIViewController+Utils.h"
+#import "UINavigationController+RNNCommands.h"
 #import "RNNAssert.h"
 
 static NSString* const setRoot	= @"setRoot";
@@ -32,18 +33,16 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	RNNControllerFactory *_controllerFactory;
 	RNNModalManager* _modalManager;
 	RNNOverlayManager* _overlayManager;
-	RNNNavigationStackManager* _stackManager;
 	RNNEventEmitter* _eventEmitter;
 	UIWindow* _mainWindow;
 }
 
-- (instancetype)initWithControllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter stackManager:(RNNNavigationStackManager *)stackManager modalManager:(RNNModalManager *)modalManager overlayManager:(RNNOverlayManager *)overlayManager mainWindow:(UIWindow *)mainWindow {
+- (instancetype)initWithControllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter  modalManager:(RNNModalManager *)modalManager overlayManager:(RNNOverlayManager *)overlayManager mainWindow:(UIWindow *)mainWindow {
 	self = [super init];
 	_controllerFactory = controllerFactory;
 	_eventEmitter = eventEmitter;
 	_modalManager = modalManager;
 	_modalManager.delegate = self;
-	_stackManager = stackManager;
 	_overlayManager = overlayManager;
 	_mainWindow = mainWindow;
 	return self;
@@ -162,7 +161,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	} else {
         newVc.waitForRender = newVc.resolveOptionsWithDefault.animations.push.shouldWaitForRender;
         [newVc setReactViewReadyCallback:^{
-            [self->_stackManager push:newVc onTop:fromVC animated:[newVc.resolveOptionsWithDefault.animations.push.enable getWithDefaultValue:YES] completion:^{
+            [fromVC.stack push:newVc onTop:fromVC animated:[newVc.resolveOptionsWithDefault.animations.push.enable getWithDefaultValue:YES] completion:^{
                 [self->_eventEmitter sendOnNavigationCommandCompletion:push commandId:commandId params:@{@"componentId": componentId}];
                 completion();
             } rejection:rejection];
@@ -189,7 +188,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
     newVC.waitForRender = ([options.animations.setStackRoot.waitForRender getWithDefaultValue:NO]);
     [newVC setReactViewReadyCallback:^{
-        [self->_stackManager setStackChildren:childViewControllers fromViewController:fromVC animated:[options.animations.setStackRoot.enable getWithDefaultValue:YES] completion:^{
+        [fromVC.stack setStackChildren:childViewControllers fromViewController:fromVC animated:[options.animations.setStackRoot.enable getWithDefaultValue:YES] completion:^{
             [weakEventEmitter sendOnNavigationCommandCompletion:setStackRoot commandId:commandId params:@{@"componentId": componentId}];
             completion();
         } rejection:rejection];
@@ -206,7 +205,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
 	[vc overrideOptions:options];
 	
-	[_stackManager pop:vc animated:[vc.resolveOptionsWithDefault.animations.pop.enable getWithDefaultValue:YES] completion:^{
+	[vc.stack pop:vc animated:[vc.resolveOptionsWithDefault.animations.pop.enable getWithDefaultValue:YES] completion:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:pop commandId:commandId params:@{@"componentId": componentId}];
 		completion();
 	} rejection:rejection];
@@ -220,7 +219,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
 	[vc overrideOptions:options];
 	
-	[_stackManager popTo:vc animated:[vc.resolveOptionsWithDefault.animations.pop.enable getWithDefaultValue:YES] completion:^(NSArray *poppedViewControllers) {
+	[vc.stack popTo:vc animated:[vc.resolveOptionsWithDefault.animations.pop.enable getWithDefaultValue:YES] completion:^(NSArray *poppedViewControllers) {
 		[_eventEmitter sendOnNavigationCommandCompletion:popTo commandId:commandId params:@{@"componentId": componentId}];
 		completion();
 	} rejection:rejection];
@@ -240,7 +239,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		completion();
 	}];
 	
-	[_stackManager popToRoot:vc animated:[vc.resolveOptionsWithDefault.animations.pop.enable getWithDefaultValue:YES] completion:^(NSArray *poppedViewControllers) {
+	[vc.stack popToRoot:vc animated:[vc.resolveOptionsWithDefault.animations.pop.enable getWithDefaultValue:YES] completion:^(NSArray *poppedViewControllers) {
 		
 	} rejection:^(NSString *code, NSString *message, NSError *error) {
 		

lib/ios/RNNNavigationStackManager.m

@@ -1,99 +0,0 @@
-#import "RNNNavigationStackManager.h"
-#import "RNNErrorHandler.h"
-#import <React/RCTI18nUtil.h>
-
-typedef void (^RNNAnimationBlock)(void);
-
-@implementation RNNNavigationStackManager
-
-- (void)push:(UIViewController *)newTop onTop:(UIViewController *)onTopViewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
-	UINavigationController *nvc = onTopViewController.navigationController;
-
-	if([[RCTI18nUtil sharedInstance] isRTL]) {
-		nvc.view.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
-		nvc.navigationBar.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
-	} else {
-		nvc.view.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
-		nvc.navigationBar.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
-	}
-	
-	[self performAnimationBlock:^{
-		[nvc pushViewController:newTop animated:animated];
-	} completion:completion];
-}
-
-- (void)pop:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection {
-    UINavigationController *nvc = viewController.navigationController;
-    if ([nvc.viewControllers indexOfObject:viewController] < 0) {
-        [RNNErrorHandler reject:rejection withErrorCode:1012 errorDescription:@"popping component failed"];
-        return;
-    }
-    
-    if ([nvc topViewController] != viewController) {
-        NSMutableArray * vcs = nvc.viewControllers.mutableCopy;
-        [vcs removeObject:viewController];
-        [self performAnimationBlock:^{
-            [nvc setViewControllers:vcs animated:animated];
-        } completion:^{
-            completion();
-        }];
-    } else {
-        [self performAnimationBlock:^{
-            [viewController.navigationController popViewControllerAnimated:animated];
-        } completion:^{
-            completion();
-        }];
-    }
-}
-
-- (void)popTo:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection; {
-	__block NSArray* poppedVCs;
-	
-	if ([viewController.navigationController.childViewControllers containsObject:viewController]) {
-		[self performAnimationBlock:^{
-			poppedVCs = [viewController.navigationController popToViewController:viewController animated:animated];
-		} completion:^{
-			if (completion) {
-				completion(poppedVCs);
-			}
-		}];
-	} else {
-		[RNNErrorHandler reject:rejection withErrorCode:1011 errorDescription:@"component not found in stack"];
-	}
-}
-
-- (void)popToRoot:(UIViewController*)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection {
-	__block NSArray* poppedVCs;
-	
-	[self performAnimationBlock:^{
-		poppedVCs = [viewController.navigationController popToRootViewControllerAnimated:animated];
-	} completion:^{
-		completion(poppedVCs);
-	}];
-}
-
-- (void)setStackChildren:(NSArray<UIViewController *> *)children fromViewController:(UIViewController *)fromViewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection {
-	UINavigationController* nvc = fromViewController.navigationController;
-	
-	[self performAnimationBlock:^{
-		[nvc setViewControllers:children animated:animated];
-	} completion:completion];
-}
-
-# pragma mark Private
-
-- (void)performAnimationBlock:(RNNAnimationBlock)animationBlock completion:(RNNTransitionCompletionBlock)completion {
-	[CATransaction begin];
-	[CATransaction setCompletionBlock:^{
-		if (completion) {
-			completion();
-		}
-	}];
-	
-	animationBlock();
-	
-	[CATransaction commit];
-}
-
-
-@end

lib/ios/RNNSplitViewController.h

@@ -5,6 +5,4 @@
 
 @interface RNNSplitViewController : UISplitViewController <RNNLayoutProtocol>
 
-- (void)bindChildViewControllers:(NSArray<UIViewController<RNNLayoutProtocol> *> *)viewControllers;
-
 @end

lib/ios/RNNSplitViewController.m

@@ -3,10 +3,10 @@
 
 @implementation RNNSplitViewController
 
-- (void)bindChildViewControllers:(NSArray<UIViewController<RNNLayoutProtocol> *> *)viewControllers {
-	[self setViewControllers:viewControllers];
-	UIViewController<UISplitViewControllerDelegate>* masterViewController = viewControllers[0];
-	self.delegate = masterViewController;
+- (void)setViewControllers:(NSArray<__kindof UIViewController *> *)viewControllers {
+    [super setViewControllers:viewControllers];
+    UIViewController<UISplitViewControllerDelegate>* masterViewController = viewControllers[0];
+    self.delegate = masterViewController;
 }
 
 -(void)viewWillAppear:(BOOL)animated{

lib/ios/RNNStackController.h

@@ -1,6 +1,7 @@
 #import <UIKit/UIKit.h>
 #import "RNNStackPresenter.h"
 #import "UINavigationController+RNNOptions.h"
+#import "UINavigationController+RNNCommands.h"
 #import "UIViewController+LayoutProtocol.h"
 
 @interface RNNStackController : UINavigationController <RNNLayoutProtocol>

lib/ios/RNNStackController.m

@@ -32,10 +32,6 @@
     [self.parentViewController mergeChildOptions:options child:child];
 }
 
-- (UINavigationController *)navigationController {
-	return self;
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
 	return [_presenter getStatusBarStyle:self.resolveOptions];
 }

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -13,8 +13,6 @@
 		21B85E5F1F44482A00B314B5 /* RNNNavigationButtons.h in Headers */ = {isa = PBXBuildFile; fileRef = 21B85E5E1F44482A00B314B5 /* RNNNavigationButtons.h */; };
 		261F0E641E6EC94900989DE2 /* RNNModalManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 261F0E621E6EC94900989DE2 /* RNNModalManager.h */; };
 		261F0E651E6EC94900989DE2 /* RNNModalManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 261F0E631E6EC94900989DE2 /* RNNModalManager.m */; };
-		261F0E6A1E6F028A00989DE2 /* RNNNavigationStackManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 261F0E681E6F028A00989DE2 /* RNNNavigationStackManager.h */; };
-		261F0E6B1E6F028A00989DE2 /* RNNNavigationStackManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 261F0E691E6F028A00989DE2 /* RNNNavigationStackManager.m */; };
 		263905AE1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 2639058A1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h */; };
 		263905AF1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 2639058B1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m */; };
 		263905B01E4C6F440023D7D3 /* MMDrawerController+Subclass.h in Headers */ = {isa = PBXBuildFile; fileRef = 2639058C1E4C6F440023D7D3 /* MMDrawerController+Subclass.h */; };
@@ -327,6 +325,8 @@
 		50CED44E239EA78700C42EE2 /* TopBarAppearancePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 50CED44C239EA78700C42EE2 /* TopBarAppearancePresenter.m */; };
 		50CED451239F9DFC00C42EE2 /* TopBarPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 50CED44F239F9DFC00C42EE2 /* TopBarPresenter.h */; };
 		50CED452239F9DFC00C42EE2 /* TopBarPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 50CED450239F9DFC00C42EE2 /* TopBarPresenter.m */; };
+		50CF23392405668C0098042D /* UINavigationController+RNNCommands.h in Headers */ = {isa = PBXBuildFile; fileRef = 50CF23372405668C0098042D /* UINavigationController+RNNCommands.h */; };
+		50CF233A2405668C0098042D /* UINavigationController+RNNCommands.m in Sources */ = {isa = PBXBuildFile; fileRef = 50CF23382405668C0098042D /* UINavigationController+RNNCommands.m */; };
 		50D031342005149000386B3D /* RNNOverlayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 50D031322005149000386B3D /* RNNOverlayManager.h */; };
 		50D031352005149000386B3D /* RNNOverlayManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 50D031332005149000386B3D /* RNNOverlayManager.m */; };
 		50D3A36E23B8D6C600717F95 /* SharedElementTransitionsCreator.h in Headers */ = {isa = PBXBuildFile; fileRef = 50D3A36C23B8D6C600717F95 /* SharedElementTransitionsCreator.h */; };
@@ -488,8 +488,6 @@
 		21B85E5E1F44482A00B314B5 /* RNNNavigationButtons.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNNavigationButtons.h; sourceTree = "<group>"; };
 		261F0E621E6EC94900989DE2 /* RNNModalManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNModalManager.h; sourceTree = "<group>"; };
 		261F0E631E6EC94900989DE2 /* RNNModalManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNModalManager.m; sourceTree = "<group>"; };
-		261F0E681E6F028A00989DE2 /* RNNNavigationStackManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNNavigationStackManager.h; sourceTree = "<group>"; };
-		261F0E691E6F028A00989DE2 /* RNNNavigationStackManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationStackManager.m; sourceTree = "<group>"; };
 		2639058A1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMDrawerBarButtonItem.h; sourceTree = "<group>"; };
 		2639058B1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMDrawerBarButtonItem.m; sourceTree = "<group>"; };
 		2639058C1E4C6F440023D7D3 /* MMDrawerController+Subclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MMDrawerController+Subclass.h"; sourceTree = "<group>"; };
@@ -809,6 +807,8 @@
 		50CED44C239EA78700C42EE2 /* TopBarAppearancePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TopBarAppearancePresenter.m; sourceTree = "<group>"; };
 		50CED44F239F9DFC00C42EE2 /* TopBarPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TopBarPresenter.h; sourceTree = "<group>"; };
 		50CED450239F9DFC00C42EE2 /* TopBarPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TopBarPresenter.m; sourceTree = "<group>"; };
+		50CF23372405668C0098042D /* UINavigationController+RNNCommands.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationController+RNNCommands.h"; sourceTree = "<group>"; };
+		50CF23382405668C0098042D /* UINavigationController+RNNCommands.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+RNNCommands.m"; sourceTree = "<group>"; };
 		50D031322005149000386B3D /* RNNOverlayManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOverlayManager.h; sourceTree = "<group>"; };
 		50D031332005149000386B3D /* RNNOverlayManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayManager.m; sourceTree = "<group>"; };
 		50D3A36C23B8D6C600717F95 /* SharedElementTransitionsCreator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SharedElementTransitionsCreator.h; sourceTree = "<group>"; };
@@ -1425,8 +1425,6 @@
 			children = (
 				261F0E621E6EC94900989DE2 /* RNNModalManager.h */,
 				261F0E631E6EC94900989DE2 /* RNNModalManager.m */,
-				261F0E681E6F028A00989DE2 /* RNNNavigationStackManager.h */,
-				261F0E691E6F028A00989DE2 /* RNNNavigationStackManager.m */,
 				50D031322005149000386B3D /* RNNOverlayManager.h */,
 				50D031332005149000386B3D /* RNNOverlayManager.m */,
 				5050465221F8F4490035497A /* RNNReactComponentRegistry.h */,
@@ -1578,6 +1576,8 @@
 				5038A3B0216DF41B009280BC /* UIViewController+RNNOptions.m */,
 				5038A3B3216DF602009280BC /* UINavigationController+RNNOptions.h */,
 				5038A3B4216DF602009280BC /* UINavigationController+RNNOptions.m */,
+				50CF23372405668C0098042D /* UINavigationController+RNNCommands.h */,
+				50CF23382405668C0098042D /* UINavigationController+RNNCommands.m */,
 				5038A3B7216DFCFD009280BC /* UITabBarController+RNNOptions.h */,
 				5038A3B8216DFCFD009280BC /* UITabBarController+RNNOptions.m */,
 				651E1F8821FD611600DFEA19 /* UISplitViewController+RNNOptions.h */,
@@ -1809,6 +1809,7 @@
 				5048862D20BE976D000908DE /* RNNLayoutOptions.h in Headers */,
 				50BCB29123F2C7CD00D6C8E5 /* AnchorTransition.h in Headers */,
 				5038A374216CDDB6009280BC /* UIViewController+SideMenuController.h in Headers */,
+				50CF23392405668C0098042D /* UINavigationController+RNNCommands.h in Headers */,
 				E8A5CD621F49114F00E89D0D /* RNNElement.h in Headers */,
 				50CED449239EA56100C42EE2 /* TopBarPresenterCreator.h in Headers */,
 				5012240E21735999000F5F98 /* RNNBasePresenter.h in Headers */,
@@ -2024,7 +2025,6 @@
 				E8A5CD531F464F0400E89D0D /* StackTransitionDelegate.m in Sources */,
 				50CB3B6A1FDE911400AA153B /* RNNSideMenuOptions.m in Sources */,
 				503A8A0623BB850A0094D1C4 /* TimeInterval.m in Sources */,
-				261F0E6B1E6F028A00989DE2 /* RNNNavigationStackManager.m in Sources */,
 				5016E8F020209690009D4F7C /* RNNCustomTitleView.m in Sources */,
 				5061B6C823D48449008B9827 /* VerticalRotationTransition.m in Sources */,
 				5022EDB62405224B00852BA6 /* BottomTabPresenter.m in Sources */,
@@ -2043,6 +2043,7 @@
 				5022EDC624054C6100852BA6 /* BottomTabsAppearancePresenter.m in Sources */,
 				7B1126A01E2D263F00F9B03B /* RNNEventEmitter.m in Sources */,
 				A7626BFD1FC2FB2C00492FB8 /* RNNTopBarOptions.m in Sources */,
+				50CF233A2405668C0098042D /* UINavigationController+RNNCommands.m in Sources */,
 				5050465521F8F4490035497A /* RNNReactComponentRegistry.m in Sources */,
 				509416AC23A11CB20036092C /* NullEnum.m in Sources */,
 				503A8A1A23BCB2ED0094D1C4 /* RNNReactButtonView.m in Sources */,

lib/ios/RNNNavigationStackManager.h → lib/ios/UINavigationController+RNNCommands.h

@@ -1,11 +1,11 @@
-#import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
 typedef void (^RNNTransitionCompletionBlock)(void);
 typedef void (^RNNPopCompletionBlock)(NSArray* poppedViewControllers);
 typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, NSError *error);
 
-@interface RNNNavigationStackManager : NSObject
+
+@interface UINavigationController (RNNCommands)
 
 - (void)push:(UIViewController *)newTop onTop:(UIViewController *)onTopViewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection;
 
@@ -17,4 +17,5 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, N
 
 - (void)setStackChildren:(NSArray<UIViewController *> *)children fromViewController:(UIViewController *)fromViewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection;
 
+
 @end

lib/ios/UINavigationController+RNNCommands.m

@@ -0,0 +1,91 @@
+#import "UINavigationController+RNNCommands.h"
+#import "RNNErrorHandler.h"
+#import <React/RCTI18nUtil.h>
+
+typedef void (^RNNAnimationBlock)(void);
+
+@implementation UINavigationController (RNNCommands)
+
+- (void)push:(UIViewController *)newTop onTop:(UIViewController *)onTopViewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+    if([[RCTI18nUtil sharedInstance] isRTL]) {
+        self.view.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
+        self.navigationBar.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
+    } else {
+        self.view.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
+        self.navigationBar.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
+    }
+    
+    [self performAnimationBlock:^{
+        [self pushViewController:newTop animated:animated];
+    } completion:completion];
+}
+
+- (void)pop:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection {
+    if ([self.viewControllers indexOfObject:viewController] < 0) {
+        [RNNErrorHandler reject:rejection withErrorCode:1012 errorDescription:@"popping component failed"];
+        return;
+    }
+    
+    if ([self topViewController] != viewController) {
+        NSMutableArray * vcs = self.viewControllers.mutableCopy;
+        [vcs removeObject:viewController];
+        [self performAnimationBlock:^{
+            [self setViewControllers:vcs animated:animated];
+        } completion:^{
+            completion();
+        }];
+    } else {
+        [self performAnimationBlock:^{
+            [self popViewControllerAnimated:animated];
+        } completion:^{
+            completion();
+        }];
+    }
+}
+
+- (void)popTo:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection; {
+    __block NSArray* poppedVCs;
+    if ([self.childViewControllers containsObject:viewController]) {
+        [self performAnimationBlock:^{
+            poppedVCs = [self popToViewController:viewController animated:animated];
+        } completion:^{
+            if (completion) {
+                completion(poppedVCs);
+            }
+        }];
+    } else {
+        [RNNErrorHandler reject:rejection withErrorCode:1011 errorDescription:@"component not found in stack"];
+    }
+}
+
+- (void)popToRoot:(UIViewController*)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection {
+    __block NSArray* poppedVCs;
+    [self performAnimationBlock:^{
+        poppedVCs = [self popToRootViewControllerAnimated:animated];
+    } completion:^{
+        completion(poppedVCs);
+    }];
+}
+
+- (void)setStackChildren:(NSArray<UIViewController *> *)children fromViewController:(UIViewController *)fromViewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection {
+    [self performAnimationBlock:^{
+        [self setViewControllers:children animated:animated];
+    } completion:completion];
+}
+
+# pragma mark Private
+
+- (void)performAnimationBlock:(RNNAnimationBlock)animationBlock completion:(RNNTransitionCompletionBlock)completion {
+    [CATransaction begin];
+    [CATransaction setCompletionBlock:^{
+        if (completion) {
+            completion();
+        }
+    }];
+    
+    animationBlock();
+    
+    [CATransaction commit];
+}
+
+@end

lib/ios/UIViewController+LayoutProtocol.h

@@ -18,6 +18,8 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewController *)child;
 
+- (UINavigationController *)stack;
+
 - (RNNNavigationOptions *)resolveOptions;
 
 - (RNNNavigationOptions *)resolveOptionsWithDefault;

lib/ios/UIViewController+LayoutProtocol.m

@@ -60,6 +60,14 @@
 	return interfaceOrientationMask;
 }
 
+- (UINavigationController *)stack {
+    if ([self isKindOfClass:UINavigationController.class]) {
+        return (UINavigationController *)self;
+    } else {
+        return self.navigationController;
+    }
+}
+
 - (void)render {
     if (!self.waitForRender) {
         [self readyForPresentation];

playground/ios/NavigationTests/RNNCommandsHandlerTest.m

@@ -69,7 +69,7 @@
 	self.overlayManager = [OCMockObject partialMockForObject:[RNNOverlayManager new]];
 	self.modalManager = [OCMockObject partialMockForObject:[RNNModalManager new]];
 	self.controllerFactory = [OCMockObject partialMockForObject:[[RNNControllerFactory alloc] initWithRootViewCreator:nil eventEmitter:self.eventEmmiter store:nil componentRegistry:nil andBridge:nil bottomTabsAttachModeFactory:[BottomTabsAttachModeFactory new]]];
-	self.uut = [[RNNCommandsHandler alloc] initWithControllerFactory:self.controllerFactory eventEmitter:self.eventEmmiter stackManager:[RNNNavigationStackManager new] modalManager:self.modalManager overlayManager:self.overlayManager mainWindow:_mainWindow];
+	self.uut = [[RNNCommandsHandler alloc] initWithControllerFactory:self.controllerFactory eventEmitter:self.eventEmmiter modalManager:self.modalManager overlayManager:self.overlayManager mainWindow:_mainWindow];
 	self.vc1 = [self generateComponentWithComponentId:@"1"];
 	self.vc2 = [self generateComponentWithComponentId:@"2"];
 	self.vc3 = [self generateComponentWithComponentId:@"3"];
@@ -98,7 +98,7 @@
 - (NSArray*)getPublicMethodNamesForObject:(NSObject*)obj {
 	NSMutableArray* skipMethods = [NSMutableArray new];
 	
-	[skipMethods addObject:@"initWithControllerFactory:eventEmitter:stackManager:modalManager:overlayManager:mainWindow:"];
+	[skipMethods addObject:@"initWithControllerFactory:eventEmitter:modalManager:overlayManager:mainWindow:"];
 	[skipMethods addObject:@"assertReady"];
 	[skipMethods addObject:@"setReadyToReceiveCommands:"];
 	[skipMethods addObject:@"readyToReceiveCommands"];

playground/ios/NavigationTests/RNNNavigationStackManagerTest.m

@@ -1,5 +1,4 @@
 #import <XCTest/XCTest.h>
-#import "RNNNavigationStackManager.h"
 #import "RNNComponentViewController.h"
 #import "RNNStackController.h"
 
@@ -9,7 +8,6 @@
 @property (nonatomic, strong) UIViewController *vc1;
 @property (nonatomic, strong) UIViewController *vc2;
 @property (nonatomic, strong) UIViewController *vc3;
-@property (nonatomic, strong) RNNNavigationStackManager *stackManager;
 
 @end
 
@@ -22,7 +20,6 @@
 	self.vc1 = [RNNComponentViewController new];
 	self.vc2 = [RNNComponentViewController new];
 	self.vc3 = [RNNComponentViewController new];
-	self.stackManager = [RNNNavigationStackManager new];
 	
 	NSArray *vcArray = @[self.vc1, self.vc2, self.vc3];
 	[self.nvc setViewControllers:vcArray];
@@ -32,7 +29,7 @@
 - (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) {
+	[_nvc popTo:self.vc2 animated:YES completion:^(NSArray *poppedViewControllers) {
 		XCTAssertTrue([self.nvc.topViewController isEqual:self.vc2]);
 		[expectation fulfill];
 	} rejection:nil];
@@ -43,7 +40,7 @@
 - (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) {
+	[_nvc popTo:self.vc1 animated:NO completion:^(NSArray *poppedViewControllers) {
 		XCTAssertTrue([self.nvc.topViewController isEqual:self.vc1]);
 		[expectation fulfill];
 	} rejection:nil];
@@ -53,7 +50,7 @@
 
 - (void)testPopToRoot_removeAllTopVCsFromStack {
 	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
-	[_stackManager popToRoot:self.vc3 animated:NO completion:^(NSArray *poppedViewControllers) {
+	[_nvc popToRoot:self.vc3 animated:NO completion:^(NSArray *poppedViewControllers) {
 		XCTAssertTrue(self.nvc.childViewControllers.count == 1);
 		XCTAssertTrue([self.nvc.topViewController isEqual:self.vc1]);
 		[expectation fulfill];
@@ -64,7 +61,7 @@
 
 - (void)testStackRoot_shouldUpdateNavigationControllerChildrenViewControllers {
 	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
-	[_stackManager setStackChildren:@[self.vc2] fromViewController:self.vc1 animated:NO completion:^{
+	[_nvc setStackChildren:@[self.vc2] fromViewController:self.vc1 animated:NO completion:^{
 		XCTAssertTrue(self.nvc.childViewControllers.count == 1);
 		XCTAssertTrue([self.nvc.topViewController isEqual:self.vc2]);
 		[expectation fulfill];