Refactored modals and added tests (#3955)

lib/ios/RNNCommandsHandler.m

@@ -204,9 +204,16 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-	[_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable completion:^(NSString *componentId) {
-		[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
-		completion(componentId);
+	
+	if ([newVc respondsToSelector:@selector(applyModalOptions)]) {
+		[newVc.getLeafViewController applyModalOptions];
+	}
+	
+	[newVc.getLeafViewController waitForReactViewRender:newVc.getLeafViewController.options.animations.showModal.waitForRender perform:^{
+		[_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable hasCustomAnimation:newVc.getLeafViewController.options.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
+			[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
+			completion(componentId);
+		}];
 	}];
 }
 

lib/ios/RNNModalManager.h

@@ -11,10 +11,10 @@
 
 @interface RNNModalManager : NSObject
 
-@property (nonatomic, strong) UIViewController<RNNRootViewProtocol>* toVC;
 @property (nonatomic, weak) id<RNNModalManagerDelegate> delegate;
 
-- (void)showModal:(UIViewController*)viewController animated:(BOOL)animated completion:(RNNTransitionWithComponentIdCompletionBlock)completion;
+- (void)showModal:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionWithComponentIdCompletionBlock)completion;
+- (void)showModal:(UIViewController *)viewController animated:(BOOL)animated hasCustomAnimation:(BOOL)hasCustomAnimation completion:(RNNTransitionWithComponentIdCompletionBlock)completion;
 - (void)dismissModal:(UIViewController *)viewController completion:(RNNTransitionCompletionBlock)completion;
 - (void)dismissAllModalsAnimated:(BOOL)animated;
 

lib/ios/RNNModalManager.m

@@ -2,7 +2,6 @@
 #import "RNNRootViewController.h"
 
 @implementation RNNModalManager {
-	RNNTransitionWithComponentIdCompletionBlock _completionBlock;
 	NSMutableArray* _pendingModalIdsToDismiss;
 	NSMutableArray* _presentedModals;
 }
@@ -16,51 +15,31 @@
 	return self;
 }
 
--(void)showModal:(BOOL)animated {
+-(void)showModal:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
+	[self showModal:viewController animated:animated hasCustomAnimation:NO completion:completion];
+}
+
+-(void)showModal:(UIViewController *)viewController animated:(BOOL)animated hasCustomAnimation:(BOOL)hasCustomAnimation completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
+	if (!viewController) {
+		@throw [NSException exceptionWithName:@"ShowUnknownModal" reason:@"showModal called with nil viewController" userInfo:nil];
+	}
+	
 	UIViewController* topVC = [self topPresentedVC];
 	topVC.definesPresentationContext = YES;
 	
-	if ([topVC conformsToProtocol:@protocol(RNNRootViewProtocol)]) {
-		UIViewController<RNNRootViewProtocol> *navigationTopVC = (UIViewController<RNNRootViewProtocol>*)topVC;
-		RNNNavigationOptions* options = navigationTopVC.getLeafViewController.options;
-		if (options.animations.showModal.hasCustomAnimation) {
-			self.toVC.transitioningDelegate = navigationTopVC;
-		}
+	if (hasCustomAnimation) {
+		viewController.transitioningDelegate = (UIViewController<UIViewControllerTransitioningDelegate>*)topVC;
 	}
 	
-	[topVC presentViewController:self.toVC animated:animated completion:^{
-		if (_completionBlock) {
-			_completionBlock(self.toVC.getLeafViewController.componentId);
-			_completionBlock = nil;
+	[topVC presentViewController:viewController animated:animated completion:^{
+		if (completion) {
+			completion(nil);
 		}
 		
-		[_presentedModals addObject:self.toVC.navigationController ? self.toVC.navigationController : self.toVC];
-		
-		self.toVC = nil;
+		[_presentedModals addObject:viewController.navigationController ? viewController.navigationController : viewController];
 	}];
 }
 
--(void)showModal:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
-	self.toVC = (UIViewController<RNNRootViewProtocol>*)viewController;
-	RNNNavigationOptions* options = self.toVC.getLeafViewController.options;
-
-	_completionBlock = completion;
-	
-    if ([self.toVC respondsToSelector:@selector(applyModalOptions)]) {
-        [self.toVC.getLeafViewController applyModalOptions];
-    }
-    
-    if ([self.toVC respondsToSelector:@selector(isCustomViewController)] &&
-        [self.toVC.getLeafViewController isCustomViewController]
-    ) {
-		[self showModal:animated];
-	} else {
-		[self.toVC.getLeafViewController waitForReactViewRender:options.animations.showModal.waitForRender perform:^{
-			[self showModal:animated];
-		}];
-	}
-}
-
 - (void)dismissModal:(UIViewController *)viewController completion:(RNNTransitionCompletionBlock)completion {
 	if (viewController) {
 		[_pendingModalIdsToDismiss addObject:viewController];

lib/ios/RNNRootViewController.m

@@ -89,7 +89,7 @@
 }
 
 - (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	if (wait) {
+	if (wait && !_isExternalComponent) {
 		[self onReactViewReady:readyBlock];
 	} else {
 		readyBlock();

lib/ios/ReactNativeNavigationTests/RNNModalManagerTest.m

@@ -2,24 +2,24 @@
 #import "RNNModalManager.h"
 
 @interface MockViewController : UIViewController
+
+@property CGFloat presentViewControllerCalls;
+
 @end
 @implementation MockViewController
 
 - (void)presentViewController:(UIViewController *)viewControllerToPresent animated:(BOOL)flag completion:(void (^)(void))completion {
+	_presentViewControllerCalls++;
 	completion();
 }
 
 @end
 
 @interface MockModalManager : RNNModalManager
+@property (nonatomic, strong) MockViewController* topPresentedVC;
 @end
-@implementation MockModalManager
-
--(UIViewController*)topPresentedVC {
-	MockViewController* vc = [MockViewController new];
-	return vc;
-}
 
+@implementation MockModalManager
 @end
 
 @interface RNNModalManagerTest : XCTestCase <RNNModalManagerDelegate> {
@@ -41,7 +41,9 @@
 	_vc2 = [RNNRootViewController new];
 	_vc3 = [RNNRootViewController new];
 	_modalManager = [[MockModalManager alloc] init];
+	_modalManager.topPresentedVC = [MockViewController new];
 }
+
 - (void)testDismissMultipleModalsInvokeDelegateWithCorrectParameters {
 	[_modalManager showModal:_vc1 animated:NO completion:nil];
 	[_modalManager showModal:_vc2 animated:NO completion:nil];
@@ -95,6 +97,14 @@
 	XCTAssertTrue(_modalDismissedCount == 0);
 }
 
+- (void)testShowModal_NilModalThrows {
+	XCTAssertThrows([_modalManager showModal:nil animated:NO completion:nil]);
+}
+
+- (void)testShowModal_CallPresentViewController {
+	[_modalManager showModal:_vc1 animated:NO completion:nil];
+	XCTAssertTrue(_modalManager.topPresentedVC.presentViewControllerCalls == 1);
+}
 
 #pragma mark RNNModalManagerDelegate