Cleanup and optimize blocks change

src/app/App.js

@@ -5,17 +5,15 @@ import '../globals';
 
 import React from 'react';
 import { Provider } from 'react-redux';
-import { setupStore, html2State } from '../store';
+import { type BlockType, setupStore, html2State } from '../store';
 import AppContainer from './AppContainer';
 import { Store } from 'redux';
 import { withDispatch } from '@wordpress/data';
-import { compose } from '@wordpress/compose';
-import { BlockEdit } from '@wordpress/editor';
 
 import initialHtml from './initial-html';
 
-
 type PropsType = {
+	onResetBlocks: Array<BlockType> => mixed,
 	initialData: string | Store,
 };
 type StateType = {
@@ -55,4 +53,4 @@ export default withDispatch( ( dispatch ) => {
 	return {
 		onResetBlocks: resetBlocks,
 	};
-} )( AppProvider );
+} )( AppProvider );

src/app/AppContainer.js

@@ -2,22 +2,31 @@
  * @format */
 
 import { connect } from 'react-redux';
-import MainApp from './MainApp';
+import { isEqual } from 'lodash';
 
+import MainApp from './MainApp';
 import { parse, serialize } from '@wordpress/blocks';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
-import { BlockEdit } from '@wordpress/editor';
 import RNReactNativeGutenbergBridge from 'react-native-gutenberg-bridge';
 
 const mapStateToProps = ( state, ownProps ) => {
-	return {
-		blocks: ownProps.blocks.map( block => {
-			block.focused = ownProps.isBlockSelected( block.clientId );
-			return block;
-		} ),
-		refresh: ! ownProps.refresh
+	let blocks = state.blocks, refresh = !! ownProps.refresh;
+
+	const newBlocks = ownProps.blocks.map( ( block ) => {
+		block.focused = ownProps.isBlockSelected( block.clientId );
+		return block;
+	} );
+
+	if ( ! isEqual( blocks, newBlocks ) ) {
+		blocks = newBlocks;
+		refresh = ! ownProps.refresh;
 	}
+
+	return {
+		blocks,
+		refresh,
+	};
 };
 
 const mapDispatchToProps = ( dispatch, ownProps ) => {

src/block-management/block-manager.js

@@ -26,7 +26,7 @@ export type BlockListType = {
 	createBlockAction: ( string, BlockType, string ) => mixed,
 	parseBlocksAction: string => mixed,
 	serializeToNativeAction: void => void,
-	mergeBlocksAction: ( string, string, BlockType ) => mixed,
+	mergeBlocksAction: ( string, string ) => mixed,
 	blocks: Array<BlockType>,
 	aztechtml: string,
 	refresh: boolean,
@@ -38,6 +38,7 @@ type StateType = {
 	showHtml: boolean,
 	inspectBlocks: boolean,
 	blockTypePickerVisible: boolean,
+	blocks: Array<BlockType>,
 	selectedBlockType: string,
 };