#824

ios/RNNBridgeModule.m

 
 RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId)
 {
-	UIViewController *root = [[RNN instance].store findContainerForId:containerId];
+	UIViewController *modalToDismiss = [[RNN instance].store findContainerForId:containerId];
 	
-	if (root) {
+	if (modalToDismiss) {
 		UIViewController *topVC = [self topPresentedVC];
 		
-		if (root == topVC) {
-			[root dismissViewControllerAnimated:YES completion:nil];
-			[self removeNextModal];
+		if (modalToDismiss == topVC) {
+			[modalToDismiss dismissViewControllerAnimated:YES completion:^{
+				[self removeNextModal];
+
+			}];
 		}
 		else {
 			[[RNN instance].store.modalsToDismissArray addObject:containerId];
 	UIViewController *vc = [[RNN instance].store findContainerForId:nextContainerId];
 	
 	if (vc) {
-		[vc dismissViewControllerAnimated:YES completion:^{
-			[[RNN instance].store.modalsToDismissArray removeObject:nextContainerId];
-			[self removeNextModal];
-		}];
+		UIViewController *topVC = [self topPresentedVC];
+		if (vc == topVC) {
+			[vc dismissViewControllerAnimated:YES completion:^{
+				[[RNN instance].store.modalsToDismissArray removeObject:nextContainerId];
+				[self removeNextModal];
+			}];
+		}
 	}
 }
 

playground/e2e/app.test.js

     elementByLabel('Dismiss Modal').tap();
     expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
+  
+  it('dismiss some modal by id deep in the stack', () => {
+    elementByLabel('Show Modal').tap();
+    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    elementByLabel('Show Modal').tap();
+    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    elementByLabel('Show Modal').tap();
+    expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
+  
+    elementByLabel('Dismiss First In Stack').tap();
+    expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
+    
+    elementByLabel('Dismiss Modal').tap();
+    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    
+    elementByLabel('Dismiss Modal').tap();
+    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  });
 });
 
 describe('reload app', () => {

playground/src/containers/ModalScreen.js

     this.onClickDismissPreviousModal = this.onClickDismissPreviousModal.bind(this);
     this.onClickDismissUnknownModal = this.onClickDismissUnknownModal.bind(this);
     this.onClickDismissAllPreviousModals = this.onClickDismissAllPreviousModals.bind(this);
+    this.onClickDismissFirstInStack = this.onClickDismissFirstInStack.bind(this);
   }
   render() {
     return (
         <Button title="Dismiss Unknown Modal" onPress={this.onClickDismissUnknownModal} />
         {this.getPreviousModalId() ? (<Button title="Dismiss Previous Modal" onPress={this.onClickDismissPreviousModal} />) : undefined}
         {this.props.previousModalIds ? (<Button title="Dismiss ALL Previous Modals" onPress={this.onClickDismissAllPreviousModals} />) : undefined}
+        {this.props.previousModalIds ? (<Button title="Dismiss First In Stack" onPress={this.onClickDismissFirstInStack} />) : undefined}
         <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
         
       </View>
       name: 'navigation.playground.ModalScreen',
       passProps: {
         modalPosition: this.getModalPosition() + 1,
-        previousModalIds: _.concat([], this.props.previousModalIds, this.props.id)
+        previousModalIds: _.concat([], this.props.previousModalIds || [], this.props.id)
       }
     });
   }
   onClickDismissAllPreviousModals() {
     _.forEach(this.props.previousModalIds, (id) => Navigation.dismissModal(id));
   }
+  
+  
+  onClickDismissFirstInStack() {
+    console.log('RANG', 'getFirstInStackModalId', _.head(this.props.previousModalIds));;
+    Navigation.dismissModal(_.head(this.props.previousModalIds));
+  }
 
+  
   getModalPosition() {
     return (this.props.modalPosition || 1);
   }