@ckeditor/ckeditor5-engine 41.0.0 → 41.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-engine",
-  "version": "41.0.0",
+  "version": "41.1.0",
   "description": "The editing engine of CKEditor 5 – the best browser-based rich text editor.",
   "keywords": [
     "wysiwyg",
@@ -24,7 +24,7 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-utils": "41.0.0",
+    "@ckeditor/ckeditor5-utils": "41.1.0",
     "lodash-es": "4.17.21"
   },
   "author": "CKSource (http://cksource.com/)",

package/src/controller/datacontroller.d.ts

@@ -194,6 +194,7 @@ export default class DataController extends DataController_base {
      */
     set(data: string | Record<string, string>, options?: {
         batchType?: BatchType;
+        [key: string]: unknown;
     }): void;
     /**
      * Returns the data parsed by the {@link #processor data processor} and then converted by upcast converters

package/src/conversion/downcasthelpers.js

@@ -14,6 +14,7 @@ import ModelElement from '../model/element.js';
 import ModelPosition from '../model/position.js';
 import ViewAttributeElement from '../view/attributeelement.js';
 import ConversionHelpers from './conversionhelpers.js';
+import StylesMap from '../view/stylesmap.js';
 import { CKEditorError, toArray } from '@ckeditor/ckeditor5-utils';
 import { cloneDeep } from 'lodash-es';
 /**
@@ -1353,15 +1354,24 @@ function changeAttribute(attributeCreator) {
         // First remove the old attribute if there was one.
         if (data.attributeOldValue !== null && oldAttribute) {
             if (oldAttribute.key == 'class') {
-                const classes = toArray(oldAttribute.value);
+                const classes = typeof oldAttribute.value == 'string' ? oldAttribute.value.split(/\s+/) : oldAttribute.value;
                 for (const className of classes) {
                     viewWriter.removeClass(className, viewElement);
                 }
             }
             else if (oldAttribute.key == 'style') {
-                const keys = Object.keys(oldAttribute.value);
-                for (const key of keys) {
-                    viewWriter.removeStyle(key, viewElement);
+                if (typeof oldAttribute.value == 'string') {
+                    const styles = new StylesMap(viewWriter.document.stylesProcessor);
+                    styles.setTo(oldAttribute.value);
+                    for (const [key] of styles.getStylesEntries()) {
+                        viewWriter.removeStyle(key, viewElement);
+                    }
+                }
+                else {
+                    const keys = Object.keys(oldAttribute.value);
+                    for (const key of keys) {
+                        viewWriter.removeStyle(key, viewElement);
+                    }
                 }
             }
             else {
@@ -1371,15 +1381,24 @@ function changeAttribute(attributeCreator) {
         // Then set the new attribute.
         if (data.attributeNewValue !== null && newAttribute) {
             if (newAttribute.key == 'class') {
-                const classes = toArray(newAttribute.value);
+                const classes = typeof newAttribute.value == 'string' ? newAttribute.value.split(/\s+/) : newAttribute.value;
                 for (const className of classes) {
                     viewWriter.addClass(className, viewElement);
                 }
             }
             else if (newAttribute.key == 'style') {
-                const keys = Object.keys(newAttribute.value);
-                for (const key of keys) {
-                    viewWriter.setStyle(key, newAttribute.value[key], viewElement);
+                if (typeof newAttribute.value == 'string') {
+                    const styles = new StylesMap(viewWriter.document.stylesProcessor);
+                    styles.setTo(newAttribute.value);
+                    for (const [key, value] of styles.getStylesEntries()) {
+                        viewWriter.setStyle(key, value, viewElement);
+                    }
+                }
+                else {
+                    const keys = Object.keys(newAttribute.value);
+                    for (const key of keys) {
+                        viewWriter.setStyle(key, newAttribute.value[key], viewElement);
+                    }
                 }
             }
             else {

package/src/conversion/upcasthelpers.js

@@ -776,15 +776,15 @@ function normalizeViewAttributeKeyValueConfig(config) {
         config.view = { key: config.view };
     }
     const key = config.view.key;
+    const value = typeof config.view.value == 'undefined' ? /[\s\S]*/ : config.view.value;
     let normalized;
     if (key == 'class' || key == 'style') {
         const keyName = key == 'class' ? 'classes' : 'styles';
         normalized = {
-            [keyName]: config.view.value
+            [keyName]: value
         };
     }
     else {
-        const value = typeof config.view.value == 'undefined' ? /[\s\S]*/ : config.view.value;
         normalized = {
             attributes: {
                 [key]: value

package/src/view/stylesmap.d.ts

@@ -312,7 +312,7 @@ export default class StylesMap {
     /**
      * Returns normalized styles entries for further processing.
      */
-    private _getStylesEntries;
+    getStylesEntries(): Array<PropertyDescriptor>;
     /**
      * Removes empty objects upon removing an entry from internal object.
      */

package/src/view/stylesmap.js

@@ -190,7 +190,7 @@ export default class StylesMap {
         if (this.isEmpty) {
             return '';
         }
-        return this._getStylesEntries()
+        return this.getStylesEntries()
             .map(arr => arr.join(':'))
             .sort()
             .join(';') + ';';
@@ -290,7 +290,7 @@ export default class StylesMap {
         if (expand) {
             return this._styleProcessor.getStyleNames(this._styles);
         }
-        const entries = this._getStylesEntries();
+        const entries = this.getStylesEntries();
         return entries.map(([key]) => key);
     }
     /**
@@ -302,7 +302,7 @@ export default class StylesMap {
     /**
      * Returns normalized styles entries for further processing.
      */
-    _getStylesEntries() {
+    getStylesEntries() {
         const parsed = [];
         const keys = Object.keys(this._styles);
         for (const key of keys) {