Merge pull request #790 from wordpress-mobile/hotfix/v1.1.2

Fix `hasUnsupportedBlocks` check.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",

src/app/AppContainer.js

@@ -87,10 +87,6 @@ class AppContainer extends React.Component<PropsType> {
 	}
 
 	componentDidMount() {
-		const blocks = this.props.blocks;
-		const hasUnsupportedBlocks = ! isEmpty( blocks.filter( ( { name } ) => name === UnsupportedBlock.name ) );
-		RNReactNativeGutenbergBridge.editorDidMount( hasUnsupportedBlocks );
-
 		this.subscriptionParentGetHtml = subscribeParentGetHtml( () => {
 			this.serializeToNativeAction();
 		} );
@@ -149,6 +145,17 @@ class AppContainer extends React.Component<PropsType> {
 		switchMode( mode === 'visual' ? 'text' : 'visual' );
 	}
 
+	componentDidUpdate( prevProps ) {
+		if ( ! prevProps.isReady && ( prevProps.isReady !== this.props.isReady ) ) {
+			const { blocks } = this.props;
+			const isUnsupportedBlock = ( { name } ) => name === UnsupportedBlock.name;
+			const unsupportedBlocks = blocks.filter( isUnsupportedBlock );
+			const hasUnsupportedBlocks = ! isEmpty( unsupportedBlocks );
+
+			RNReactNativeGutenbergBridge.editorDidMount( hasUnsupportedBlocks );
+		}
+	}
+
 	render() {
 		const {
 			blocks,

src/app/AppContainer.test.js

@@ -0,0 +1,44 @@
+/** @format */
+
+/**
+ * External dependencies
+ */
+import renderer from 'react-test-renderer';
+
+/**
+ * Internal dependencies
+ */
+import { bootstrapEditor } from '..';
+import AppContainer from './AppContainer';
+import RNReactNativeGutenbergBridge from 'react-native-gutenberg-bridge';
+
+const unsupportedBlock = `
+<!-- wp:notablock -->
+<p>Not supported</p>
+<!-- /wp:notablock -->
+`;
+
+describe( 'AppContainer', () => {
+	beforeAll( bootstrapEditor );
+
+	it( 'detects unsupported block and sends hasUnsupportedBlocks true to native', () => {
+		RNReactNativeGutenbergBridge.editorDidMount = jest.fn();
+
+		const appContainer = renderAppContainerWith( unsupportedBlock );
+		appContainer.unmount();
+
+		expect( RNReactNativeGutenbergBridge.editorDidMount ).toHaveBeenCalledTimes( 1 );
+		expect( RNReactNativeGutenbergBridge.editorDidMount ).toHaveBeenCalledWith( true );
+	} );
+} );
+
+// Utilities
+const renderAppContainerWith = ( content ) => {
+	return renderer.create(
+		<AppContainer
+			initialHtml={ content }
+			initialHtmlModeEnabled={ false }
+			initialTitle={ '' }
+		/>
+	);
+};