Single: type switching: reset the selection

WordPress · Mar 15, 2017 · d9c49d9 · d9c49d9
1 parent 8d6ce23
commit d9c49d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/tinymce-single/blocks.js b/tinymce-single/blocks.js
@@ -117,13 +117,16 @@
 		getSelectedBlock: function() {
 			return wp.blocks.getSelectedBlocks()[0];
 		},
-		selectBlock: function( block ) {
+		selectBlock: function( block, _bookmark ) {
 			var editor = window.tinyMCE.activeEditor;
 			var brs = block.getElementsByTagName( 'BR' );
 
 			// Has placeholder for text.
 			if ( brs.length ) {
 				editor.selection.setCursorLocation( brs[0].parentNode, 0 );
+			} else if ( _bookmark ) {
+				editor.selection.moveToBookmark( _bookmark );
+				editor.focus();
 			} else {
 				editor.selection.select( block );
 			}

diff --git a/tinymce-single/tinymce/block.js b/tinymce-single/tinymce/block.js
@@ -78,11 +78,15 @@
 					var currentSettings = wp.blocks.getBlockSettingsByElement( block );
 					var nextSettings = wp.blocks.getBlockSettings( event.control.settings.value );
 
+					editor.selection.collapse();
+
+					var bookmark = editor.selection.getBookmark();
+
 					editor.undoManager.transact( function() {
 						var newBlock = nextSettings.fromBaseState(
 							currentSettings.toBaseState( block, editor ), editor );
 
-						wp.blocks.selectBlock( newBlock );
+						wp.blocks.selectBlock( newBlock, bookmark );
 					} );
 				}
 			}