Revert "Revert "Resolves componentId on showModal""

This reverts commit e1ee3d5f99.

lib/ios/RNNBridgeModule.m

@@ -68,8 +68,8 @@ RCT_EXPORT_METHOD(popToRoot:(NSString*)commandId componentId:(NSString*)componen
 }
 
 RCT_EXPORT_METHOD(showModal:(NSString*)commandId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler showModal:layout completion:^{
-		resolve(nil);
+	[_commandsHandler showModal:layout completion:^(NSString *componentId) {
+		resolve(componentId);
 	}];
 }
 

lib/ios/RNNCommandsHandler.h

@@ -24,7 +24,7 @@
 
 -(void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
--(void)showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
+-(void)showModal:(NSDictionary*)layout completion:(RNNTransitionWithComponentIdCompletionBlock)completion;
 
 -(void)dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
 

lib/ios/RNNCommandsHandler.m

@@ -205,13 +205,13 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[CATransaction commit];
 }
 
-- (void)showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
+- (void)showModal:(NSDictionary*)layout completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
 	[self assertReady];
 
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-	[_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable completion:^{
+	[_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable completion:^(NSString *componentId) {
 		[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
-		completion();
+		completion(componentId);
 	}];
 }
 

lib/ios/RNNModalManager.h

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

lib/ios/RNNModalManager.m

@@ -3,7 +3,7 @@
 
 @implementation RNNModalManager {
 	RNNStore *_store;
-	RNNTransitionCompletionBlock _completionBlock;
+	RNNTransitionWithComponentIdCompletionBlock _completionBlock;
 }
 
 
@@ -27,14 +27,14 @@
 	
 	[topVC presentViewController:self.toVC animated:animated completion:^{
 		if (_completionBlock) {
-			_completionBlock();
+			_completionBlock(self.toVC.getLeafViewController.componentId);
 			_completionBlock = nil;
 		}
 		self.toVC = nil;
 	}];
 }
 
--(void)showModal:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion {
+-(void)showModal:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
 	self.toVC = (UIViewController<RNNRootViewProtocol>*)viewController;
 	RNNNavigationOptions* options = self.toVC.getLeafViewController.options;
 

lib/ios/RNNStore.h

@@ -5,6 +5,7 @@
 #import "ReactNativeNavigation.h"
 
 typedef void (^RNNTransitionCompletionBlock)(void);
+typedef void (^RNNTransitionWithComponentIdCompletionBlock)(NSString *componentId);
 typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, NSError *error);
 
 @interface RNNStore : NSObject