TinyMCE per block: Fix small remaining bugs (Format toolbar and focus…

…ing the image)
WordPress · Mar 15, 2017 · abb8e40 · abb8e40
1 parent f44503a
commit abb8e40
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/tinymce-per-block/build/app.js b/tinymce-per-block/build/app.js
diff --git a/tinymce-per-block/src/blocks/embed-block/form.js b/tinymce-per-block/src/blocks/embed-block/form.js
@@ -52,7 +52,7 @@ export default class EmbedBlockForm extends Component {
 
 				<div onClick={ () => {
 					api.select();
-					! focusConfig && api.focus();
+					! focusConfig && api.focus( { end: true } );
 				} }>
 					{ ! block.url &&
 						<div className="embed-block__form">

diff --git a/tinymce-per-block/src/blocks/image-block/form.js b/tinymce-per-block/src/blocks/image-block/form.js
@@ -43,7 +43,7 @@ export default class ImageBlockForm extends Component {
 				}
 				<div onClick={ () => {
 					api.select();
-					! focusConfig && api.focus();
+					! focusConfig && api.focus( { end: true } );
 				} }>
 					<img src={ block.src } className="image-block__display" />
 					{ ( focusConfig || block.caption ) &&

diff --git a/tinymce-per-block/src/external/wp-blocks/editable/index.js b/tinymce-per-block/src/external/wp-blocks/editable/index.js
@@ -48,15 +48,17 @@ export default class EditableComponent extends Component {
 		}
 	}
 
-	updateContent() {
+	updateContent( wasFocused ) {
 		// This could not be called on each content change, it used to change the cursor position
-		let bookmark;
-		if ( this.props.focusConfig ) {
-			bookmark = this.editor.selection.getBookmark( 2, true );
-		}
-		this.editor.setContent( this.props.content );
-		if ( this.props.focusConfig ) {
-			this.editor.selection.moveToBookmark( bookmark );
+		if ( ! wasFocused ) {
+			let bookmark;
+			if ( this.props.focusConfig ) {
+				bookmark = this.editor.selection.getBookmark( 2, true );
+			}
+			this.editor.setContent( this.props.content );
+			if ( this.props.focusConfig ) {
+				this.editor.selection.moveToBookmark( bookmark );
+			}
 		}
 	}
 
@@ -76,7 +78,7 @@ export default class EditableComponent extends Component {
 		}
 
 		if ( this.props.content !== prevProps.content ) {
-			this.updateContent();
+			this.updateContent( !! prevProps.focusConfig );
 		}
 	}