Revert "Resolves componentId on showModal"

yogevbd · yogevbd · commit e1ee3d5f9967 · 2018-08-19T14:25:34.000+03:00
This reverts commit 2d879cc.
diff --git a/lib/ios/RNNBridgeModule.m b/lib/ios/RNNBridgeModule.m
@@ -68,8 +68,8 @@ -(instancetype)initWithCommandsHandler:(RNNCommandsHandler *)commandsHandler {
 }
 
 RCT_EXPORT_METHOD(showModal:(NSString*)commandId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler showModal:layout completion:^(NSString *componentId) {
-		resolve(componentId);
+	[_commandsHandler showModal:layout completion:^{
+		resolve(nil);
 	}];
 }
 
diff --git a/lib/ios/RNNCommandsHandler.h b/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:(RNNTransitionWithComponentIdCompletionBlock)completion;
+-(void)showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
 
 -(void)dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
 
diff --git a/lib/ios/RNNCommandsHandler.m b/lib/ios/RNNCommandsHandler.m
@@ -205,13 +205,13 @@ -(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBloc
 	[CATransaction commit];
 }
 
-- (void)showModal:(NSDictionary*)layout completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
+- (void)showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-	[_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable completion:^(NSString *componentId) {
+	[_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable completion:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
-		completion(componentId);
+		completion();
 	}];
 }
 
diff --git a/lib/ios/RNNModalManager.h b/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:(RNNTransitionWithComponentIdCompletionBlock)completion;
+- (void)showModal:(UIViewController*)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion;
 - (void)dismissModal:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion;
 - (void)dismissAllModals;
 
diff --git a/lib/ios/RNNModalManager.m b/lib/ios/RNNModalManager.m
@@ -3,7 +3,7 @@
 
 @implementation RNNModalManager {
 	RNNStore *_store;
-	RNNTransitionWithComponentIdCompletionBlock _completionBlock;
+	RNNTransitionCompletionBlock _completionBlock;
 }
 
 
@@ -27,14 +27,14 @@ -(void)showModal:(BOOL)animated {
 	
 	[topVC presentViewController:self.toVC animated:animated completion:^{
 		if (_completionBlock) {
-			_completionBlock(self.toVC.getLeafViewController.componentId);
+			_completionBlock();
 			_completionBlock = nil;
 		}
 		self.toVC = nil;
 	}];
 }
 
--(void)showModal:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
+-(void)showModal:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion {
 	self.toVC = (UIViewController<RNNRootViewProtocol>*)viewController;
 	RNNNavigationOptions* options = self.toVC.getLeafViewController.options;
 
diff --git a/lib/ios/RNNStore.h b/lib/ios/RNNStore.h
@@ -5,7 +5,6 @@
 #import "ReactNativeNavigation.h"
 
 typedef void (^RNNTransitionCompletionBlock)(void);
-typedef void (^RNNTransitionWithComponentIdCompletionBlock)(NSString *componentId);
 typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, NSError *error);
 
 @interface RNNStore : NSObject

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ -(instancetype)initWithCommandsHandler:(RNNCommandsHandler *)commandsHandler {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`RCT_EXPORT_METHOD(showModal:(NSString)commandId layout:(NSDictionary)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {`
`71`		`- [_commandsHandler showModal:layout completion:^(NSString *componentId) {`
`72`		`- resolve(componentId);`
	`71`	`+ [_commandsHandler showModal:layout completion:^{`
	`72`	`+ resolve(nil);`
`73`	`73`	`}];`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -205,13 +205,13 @@ -(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBloc`
`205`	`205`	`[CATransaction commit];`
`206`	`206`	`}`
`207`	`207`
`208`		`-- (void)showModal:(NSDictionary*)layout completion:(RNNTransitionWithComponentIdCompletionBlock)completion {`
	`208`	`+- (void)showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {`
`209`	`209`	`[self assertReady];`
`210`	`210`
`211`	`211`	`UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];`
`212`		`- [_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable completion:^(NSString *componentId) {`
	`212`	`+ [_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable completion:^{`
`213`	`213`	`[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];`
`214`		`- completion(componentId);`
	`214`	`+ completion();`
`215`	`215`	`}];`
`216`	`216`	`}`
`217`	`217`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`@implementation RNNModalManager {`
`5`	`5`	`RNNStore *_store;`
`6`		`- RNNTransitionWithComponentIdCompletionBlock _completionBlock;`
	`6`	`+ RNNTransitionCompletionBlock _completionBlock;`
`7`	`7`	`}`
`8`	`8`
`9`	`9`
`@@ -27,14 +27,14 @@ -(void)showModal:(BOOL)animated {`
`27`	`27`
`28`	`28`	`[topVC presentViewController:self.toVC animated:animated completion:^{`
`29`	`29`	`if (_completionBlock) {`
`30`		`- _completionBlock(self.toVC.getLeafViewController.componentId);`
	`30`	`+ _completionBlock();`
`31`	`31`	`_completionBlock = nil;`
`32`	`32`	`}`
`33`	`33`	`self.toVC = nil;`
`34`	`34`	`}];`
`35`	`35`	`}`
`36`	`36`
`37`		`--(void)showModal:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionWithComponentIdCompletionBlock)completion {`
	`37`	`+-(void)showModal:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion {`
`38`	`38`	`self.toVC = (UIViewController<RNNRootViewProtocol>*)viewController;`
`39`	`39`	`RNNNavigationOptions* options = self.toVC.getLeafViewController.options;`
`40`	`40`