BottomSheet listens to native bridge for closed modals on Android (#2…

…0860)

* Bridge notifies BottomSheet of closed modals

* Limit subscibeModalClosed to Android

* Added unique variable name androidModalClosedSubscription

* Added subscribeAndroidModalClosed to jest setup

* Only remove subscription if it exists

packages/components/src/mobile/bottom-sheet/index.native.js

@@ -13,6 +13,7 @@ import {
 } from 'react-native';
 import Modal from 'react-native-modal';
 import SafeArea from 'react-native-safe-area';
+import { subscribeAndroidModalClosed } from 'react-native-gutenberg-bridge';
 
 /**
  * WordPress dependencies
@@ -67,6 +68,14 @@ class BottomSheet extends Component {
  }
 
  componentDidMount() {
+ if ( Platform.OS === 'android' ) {
+ this.androidModalClosedSubscription = subscribeAndroidModalClosed(
+ () => {
+ this.props.onClose();
+ }
+ );
+ }
+
  this.keyboardWillShowListener = Keyboard.addListener(
  'keyboardWillShow',
  this.keyboardWillShow
@@ -85,6 +94,9 @@ class BottomSheet extends Component {
  }
 
  componentWillUnmount() {
+ if ( this.androidModalClosedSubscription ) {
+ this.androidModalClosedSubscription.remove();
+ }
  if ( this.safeAreaEventSubscription === null ) {
  return;
  }

test/native/setup.js

@@ -13,6 +13,7 @@ jest.mock( 'react-native-gutenberg-bridge', () => {
  subscribeSetFocusOnTitle: jest.fn(),
  subscribeUpdateHtml: jest.fn(),
  subscribeMediaAppend: jest.fn(),
+ subscribeAndroidModalClosed: jest.fn(),
  editorDidMount: jest.fn(),
  editorDidAutosave: jest.fn(),
  subscribeMediaUpload: jest.fn(),