Merge pull request #9889 from ckeditor/ck/9513-do-not-render-selectio…

…n-while-selecting

Fix (engine): Markers should not be split in view on the caret position. Closes #9513.

Fix (engine): `FocusObserver` should not force the view to render in random moments. See #9513.

packages/ckeditor5-engine/src/conversion/downcastdispatcher.js

@@ -341,6 +341,8 @@ export default class DowncastDispatcher {
 		this.fire( 'selection', { selection }, this.conversionApi );
 
 		if ( !selection.isCollapsed ) {
+			this._clearConversionApi();
+
 			return;
 		}
 
@@ -414,6 +416,8 @@ export default class DowncastDispatcher {
 		// Do not fire events for each item inside the range if the range got consumed.
 		//
 		if ( !consumable.test( markerRange, eventName ) ) {
+			this._clearConversionApi();
+
 			return;
 		}
 

packages/ckeditor5-engine/src/conversion/modelconsumable.js

@@ -320,5 +320,10 @@ export default class ModelConsumable {
 function _normalizeConsumableType( type ) {
 	const parts = type.split( ':' );
 
+	// Markers are identified by the whole name (otherwise we would consume the whole markers group).
+	if ( parts[ 0 ] == 'addMarker' || parts[ 0 ] == 'removeMarker' ) {
+		return type;
+	}
+
 	return parts.length > 1 ? parts[ 0 ] + ':' + parts[ 1 ] : parts[ 0 ];
 }

packages/ckeditor5-engine/src/view/observer/focusobserver.js

@@ -37,7 +37,10 @@ export default class FocusObserver extends DomEventObserver {
 			// overwrite new DOM selection with selection from the view.
 			// See https://github.com/ckeditor/ckeditor5-engine/issues/795 for more details.
 			// Long timeout is needed to solve #676 and https://github.com/ckeditor/ckeditor5-engine/issues/1157 issues.
-			this._renderTimeoutId = setTimeout( () => view.forceRender(), 50 );
+			//
+			// Using `view.change()` instead of `view.forceRender()` to prevent double rendering
+			// in a situation where `selectionchange` already caused selection change.
+			this._renderTimeoutId = setTimeout( () => view.change( () => {} ), 50 );
 		} );
 
 		document.on( 'blur', ( evt, data ) => {
@@ -46,8 +49,9 @@ export default class FocusObserver extends DomEventObserver {
 			if ( selectedEditable === null || selectedEditable === data.target ) {
 				document.isFocused = false;
 
-				// Re-render the document to update view elements.
-				view.forceRender();
+				// Re-render the document to update view elements
+				// (changing document.isFocused already marked view as changed since last rendering).
+				view.change( () => {} );
 			}
 		} );
 

packages/ckeditor5-engine/src/view/view.js

@@ -210,6 +210,11 @@ export default class View {
 		this.listenTo( this.document.selection, 'change', () => {
 			this._hasChangedSinceTheLastRendering = true;
 		} );
+
+		// Trigger re-render if only the focus changed.
+		this.listenTo( this.document, 'change:isFocused', () => {
+			this._hasChangedSinceTheLastRendering = true;
+		} );
 	}
 
 	/**