Feature/lists

react-native-aztec/src/AztecView.js

@@ -146,7 +146,7 @@ class AztecView extends React.Component {
           onContentSizeChange = { this._onContentSizeChange }
           onHTMLContentWithCursor = { this._onHTMLContentWithCursor }
           onSelectionChange = { this._onSelectionChange }
-          onEnter = { this._onEnter }
+          onEnter = { this.onEnter ? this._onEnter : null }
           // IMPORTANT: the onFocus events are thrown away as these are handled by onPress() in the upper level.
           // It's necessary to do this otherwise onFocus may be set by `{...otherProps}` and thus the onPress + onFocus
           // combination generate an infinite loop as described in https://github.com/wordpress-mobile/gutenberg-mobile/issues/302

src/block-management/block-holder.js

@@ -152,6 +152,7 @@ export class BlockHolder extends React.Component<PropsType, StateType> {
 				insertBlocksAfter={ this.insertBlocksAfter }
 				mergeBlocks={ this.mergeBlocks }
 				onCaretVerticalPositionChange={ this.props.onCaretVerticalPositionChange }
+				clientId={ this.props.clientId }
 			/>
 		);
 	}
@@ -208,6 +209,7 @@ export default compose( [
 			isLastBlock,
 			isSelected,
 			name,
+			clientId,
 		};
 	} ),
 	withDispatch( ( dispatch, { clientId, rootClientId } ) => {