adresses #2570 (#2574)

lib/ios/RNNModalManager.h

@@ -4,7 +4,7 @@
 
 @interface RNNModalManager : NSObject
 
-@property (nonatomic, strong) UIViewController* toVC;
+@property (nonatomic, strong) UIViewController<RNNRootViewProtocol>* toVC;
 
 -(instancetype)initWithStore:(RNNStore*)store;
 -(void)showModal:(UIViewController*)viewController completion:(RNNTransitionCompletionBlock)completion;

lib/ios/RNNModalManager.m

@@ -22,7 +22,7 @@
 -(void)showModalAfterLoad:(NSDictionary*)notif {
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:@"RCTContentDidAppearNotification" object:nil];
 	UIViewController *topVC = [self topPresentedVC];
-	[topVC presentViewController:self.toVC animated:YES completion:^{
+	[topVC presentViewController:self.toVC animated:self.toVC.isAnimated completion:^{
 		if (_completionBlock) {
 			_completionBlock();
 			_completionBlock = nil;
@@ -31,7 +31,7 @@
 }
 
 -(void)showModal:(UIViewController *)viewController completion:(RNNTransitionCompletionBlock)completion {
-	self.toVC = viewController;
+	self.toVC = (UIViewController<RNNRootViewProtocol>*)viewController;
 	_completionBlock = completion;
 	[self waitForContentToAppearAndThen:@selector(showModalAfterLoad:)];
 }
@@ -53,7 +53,7 @@
 -(void)removePendingNextModalIfOnTop {
 	NSString *componentId = [[_store pendingModalIdsToDismiss] lastObject];
 	
-	UIViewController *modalToDismiss = [_store findComponentForId:componentId];
+	UIViewController<RNNRootViewProtocol> *modalToDismiss = (UIViewController<RNNRootViewProtocol>*)[_store findComponentForId:componentId];
 	
 	if(!modalToDismiss) {
 		return;
@@ -62,7 +62,7 @@
 	UIViewController* topPresentedVC = [self topPresentedVC];
 	
 	if (modalToDismiss == topPresentedVC || [[topPresentedVC childViewControllers] containsObject:modalToDismiss]) {
-		[modalToDismiss dismissViewControllerAnimated:YES completion:^{
+		[modalToDismiss dismissViewControllerAnimated:modalToDismiss.isAnimated completion:^{
 			[[_store pendingModalIdsToDismiss] removeObject:componentId];
 			[self removePendingNextModalIfOnTop];
 		}];

lib/ios/RNNNavigationController.m

@@ -11,6 +11,11 @@
 	return NO;
 }
 
+- (BOOL)isAnimated {
+	UIViewController<RNNRootViewProtocol>* rootVC = (UIViewController<RNNRootViewProtocol>*) self.topViewController;
+	return rootVC.isAnimated;
+}
+
 - (NSString *)componentId {
 	return ((UIViewController<RNNRootViewProtocol>*)self.topViewController).componentId;
 }

lib/ios/RNNNavigationOptions.h

@@ -23,6 +23,7 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 
 @property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 
+@property (nonatomic, strong) NSNumber* animated;
 @property (nonatomic, strong) NSNumber* statusBarHidden;
 @property (nonatomic, strong) NSNumber* screenBackgroundColor;
 @property (nonatomic, strong) NSMutableDictionary* originalTopBarImages;

lib/ios/RNNNavigationOptions.m

@@ -31,6 +31,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	self.rootBackgroundImage = [RCTConvert UIImage:[options objectForKey:@"rootBackgroundImage"]];
 	self.bottomTab = [[RNNBottomTabOptions alloc] initWithDict:[options objectForKey:@"bottomTab"]];
 	self.overlay = [[RNNOverlayOptions alloc] initWithDict:[options objectForKey:@"overlay"]];
+	self.animated = [options objectForKey:@"animated"];
 	
 	return self;
 }

lib/ios/RNNNavigationStackManager.m

@@ -52,7 +52,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 		}
 	}];
 	
-	[[self.fromVC navigationController] pushViewController:self.toVC animated:YES];
+	[[self.fromVC navigationController] pushViewController:self.toVC animated:self.toVC.isAnimated];
 	[CATransaction commit];
 	
 	self.toVC = nil;
@@ -61,17 +61,17 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 }
 
 -(void)pop:(NSString *)componentId withAnimationData:(NSDictionary *)animationData {
-	UIViewController* vc = [_store findComponentForId:componentId];
+	UIViewController<RNNRootViewProtocol>* vc = (UIViewController<RNNRootViewProtocol>*)[_store findComponentForId:componentId];
 	UINavigationController* nvc = [vc navigationController];
 	if ([nvc topViewController] == vc) {
 		if (animationData) {
 			RNNRootViewController* RNNVC = (RNNRootViewController*)vc;
 			nvc.delegate = RNNVC;
 			[RNNVC.animator setupTransition:animationData];
-			[nvc popViewControllerAnimated:YES];
+			[nvc popViewControllerAnimated:vc.isAnimated];
 		} else {
 			nvc.delegate = nil;
-			[nvc popViewControllerAnimated:YES];
+			[nvc popViewControllerAnimated:vc.isAnimated];
 		}
 	} else {
 		NSMutableArray * vcs = nvc.viewControllers.mutableCopy;

lib/ios/RNNRootViewController.m

@@ -70,6 +70,10 @@
 	return self.animator != nil;
 }
 
+- (BOOL)isAnimated {
+	return self.options.animated ? [self.options.animated boolValue] : YES;
+}
+
 - (BOOL)prefersStatusBarHidden {
 	if ([self.options.statusBarHidden boolValue]) {
 		return YES;

lib/ios/RNNRootViewProtocol.h

@@ -5,6 +5,8 @@
 @required
 
 - (BOOL)isCustomTransitioned;
+- (BOOL)isAnimated;
+
 - (NSString *)componentId;
 
 @end

lib/ios/RNNSideMenuChildVC.m

@@ -37,6 +37,10 @@
 	return NO;
 }
 
+- (BOOL)isAnimated {
+	return YES;
+}
+
 - (NSString *)componentId {
 	return _child.componentId;
 }

lib/ios/RNNSideMenuController.m

@@ -76,6 +76,10 @@
 	return NO;
 }
 
+- (BOOL)isAnimated {
+	return YES;
+}
+
 - (NSString *)componentId {
 	return _center.componentId;
 }

lib/ios/RNNTabBarController.m

@@ -37,6 +37,10 @@
 	return NO;
 }
 
+- (BOOL)isAnimated {
+	return YES;
+}
+
 - (NSString *)componentId {
 	return ((UIViewController<RNNRootViewProtocol>*)self.selectedViewController).componentId;
 }

lib/ios/RNNTopTabsViewController.m

@@ -76,6 +76,10 @@
 	return NO;
 }
 
+- (BOOL)isAnimated {
+	return YES;
+}
+
 - (NSString *)componentId {
 	return _currentViewController.componentId;
 }

lib/ios/ReactNativeNavigationTests/RNNNavigationStackManagerTest.m

@@ -38,9 +38,9 @@
 	self.uut = [[RNNNavigationStackManager alloc] initWithStore:self.store];
 	
 	self.nvc = [[MockUINavigationController alloc] init];
-	self.vc1 = [UIViewController new];
-	self.vc2 = [UIViewController new];
-	self.vc3 = [UIViewController new];
+	self.vc1 = [RNNRootViewController new];
+	self.vc2 = [RNNRootViewController new];
+	self.vc3 = [RNNRootViewController new];
 	NSArray *vcArray = @[self.vc1, self.vc2, self.vc3];
 	[self.nvc setViewControllers:vcArray];
 	

playground/src/screens/ModalScreen.js

@@ -54,6 +54,9 @@ class ModalScreen extends Component {
         passProps: {
           modalPosition: this.getModalPosition() + 1,
           previousModalIds: _.concat([], this.props.previousModalIds || [], this.props.componentId)
+        },
+        options: {
+          animated: false
         }
       }
     });

playground/src/screens/WelcomeScreen.js

@@ -213,7 +213,10 @@ class WelcomeScreen extends Component {
   onClickPushOptionsScreen() {
     Navigation.push(this.props.componentId, {
       component: {
-        name: 'navigation.playground.OptionsScreen'
+        name: 'navigation.playground.OptionsScreen',
+        options: {
+          animated: false
+        }
       }
     });
   }