#824

ios/RNNBridgeModule.m

@@ -49,11 +49,7 @@ RCT_EXPORT_METHOD(showModal:(NSDictionary*)layout)
 	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:[RNN instance].store];
 	UIViewController *newVc = [factory createLayoutAndSaveToStore:layout];
 	
-	UIViewController *root = UIApplication.sharedApplication.delegate.window.rootViewController;
-	while(root.presentedViewController) {
-		root = root.presentedViewController;
-	}
-	
+	UIViewController *root = [self topPresentedVC];
 	[root presentViewController:newVc animated:YES completion:^{
 		
 	}];
@@ -63,14 +59,18 @@ RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId)
 {
 	UIViewController *root = [[RNN instance].store findContainerForId:containerId];
 	
-	//	while(root.presentedViewController) {
-	//		root = root.presentedViewController;
-	//	}
 	if (root) {
+		UIViewController *topVC = [self topPresentedVC];
 		
-		[root dismissViewControllerAnimated:YES completion:^{
+		if (root == topVC) {
+			[root dismissViewControllerAnimated:YES completion:nil];
+			[[RNN instance].store.modalToDismiss dismissViewControllerAnimated:YES completion:nil];
+			[RNN instance].store.modalToDismiss = nil;
 			
-		}];
+		}
+		else {
+			[RNN instance].store.modalToDismiss = root;
+		}
 	}
 }
 
@@ -81,5 +81,13 @@ RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId)
 	}
 }
 
+-(UIViewController*)topPresentedVC {
+	UIViewController *root = UIApplication.sharedApplication.delegate.window.rootViewController;
+	while(root.presentedViewController) {
+		root = root.presentedViewController;
+	}
+	return root;
+}
+
 @end
 

ios/RNNStore.h

@@ -12,6 +12,8 @@
 
 @interface RNNStore : NSObject
 
+@property UIViewController *modalToDismiss;
+
 - (UIViewController*)findContainerForId:(NSString*)containerId;
 - (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;
 - (void)removeContainer:(NSString*)containerId;

ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -236,8 +236,6 @@
 				263905D51E4C94970023D7D3 /* RNNSideMenuController.m */,
 				263905E41E4CAC950023D7D3 /* RNNSideMenuChildVC.h */,
 				263905E51E4CAC950023D7D3 /* RNNSideMenuChildVC.m */,
-				268692801E5054F800E2C612 /* RNNStore.h */,
-				268692811E5054F800E2C612 /* RNNStore.m */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
@@ -260,6 +258,8 @@
 				7BA500741E2544B9001B9E1B /* ReactNativeNavigation.m */,
 				7BBFE55F1E253F97002A6182 /* RNN.h */,
 				7BBFE5601E253F97002A6182 /* RNN.m */,
+				268692801E5054F800E2C612 /* RNNStore.h */,
+				268692811E5054F800E2C612 /* RNNStore.m */,
 				7BD721F31E2D3AA100724059 /* Bridge */,
 				7B1E4C4B1E2D173700C3A525 /* Controllers */,
 				263905881E4C6F440023D7D3 /* RNNSideMenu */,

playground/e2e/app.test.js

@@ -71,7 +71,7 @@ describe('app', () => {
     expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 
-  xit('dismiss modal by id', () => {
+  it('dismiss modal by id which is not the top most', () => {
     elementByLabel('Show Modal').tap();
     expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
     elementByLabel('Show Modal').tap();

playground/ios/playground.xcodeproj/project.pbxproj

@@ -525,6 +525,7 @@
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
+						ProvisioningStyle = Manual;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					13B07F861A680F5B00A75B9A = {
@@ -877,6 +878,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				DEVELOPMENT_TEAM = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -896,6 +898,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = "";
 				HEADER_SEARCH_PATHS = "${SRCROOT}/../node_modules/react-native-navigation/ios/**";
 				INFOPLIST_FILE = playgroundTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;