Closes #3733

lib/ios/RNNCommandsHandler.m

@@ -33,7 +33,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	RNNEventEmitter* _eventEmitter;
 }
 
--(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter {
+- (instancetype)initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter {
 	self = [super init];
 	_store = store;
 	_controllerFactory = controllerFactory;
@@ -46,7 +46,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 #pragma mark - public
 
--(void) setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
+- (void)setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
 	[_modalManager dismissAllModals];
@@ -59,7 +59,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	completion();
 }
 
--(void) mergeOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
+- (void)mergeOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
 	UIViewController* vc = [_store findComponentForId:componentId];
@@ -87,12 +87,12 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 }
 
--(void) setDefaultOptions:(NSDictionary*)optionsDict completion:(RNNTransitionCompletionBlock)completion {
+- (void)setDefaultOptions:(NSDictionary*)optionsDict completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	[_controllerFactory setDefaultOptionsDict:optionsDict];
 }
 
--(void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+- (void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 
 	RNNRootViewController *newVc = (RNNRootViewController *)[_controllerFactory createLayoutAndSaveToStore:layout];
@@ -135,7 +135,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	}
 }
 
--(void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+- (void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	
 	UIViewController<RNNRootViewProtocol> *newVC = [_controllerFactory createLayoutAndSaveToStore:layout];
@@ -148,7 +148,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	} rejection:rejection];
 }
 
--(void)pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+- (void)pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
@@ -175,7 +175,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	}];
 }
 
--(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+- (void)popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
 	
@@ -205,7 +205,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[CATransaction commit];
 }
 
--(void) showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
+- (void)showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
@@ -215,21 +215,20 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	}];
 }
 
--(void) dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
+- (void)dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
-		completion();
 	}];
 	
-	[_modalManager dismissModal:componentId];
+	[_modalManager dismissModal:componentId completion:completion];
 	
 	[CATransaction commit];
 }
 
--(void) dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion {
+- (void)dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 
 	[CATransaction begin];
@@ -243,7 +242,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[CATransaction commit];
 }
 
--(void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion {
+- (void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 
 	UIViewController<RNNRootViewProtocol>* overlayVC = [_controllerFactory createOverlay:layout];
@@ -266,13 +265,13 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 #pragma mark - private
 
--(void)removePopedViewControllers:(NSArray*)viewControllers {
+- (void)removePopedViewControllers:(NSArray*)viewControllers {
 	for (UIViewController *popedVC in viewControllers) {
 		[_store removeComponentByViewControllerInstance:popedVC];
 	}
 }
 
--(void) assertReady {
+- (void)assertReady {
 	if (!_store.isReadyToReceiveCommands) {
 		[[NSException exceptionWithName:@"BridgeNotLoadedError"
 								 reason:@"Bridge not yet loaded! Send commands after Navigation.events().onAppLaunched() has been called."

lib/ios/RNNModalManager.h

@@ -6,9 +6,9 @@
 
 @property (nonatomic, strong) UIViewController<RNNRootViewProtocol>* toVC;
 
--(instancetype)initWithStore:(RNNStore*)store;
--(void)showModal:(UIViewController*)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion;
--(void)dismissModal:(NSString*)componentId;
--(void)dismissAllModals;
+- (instancetype)initWithStore:(RNNStore*)store;
+- (void)showModal:(UIViewController*)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion;
+- (void)dismissModal:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion;
+- (void)dismissAllModals;
 
 @end

lib/ios/RNNModalManager.m

@@ -55,9 +55,9 @@
 	}
 }
 
--(void)dismissModal:(NSString *)componentId {
+- (void)dismissModal:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[[_store pendingModalIdsToDismiss] addObject:componentId];
-	[self removePendingNextModalIfOnTop];
+	[self removePendingNextModalIfOnTop:completion];
 }
 
 -(void)dismissAllModals {
@@ -69,7 +69,7 @@
 #pragma mark - private
 
 
--(void)removePendingNextModalIfOnTop {
+-(void)removePendingNextModalIfOnTop:(RNNTransitionCompletionBlock)completion {
 	NSString *componentId = [[_store pendingModalIdsToDismiss] lastObject];
 	UIViewController<RNNRootViewProtocol> *modalToDismiss = (UIViewController<RNNRootViewProtocol>*)[_store findComponentForId:componentId];
 	RNNNavigationOptions* options = modalToDismiss.getLeafViewController.options;
@@ -88,7 +88,12 @@
 		[modalToDismiss dismissViewControllerAnimated:options.animations.dismissModal.enable completion:^{
 			[[_store pendingModalIdsToDismiss] removeObject:componentId];
 			[_store removeComponent:componentId];
-			[self removePendingNextModalIfOnTop];
+			
+			if (completion) {
+				completion();
+			}
+			
+			[self removePendingNextModalIfOnTop:nil];
 		}];
 	}
 }