@ckeditor/ckeditor5-engine 34.1.0 → 34.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-engine",
-  "version": "34.1.0",
+  "version": "34.2.0",
   "description": "The editing engine of CKEditor 5 – the best browser-based rich text editor.",
   "keywords": [
     "wysiwyg",
@@ -23,30 +23,30 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-utils": "^34.1.0",
+    "@ckeditor/ckeditor5-utils": "^34.2.0",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^34.1.0",
-    "@ckeditor/ckeditor5-block-quote": "^34.1.0",
-    "@ckeditor/ckeditor5-clipboard": "^34.1.0",
-    "@ckeditor/ckeditor5-cloud-services": "^34.1.0",
-    "@ckeditor/ckeditor5-core": "^34.1.0",
-    "@ckeditor/ckeditor5-editor-classic": "^34.1.0",
-    "@ckeditor/ckeditor5-enter": "^34.1.0",
-    "@ckeditor/ckeditor5-essentials": "^34.1.0",
-    "@ckeditor/ckeditor5-heading": "^34.1.0",
-    "@ckeditor/ckeditor5-image": "^34.1.0",
-    "@ckeditor/ckeditor5-link": "^34.1.0",
-    "@ckeditor/ckeditor5-list": "^34.1.0",
-    "@ckeditor/ckeditor5-mention": "^34.1.0",
-    "@ckeditor/ckeditor5-paragraph": "^34.1.0",
-    "@ckeditor/ckeditor5-table": "^34.1.0",
-    "@ckeditor/ckeditor5-theme-lark": "^34.1.0",
-    "@ckeditor/ckeditor5-typing": "^34.1.0",
-    "@ckeditor/ckeditor5-ui": "^34.1.0",
-    "@ckeditor/ckeditor5-undo": "^34.1.0",
-    "@ckeditor/ckeditor5-widget": "^34.1.0",
+    "@ckeditor/ckeditor5-basic-styles": "^34.2.0",
+    "@ckeditor/ckeditor5-block-quote": "^34.2.0",
+    "@ckeditor/ckeditor5-clipboard": "^34.2.0",
+    "@ckeditor/ckeditor5-cloud-services": "^34.2.0",
+    "@ckeditor/ckeditor5-core": "^34.2.0",
+    "@ckeditor/ckeditor5-editor-classic": "^34.2.0",
+    "@ckeditor/ckeditor5-enter": "^34.2.0",
+    "@ckeditor/ckeditor5-essentials": "^34.2.0",
+    "@ckeditor/ckeditor5-heading": "^34.2.0",
+    "@ckeditor/ckeditor5-image": "^34.2.0",
+    "@ckeditor/ckeditor5-link": "^34.2.0",
+    "@ckeditor/ckeditor5-list": "^34.2.0",
+    "@ckeditor/ckeditor5-mention": "^34.2.0",
+    "@ckeditor/ckeditor5-paragraph": "^34.2.0",
+    "@ckeditor/ckeditor5-table": "^34.2.0",
+    "@ckeditor/ckeditor5-theme-lark": "^34.2.0",
+    "@ckeditor/ckeditor5-typing": "^34.2.0",
+    "@ckeditor/ckeditor5-ui": "^34.2.0",
+    "@ckeditor/ckeditor5-undo": "^34.2.0",
+    "@ckeditor/ckeditor5-widget": "^34.2.0",
     "webpack": "^5.58.1",
     "webpack-cli": "^4.9.0"
   },

package/src/conversion/upcasthelpers.js

@@ -465,6 +465,11 @@ export function convertText() {
 				return;
 			}
 
+			// Do not auto-paragraph whitespaces.
+			if ( data.viewItem.data.trim().length == 0 ) {
+				return;
+			}
+
 			position = wrapInParagraph( position, writer );
 		}
 

package/src/view/domconverter.js

@@ -35,7 +35,6 @@ const NBSP_FILLER_REF = NBSP_FILLER( document ); // eslint-disable-line new-cap
 const MARKED_NBSP_FILLER_REF = MARKED_NBSP_FILLER( document ); // eslint-disable-line new-cap
 const UNSAFE_ATTRIBUTE_NAME_PREFIX = 'data-ck-unsafe-attribute-';
 const UNSAFE_ELEMENT_REPLACEMENT_ATTRIBUTE = 'data-ck-unsafe-element';
-const UNSAFE_ELEMENTS = [ 'script', 'style' ];
 
 /**
  * `DomConverter` is a set of tools to do transformations between DOM nodes and view nodes. It also handles
@@ -127,6 +126,15 @@ export default class DomConverter {
 			'object', 'iframe', 'input', 'button', 'textarea', 'select', 'option', 'video', 'embed', 'audio', 'img', 'canvas'
 		];
 
+		/**
+		 * A list of elements which may affect the editing experience. To avoid this, those elements are replaced with
+		 * `<span data-ck-unsafe-element="[element name]"></span>` while rendering in the editing mode.
+		 *
+		 * @readonly
+		 * @member {Array.<String>} module:engine/view/domconverter~DomConverter#unsafeElements
+		 */
+		this.unsafeElements = [ 'script', 'style' ];
+
 		/**
 		 * The DOM-to-view mapping.
 		 *
@@ -672,7 +680,7 @@ export default class DomConverter {
 				const attrs = domNode.attributes;
 
 				if ( attrs ) {
-					for ( let i = attrs.length - 1; i >= 0; i-- ) {
+					for ( let l = attrs.length, i = 0; i < l; i++ ) {
 						viewElement._setAttribute( attrs[ i ].name, attrs[ i ].value );
 					}
 				}
@@ -1564,7 +1572,7 @@ export default class DomConverter {
 	_shouldRenameElement( elementName ) {
 		const name = elementName.toLowerCase();
 
-		return this.renderingMode === 'editing' && UNSAFE_ELEMENTS.includes( name );
+		return this.renderingMode === 'editing' && this.unsafeElements.includes( name );
 	}
 
 	/**

package/src/view/element.js

@@ -608,6 +608,9 @@ export default class Element extends Node {
 		// is changed by e.g. toWidget() function from ckeditor5-widget. Perhaps this should be one of custom props.
 		cloned.getFillerOffset = this.getFillerOffset;
 
+		// Clone unsafe attributes list.
+		cloned._unsafeAttributesToRender = this._unsafeAttributesToRender;
+
 		return cloned;
 	}
 

package/src/view/filler.js

@@ -56,7 +56,7 @@ export const NBSP_FILLER = domDocument => domDocument.createTextNode( '\u00A0' )
 export const MARKED_NBSP_FILLER = domDocument => {
 	const span = domDocument.createElement( 'span' );
 	span.dataset.ckeFiller = true;
-	span.innerHTML = '\u00A0';
+	span.innerText = '\u00A0';
 
 	return span;
 };

package/src/view/renderer.js

@@ -234,6 +234,10 @@ export default class Renderer {
 		else if ( this._inlineFiller && this._inlineFiller.parentNode ) {
 			// While the user is making selection, preserve the inline filler at its original position.
 			inlineFillerPosition = this.domConverter.domPositionToView( this._inlineFiller );
+
+			if ( inlineFillerPosition.parent.is( '$text' ) ) {
+				inlineFillerPosition = ViewPosition._createBefore( inlineFillerPosition.parent );
+			}
 		}
 
 		for ( const element of this.markedAttributes ) {