pop screen

ios/RNNBridgeModule.m

@@ -28,6 +28,14 @@ RCT_EXPORT_METHOD(push:(NSString*)containerId layout:(NSDictionary*)layout)
 	[[vc navigationController]pushViewController:newVc animated:true];
 }
 
+RCT_EXPORT_METHOD(pop:(NSString*)containerId)
+{
+	[self assertReady];
+	//TODO implement correctly
+	id vc = [UIApplication.sharedApplication.delegate.window.rootViewController childViewControllers][0];
+	[[vc navigationController] popViewControllerAnimated:true];
+}
+
 -(void)assertReady
 {
 	if (!RNN.instance.isReadyToReceiveCommands) {

playground/e2e/app.test.js

@@ -31,6 +31,13 @@ describe('app', () => {
     expect(elementByLabel('Alert')).toBeVisible();
     expect(elementByLabel('onStop!')).toBeVisible();
   });
+
+  it('pop screen', () => {
+    elementByLabel('Push').tap();
+    expect(elementByLabel('Pushed screen')).toBeVisible();
+    elementByLabel('Pop').tap();
+    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  });
 });
 
 function elementByLabel(label) {

playground/src/containers/SimpleScreen.js

@@ -1,12 +1,20 @@
 import React, { Component } from 'react';
-import { View, Text } from 'react-native';
+import { View, Text, Button } from 'react-native';
+
+import Navigation from 'react-native-navigation';
 
 class SimpleScreen extends Component {
+  constructor(props) {
+    super(props);
+    this.onClickPop = this.onClickPop.bind(this);
+  }
+
   render() {
     return (
       <View style={styles.root}>
         <Text style={styles.h1}>{this.props.text || 'Simple Screen'}</Text>
         {this.renderTextFromFunctionInProps()}
+        <Button title="Pop" onPress={this.onClickPop} />
       </View>
     );
   }
@@ -19,6 +27,10 @@ class SimpleScreen extends Component {
       <Text style={styles.h1}>{this.props.myFunction()}</Text>
     );
   }
+
+  onClickPop() {
+    Navigation.on(this.props.id).pop();
+  }
 }
 export default SimpleScreen;
 

src/adapters/NativeCommandsSender.js

@@ -14,5 +14,10 @@ export default class NativeCommandsSender {
     this.nativeCommandsModule.push(onContainerId, layout);
     return Promise.resolve(layout);
   }
+
+  pop(containerId) {
+    this.nativeCommandsModule.pop(containerId);
+    return Promise.resolve(containerId);
+  }
 }
 

src/adapters/NativeCommandsSender.test.js

@@ -7,7 +7,8 @@ describe('NativeCommandsSender', () => {
   beforeEach(() => {
     mockNativeModule = {
       setRoot: jest.fn(),
-      push: jest.fn()
+      push: jest.fn(),
+      pop: jest.fn()
     };
     NativeModules.RNNBridgeModule = mockNativeModule;
     uut = new NativeCommandsSender();
@@ -29,4 +30,10 @@ describe('NativeCommandsSender', () => {
     expect(mockNativeModule.push).toHaveBeenCalledTimes(1);
     expect(result).toBeDefined();
   });
+
+  it('pop sends to native with containerId', async () => {
+    const result = await uut.pop('theContainerId');
+    expect(mockNativeModule.pop).toHaveBeenCalledTimes(1);
+    expect(result).toBeDefined();
+  });
 });

src/commands/ContainerCommands.js

@@ -14,4 +14,8 @@ export default class ContainerCommands {
     this.layoutTreeCrawler.crawl(layout);
     return this.nativeCommandsSender.push(this.containerId, layout);
   }
+
+  pop() {
+    return this.nativeCommandsSender.pop(this.containerId);
+  }
 }

src/commands/ContainerCommands.test.js

@@ -44,4 +44,18 @@ describe('ContainerCommands', () => {
       });
     });
   });
+
+  describe('pop', () => {
+    it('pops a container, passing containerId', () => {
+      uut.pop();
+      expect(mockCommandsSender.pop).toHaveBeenCalledTimes(1);
+      expect(mockCommandsSender.pop).toHaveBeenCalledWith(containerId);
+    });
+
+    it('pop returns a promise that resolves to containerId', async () => {
+      mockCommandsSender.pop.mockReturnValue(Promise.resolve(containerId));
+      const result = await uut.pop();
+      expect(result).toEqual(containerId);
+    });
+  });
 });