Fix focus title on new posts regression (#17180)

WordPress · Aug 26, 2019 · fe4c02f · fe4c02f
1 parent a7bb5b3
commit fe4c02f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/packages/edit-post/src/editor.native.js b/packages/edit-post/src/editor.native.js
@@ -3,6 +3,7 @@
  */
 import memize from 'memize';
 import { size, map, without } from 'lodash';
+import { subscribeSetFocusOnTitle } from 'react-native-gutenberg-bridge';
 
 /**
  * WordPress dependencies
@@ -31,6 +32,8 @@ class Editor extends Component {
 		this.getEditorSettings = memize( this.getEditorSettings, {
 			maxSize: 1,
 		} );
+
+		this.setTitleRef = this.setTitleRef.bind( this );
 	}
 
 	getEditorSettings(
@@ -66,6 +69,24 @@ class Editor extends Component {
 		return settings;
 	}
 
+	componentDidMount() {
+		this.subscriptionParentSetFocusOnTitle = subscribeSetFocusOnTitle( () => {
+			if ( this.postTitleRef ) {
+				this.postTitleRef.focus();
+			}
+		} );
+	}
+
+	componentWillUnmount() {
+		if ( this.subscriptionParentSetFocusOnTitle ) {
+			this.subscriptionParentSetFocusOnTitle.remove();
+		}
+	}
+
+	setTitleRef( titleRef ) {
+		this.postTitleRef = titleRef;
+	}
+
 	render() {
 		const {
 			settings,

diff --git a/packages/editor/src/components/provider/index.native.js b/packages/editor/src/components/provider/index.native.js
@@ -5,7 +5,6 @@ import RNReactNativeGutenbergBridge, {
 	subscribeParentGetHtml,
 	subscribeParentToggleHTMLMode,
 	subscribeUpdateHtml,
-	subscribeSetFocusOnTitle,
 	subscribeSetTitle,
 } from 'react-native-gutenberg-bridge';
 
@@ -28,8 +27,6 @@ class NativeEditorProvider extends Component {
 
 		// Keep a local reference to `post` to detect changes
 		this.post = props.post;
-
-		this.setTitleRef = this.setTitleRef.bind( this );
 	}
 
 	componentDidMount() {
@@ -48,12 +45,6 @@ class NativeEditorProvider extends Component {
 		this.subscriptionParentUpdateHtml = subscribeUpdateHtml( ( payload ) => {
 			this.updateHtmlAction( payload.html );
 		} );
-
-		this.subscriptionParentSetFocusOnTitle = subscribeSetFocusOnTitle( () => {
-			if ( this.postTitleRef ) {
-				this.postTitleRef.focus();
-			}
-		} );
 	}
 
 	componentWillUnmount() {
@@ -72,10 +63,6 @@ class NativeEditorProvider extends Component {
 		if ( this.subscriptionParentUpdateHtml ) {
 			this.subscriptionParentUpdateHtml.remove();
 		}
-
-		if ( this.subscriptionParentSetFocusOnTitle ) {
-			this.subscriptionParentSetFocusOnTitle.remove();
-		}
 	}
 
 	componentDidUpdate( prevProps ) {
@@ -87,10 +74,6 @@ class NativeEditorProvider extends Component {
 		}
 	}
 
-	setTitleRef( titleRef ) {
-		this.postTitleRef = titleRef;
-	}
-
 	serializeToNativeAction() {
 		if ( this.props.mode === 'text' ) {
 			this.updateHtmlAction( this.props.getEditedPostContent() );