js:prepare dismissModal api

playground/src/containers/SimpleScreen.js

@@ -8,6 +8,7 @@ class SimpleScreen extends Component {
     super(props);
     this.onClickPop = this.onClickPop.bind(this);
     this.onClickPush = this.onClickPush.bind(this);
+    this.onClickDismissModal = this.onClickDismissModal.bind(this);
   }
 
   render() {
@@ -18,6 +19,7 @@ class SimpleScreen extends Component {
         {this.renderTextFromFunctionInProps()}
         <Button title="Push" onPress={this.onClickPush} />
         <Button title="Pop" onPress={this.onClickPop} />
+        <Button title="Dismiss Modal" onPress={this.onClickDismissModal} />
       </View>
     );
   }
@@ -44,6 +46,9 @@ class SimpleScreen extends Component {
     });
   }
 
+  onClickDismissModal() {
+    Navigation.dismissModal(this.props.id);
+  }
 }
 export default SimpleScreen;
 

src/Navigation.js

@@ -38,6 +38,10 @@ class Navigation {
     return this.appCommands.showModal(params);
   }
 
+  dismissModal(id) {
+    return this.appCommands.dismissModal(id);
+  }
+
   events() {
     return this.publicEventsRegistry;
   }

src/Navigation.test.js

@@ -39,6 +39,15 @@ describe('Navigation', () => {
     expect(Navigation.appCommands.showModal).toHaveBeenCalledWith(params);
   });
 
+  it('dismissModal delegates to AppCommands', async () => {
+    Navigation.appCommands.dismissModal.mockReturnValue(Promise.resolve('result'));
+    const params = {};
+    const result = await Navigation.dismissModal(params);
+    expect(result).toEqual('result');
+    expect(Navigation.appCommands.dismissModal).toHaveBeenCalledTimes(1);
+    expect(Navigation.appCommands.dismissModal).toHaveBeenCalledWith(params);
+  });
+
   it('events return public events', () => {
     const cb = jest.fn();
     Navigation.events().onAppLaunched(cb);

src/adapters/NativeCommandsSender.js

@@ -24,5 +24,10 @@ export default class NativeCommandsSender {
     this.nativeCommandsModule.showModal(layout);
     return Promise.resolve(layout);
   }
+
+  dismissModal(id) {
+    this.nativeCommandsModule.dismissModal(id);
+    return Promise.resolve(id);
+  }
 }
 

src/adapters/NativeCommandsSender.test.js

@@ -9,7 +9,8 @@ describe('NativeCommandsSender', () => {
       setRoot: jest.fn(),
       push: jest.fn(),
       pop: jest.fn(),
-      showModal: jest.fn()
+      showModal: jest.fn(),
+      dismissModal: jest.fn()
     };
     NativeModules.RNNBridgeModule = mockNativeModule;
     uut = new NativeCommandsSender();
@@ -43,4 +44,10 @@ describe('NativeCommandsSender', () => {
     expect(mockNativeModule.showModal).toHaveBeenCalledTimes(1);
     expect(result).toBeDefined();
   });
+
+  it('dismissModal', async () => {
+    const result = await uut.dismissModal('id');
+    expect(mockNativeModule.dismissModal).toHaveBeenCalledTimes(1);
+    expect(result).toEqual('id');
+  });
 });

src/commands/AppCommands.js

@@ -20,5 +20,9 @@ export default class AppCommands {
     this.layoutTreeCrawler.crawl(layout);
     return this.nativeCommandsSender.showModal(layout);
   }
+
+  dismissModal(id) {
+    return this.nativeCommandsSender.dismissModal(id);
+  }
 }
 

src/commands/AppCommands.test.js

@@ -100,4 +100,18 @@ describe('AppCommands', () => {
       expect(result).toEqual('the resolved layout');
     });
   });
+
+  describe('dismissModal', () => {
+    it('sends command to native', () => {
+      uut.dismissModal('myUniqueId');
+      expect(mockCommandsSender.dismissModal).toHaveBeenCalledTimes(1);
+      expect(mockCommandsSender.dismissModal).toHaveBeenCalledWith('myUniqueId');
+    });
+
+    it('returns a promise with the id', async () => {
+      mockCommandsSender.dismissModal.mockReturnValue(Promise.resolve('the id'));
+      const result = await uut.dismissModal('myUniqueId');
+      expect(result).toEqual('the id');
+    });
+  });
 });