[RNMobile] Blur post title any time another block is selected (#16642)

* Unselect post title any time another block is selected * Remove unnecessary state check
WordPress · Jul 19, 2019 · b1b9c11 · b1b9c11
1 parent 6ef0222
commit b1b9c11
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/packages/edit-post/src/components/visual-editor/index.native.js b/packages/edit-post/src/components/visual-editor/index.native.js
@@ -26,6 +26,13 @@ class VisualEditor extends Component {
 		};
 	}
 
+	static getDerivedStateFromProps( props ) {
+		if ( props.isAnyBlockSelected ) {
+			return { isPostTitleSelected: false };
+		}
+		return null;
+	}
+
 	onPostTitleSelect() {
 		this.setState( { isPostTitleSelected: true } );
 		this.props.clearSelectedBlock();
@@ -87,6 +94,7 @@ class VisualEditor extends Component {
 					rootViewHeight={ rootViewHeight }
 					safeAreaBottomInset={ safeAreaBottomInset }
 					isPostTitleSelected={ this.state.isPostTitleSelected }
+					onBlockTypeSelected={ this.onPostTitleUnselect }
 				/>
 			</BlockEditorProvider>
 		);
@@ -100,9 +108,12 @@ export default compose( [
 			getEditedPostAttribute,
 		} = select( 'core/editor' );
 
+		const { getSelectedBlockClientId } = select( 'core/block-editor' );
+
 		return {
 			blocks: getEditorBlocks(),
 			title: getEditedPostAttribute( 'title' ),
+			isAnyBlockSelected: !! getSelectedBlockClientId(),
 		};
 	} ),
 	withDispatch( ( dispatch ) => {

diff --git a/packages/editor/src/components/post-title/index.native.js b/packages/editor/src/components/post-title/index.native.js
@@ -22,12 +22,6 @@ import { pasteHandler } from '@wordpress/blocks';
 import styles from './style.scss';
 
 class PostTitle extends Component {
-	constructor() {
-		super( ...arguments );
-
-		this.titleViewRef = null;
-	}
-
 	componentDidMount() {
 		if ( this.props.innerRef ) {
 			this.props.innerRef( this );
@@ -39,10 +33,7 @@ class PostTitle extends Component {
 	}
 
 	focus() {
-		if ( this.titleViewRef ) {
-			this.titleViewRef.focus();
-			this.props.onSelect();
-		}
+		this.props.onSelect();
 	}
 
 	render() {
@@ -91,10 +82,8 @@ class PostTitle extends Component {
 					onSelectionChange={ () => { } }
 					onEnter={ this.props.onEnterPress }
 					disableEditingMenu={ true }
-					setRef={ ( ref ) => {
-						this.titleViewRef = ref;
-					} }
 					__unstablePasteHandler={ pasteHandler }
+					__unstableIsSelected={ this.props.isSelected }
 				>
 				</RichText>
 			</View>