#833 - pop screen by id when not on top

ios/RNNBridgeModule.m

@@ -40,7 +40,14 @@ RCT_EXPORT_METHOD(pop:(NSString*)containerId)
 	[self assertReady];
 	UIViewController *vc = [[RNN instance].store findContainerForId:containerId];
 	
-	[[vc navigationController] popViewControllerAnimated:YES];
+	if([[vc navigationController] topViewController] == vc ) {
+		[[vc navigationController] popViewControllerAnimated:YES];
+	}
+	else {
+		NSMutableArray * vcs = [vc navigationController].viewControllers.mutableCopy;
+		[vcs removeObject:vc];
+		[[vc navigationController] setViewControllers:vcs animated:NO];
+	}
 	[[RNN instance].store removeContainer:containerId];
 }
 

playground/e2e/app.test.js

@@ -38,6 +38,18 @@ describe('app', () => {
     elementByLabel('Pop').tap();
     expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
+  
+  it.only('pop screen deep in the stack', () => {
+    elementByLabel('Push').tap();
+    expect(elementByLabel('Stack Position: 1')).toBeVisible();
+    elementByLabel('Push').tap();
+    expect(elementByLabel('Stack Position: 2')).toBeVisible();
+    elementByLabel('Pop Previous').tap();
+    expect(elementByLabel('Stack Position: 2')).toBeVisible();
+    elementByLabel('Pop').tap();
+    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  
+  });
 
   it('show modal', () => {
     elementByLabel('Show Modal').tap();

playground/src/containers/PushedScreen.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import React, { Component } from 'react';
 import {
   StyleSheet,
@@ -13,6 +14,7 @@ class PushedScreen extends Component {
     super(props);
     this.onClickPush = this.onClickPush.bind(this);
     this.onClickPop = this.onClickPop.bind(this);
+    this.onClickPopPrevious = this.onClickPopPrevious.bind(this);
   }
   render() {
     return (
@@ -21,24 +23,30 @@ class PushedScreen extends Component {
         <Text style={styles.h2}>{`Stack Position: ${this.getStackPosition()}`}</Text>
         <Button title="Push" onPress={this.onClickPush} />
         <Button title="Pop" onPress={this.onClickPop} />
+        <Button title="Pop Previous" onPress={this.onClickPopPrevious} />
         <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
       </View>
     );
   }
-
+  
   onClickPush() {
     Navigation.on(this.props.id).push({
       name: 'navigation.playground.PushedScreen',
       passProps: {
-        stackPosition: this.getStackPosition() + 1
+        stackPosition: this.getStackPosition() + 1,
+        previousScreenIds: _.concat([], this.props.previousScreenIds || [], this.props.id)
       }
     });
   }
-
+  
   onClickPop() {
     Navigation.on(this.props.id).pop();
   }
-
+  
+  onClickPopPrevious() {
+    Navigation.on(_.last(this.props.previousScreenIds)).pop();
+  }
+  
   getStackPosition() {
     return this.props.stackPosition || 1;
   }