#824

ios/RNNBridgeModule.m

@@ -64,16 +64,26 @@ RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId)
 		
 		if (root == topVC) {
 			[root dismissViewControllerAnimated:YES completion:nil];
-			[[RNN instance].store.modalToDismiss dismissViewControllerAnimated:YES completion:nil];
-			[RNN instance].store.modalToDismiss = nil;
-			
+			[self removeNextModal];
 		}
 		else {
-			[RNN instance].store.modalToDismiss = root;
+			[[RNN instance].store.modalsToDismissArray addObject:containerId];
 		}
 	}
 }
 
+-(void)removeNextModal {
+	NSString *nextContainerId = [[RNN instance].store.modalsToDismissArray lastObject];
+	UIViewController *vc = [[RNN instance].store findContainerForId:nextContainerId];
+	
+	if (vc) {
+		[vc dismissViewControllerAnimated:YES completion:^{
+			[[RNN instance].store.modalsToDismissArray removeObject:nextContainerId];
+			[self removeNextModal];
+		}];
+	}
+}
+
 - (void)assertReady
 {
 	if (![RNN instance].isReadyToReceiveCommands) {

ios/RNNStore.h

@@ -12,7 +12,7 @@
 
 @interface RNNStore : NSObject
 
-@property UIViewController *modalToDismiss;
+@property NSMutableArray *modalsToDismissArray;
 
 - (UIViewController*)findContainerForId:(NSString*)containerId;
 - (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;

ios/RNNStore.m

@@ -12,6 +12,7 @@
 
 @property NSMapTable *containerStore;
 
+
 @end
 
 @implementation RNNStore
@@ -20,6 +21,7 @@
 -(instancetype)init {
 	self = [super init];
 	self.containerStore = [NSMapTable strongToWeakObjectsMapTable];
+	self.modalsToDismissArray = [NSMutableArray new];
 	return self;
 }
 

playground/e2e/app.test.js

@@ -81,6 +81,21 @@ describe('app', () => {
     elementByLabel('Dismiss Modal').tap();
     expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
+  
+  it('dismiss all previous modals by id when they are below top presented modal', () => {
+    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 ALL Previous Modals').tap();
+    expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
+    
+    elementByLabel('Dismiss Modal').tap();
+    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  });
 });
 
 describe('reload app', () => {

playground/src/containers/ModalScreen.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import React, { Component } from 'react';
 import {
   StyleSheet,
@@ -15,6 +16,7 @@ class ModalScreen extends Component {
     this.onClickDismissModal = this.onClickDismissModal.bind(this);
     this.onClickDismissPreviousModal = this.onClickDismissPreviousModal.bind(this);
     this.onClickDismissUnknownModal = this.onClickDismissUnknownModal.bind(this);
+    this.onClickDismissAllPreviousModals = this.onClickDismissAllPreviousModals.bind(this);
   }
   render() {
     return (
@@ -24,7 +26,8 @@ class ModalScreen extends Component {
         <Button title="Show Modal" onPress={this.onClickShowModal} />
         <Button title="Dismiss Modal" onPress={this.onClickDismissModal} />
         <Button title="Dismiss Unknown Modal" onPress={this.onClickDismissUnknownModal} />
-        {this.props.previousModalId ? (<Button title="Dismiss Previous Modal" onPress={this.onClickDismissPreviousModal} />) : undefined}
+        {this.getPreviousModalId() ? (<Button title="Dismiss Previous Modal" onPress={this.onClickDismissPreviousModal} />) : undefined}
+        {this.props.previousModalIds ? (<Button title="Dismiss ALL Previous Modals" onPress={this.onClickDismissAllPreviousModals} />) : undefined}
         <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
         
       </View>
@@ -36,7 +39,7 @@ class ModalScreen extends Component {
       name: 'navigation.playground.ModalScreen',
       passProps: {
         modalPosition: this.getModalPosition() + 1,
-        previousModalId: this.props.id
+        previousModalIds: _.concat([], this.props.previousModalIds, this.props.id)
       }
     });
   }
@@ -46,15 +49,24 @@ class ModalScreen extends Component {
   }
 
   onClickDismissPreviousModal() {
-    Navigation.dismissModal(this.props.previousModalId);
+    Navigation.dismissModal(this.getPreviousModalId());
   }
+  
   onClickDismissUnknownModal() {
     Navigation.dismissModal('unknown');
   }
+  
+  onClickDismissAllPreviousModals() {
+    _.forEach(this.props.previousModalIds, (id) => Navigation.dismissModal(id));
+  }
 
   getModalPosition() {
     return (this.props.modalPosition || 1);
   }
+  
+  getPreviousModalId() {
+    return _.last(this.props.previousModalIds);
+  }
 }
 
 const styles = {