Merge branch 'v2' of github.com:wix/react-native-navigation into v2

e2e/Modals.test.js

@@ -131,4 +131,11 @@ describe('modal', () => {
     await elementById(testIDs.DISMISS_MODAL_BUTTON).tap();
     await expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
   });
+
+  test('dismiss modal on non-modal component should not deatch component', async () => {
+    await elementById(testIDs.TAB_BASED_APP_BUTTON).tap();
+    await elementById(testIDs.DISMISS_MODAL_BUTTON).tap();
+    await elementById(testIDs.PUSH_BUTTON).tap();
+    await expect(elementById(testIDs.PUSHED_SCREEN_HEADER)).toBeVisible();
+  });
 });

e2e/ScreenStack.test.js

@@ -96,4 +96,11 @@ describe('screen stack', () => {
     await elementById(testIDs.POP_BUTTON).tap();
     await expect(elementByLabel('This is a side menu center screen tab 1')).toBeVisible();
   });
+
+  test('pop component should not deatch component if can`t pop', async () => {
+    await elementById(testIDs.TAB_BASED_APP_BUTTON).tap();
+    await elementById(testIDs.POP_BUTTON).tap();
+    await elementById(testIDs.PUSH_BUTTON).tap();
+    await expect(elementById(testIDs.PUSHED_SCREEN_HEADER)).toBeVisible();
+  });
 });

lib/ios/RNNBridgeModule.m

@@ -76,7 +76,7 @@ RCT_EXPORT_METHOD(showModal:(NSString*)commandId layout:(NSDictionary*)layout re
 RCT_EXPORT_METHOD(dismissModal:(NSString*)commandId componentId:(NSString*)componentId mergeOptions:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
 	[_commandsHandler dismissModal:componentId mergeOptions:options completion:^{
 		resolve(componentId);
-	}];
+	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(dismissAllModals:(NSString*)commandId mergeOptions:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {

lib/ios/RNNCommandsHandler.h

@@ -26,7 +26,7 @@
 
 - (void)showModal:(NSDictionary*)layout completion:(RNNTransitionWithComponentIdCompletionBlock)completion;
 
-- (void)dismissModal:(NSString*)componentId mergeOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
+- (void)dismissModal:(NSString*)componentId mergeOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject;
 
 - (void)dismissAllModals:(NSDictionary *)options completion:(RNNTransitionCompletionBlock)completion;
 

lib/ios/RNNCommandsHandler.m

@@ -9,6 +9,7 @@
 #import "React/RCTUIManager.h"
 #import "RNNErrorHandler.h"
 #import "RNNDefaultOptionsHelper.h"
+#import "UIViewController+RNNOptions.h"
 
 static NSString* const setRoot	= @"setRoot";
 static NSString* const setStackRoot	= @"setStackRoot";
@@ -188,9 +189,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		[_store removeComponent:componentId];
 		[_eventEmitter sendOnNavigationCommandCompletion:pop params:@{@"componentId": componentId}];
 		completion();
-	} rejection:^(NSString *code, NSString *message, NSError *error) {
-		
-	}];
+	} rejection:rejection];
 }
 
 - (void)popTo:(NSString*)componentId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
@@ -240,19 +239,26 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	}];
 }
 
-- (void)dismissModal:(NSString*)componentId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion {
+- (void)dismissModal:(NSString*)componentId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject {
 	[self assertReady];
 	
-	[CATransaction begin];
-	[CATransaction setCompletionBlock:^{
-		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
-	}];
 	UIViewController<RNNParentProtocol> *modalToDismiss = (UIViewController<RNNParentProtocol>*)[_store findComponentForId:componentId];
+	
+	if (!modalToDismiss.isModal) {
+		[RNNErrorHandler reject:reject withErrorCode:1013 errorDescription:@"component is not a modal"];
+		return;
+	}
+	
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
 	[modalToDismiss.getCurrentChild.options overrideOptions:options];
 	
 	[self removePopedViewControllers:modalToDismiss.navigationController.viewControllers];
 	
+	[CATransaction begin];
+	[CATransaction setCompletionBlock:^{
+		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
+	}];
+	
 	[_modalManager dismissModal:modalToDismiss completion:completion];
 	
 	[CATransaction commit];

lib/ios/RNNNavigationStackManager.m

@@ -25,9 +25,16 @@ typedef void (^RNNAnimationBlock)(void);
 		animated = NO;
 	}
 	
+	__block UIViewController *poppedVC = nil;
 	[self performAnimationBlock:^{
-		[viewController.navigationController popViewControllerAnimated:animated];
-	} completion:completion];
+		poppedVC = [viewController.navigationController popViewControllerAnimated:animated];
+	} completion:^{
+		if (poppedVC) {
+			completion();
+		} else {
+			[RNNErrorHandler reject:rejection withErrorCode:1012 errorDescription:@"popping component failed"];
+		}
+	}];
 }
 
 - (void)popTo:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection; {

lib/ios/UIViewController+RNNOptions.h

@@ -32,4 +32,6 @@
 
 - (void)rnn_setBackgroundColor:(UIColor *)backgroundColor;
 
+- (BOOL)isModal;
+
 @end

lib/ios/UIViewController+RNNOptions.m

@@ -134,5 +134,16 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 	return animated ? kStatusBarAnimationDuration : CGFLOAT_MIN;
 }
 
+- (BOOL)isModal {
+	if([self presentingViewController])
+		return YES;
+	if([[[self navigationController] presentingViewController] presentedViewController] == [self navigationController])
+		return YES;
+	if([[[self tabBarController] presentingViewController] isKindOfClass:[UITabBarController class]])
+		return YES;
+	
+	return NO;
+}
+
 
 @end

playground/src/screens/TextScreen.js

@@ -37,6 +37,7 @@ class TextScreen extends Component {
           <Button title='Show Right Side Menu' testID={testIDs.SHOW_RIGHT_SIDE_MENU_BUTTON} onPress={() => this.showSideMenu('right')} />
           <Button title='Push' testID={testIDs.PUSH_BUTTON} onPress={this.onClickPush} />
           <Button title='Pop' testID={testIDs.POP_BUTTON} onPress={this.onClickPop} />
+          <Button title='Dismiss modal' testID={testIDs.DISMISS_MODAL_BUTTON} onPress={this.onClickDismissModal} />
         </View>
       </Bounds>
     );
@@ -58,6 +59,10 @@ class TextScreen extends Component {
     });
   }
 
+  onClickDismissModal = () => {
+    Navigation.dismissModal(this.props.componentId);
+  }
+
   onClickPop = async () => {
     await Navigation.pop(this.props.componentId);
   }