@ckeditor/ckeditor5-html-support 48.2.0-alpha.5 → 48.2.0-alpha.7

package/dist/index.js

@@ -2425,6 +2425,11 @@ function modifyGhsAttribute(writer, item, ghsAttributeName, subject, callback) {
             if (!viewPreElement || !viewPreElement.is('element', 'pre')) {
                 return;
             }
+            // The `<code>` was not converted to a model `codeBlock` element (e.g. an inline root only allows
+            // inline content), so there is no model range to set the preserved attributes on.
+            if (!data.modelRange) {
+                return;
+            }
             preserveElementAttributes(viewPreElement, 'htmlPreAttributes');
             preserveElementAttributes(viewCodeElement, 'htmlContentAttributes');
             function preserveElementAttributes(viewElement, attributeName) {
@@ -3368,13 +3373,13 @@ const STYLE_ATTRIBUTES_TO_PROPAGATE = [
                 allowAttributes
             });
             conversion.for('upcast').add((dispatcher)=>{
-                dispatcher.on('element:ul', viewToModelListAttributeConverter('htmlUlAttributes', dataFilter), {
+                dispatcher.on('element:ul', viewToModelListAttributeConverter('htmlUlAttributes', 'list', dataFilter), {
                     priority: 'low'
                 });
-                dispatcher.on('element:ol', viewToModelListAttributeConverter('htmlOlAttributes', dataFilter), {
+                dispatcher.on('element:ol', viewToModelListAttributeConverter('htmlOlAttributes', 'list', dataFilter), {
                     priority: 'low'
                 });
-                dispatcher.on('element:li', viewToModelListAttributeConverter('htmlLiAttributes', dataFilter), {
+                dispatcher.on('element:li', viewToModelListAttributeConverter('htmlLiAttributes', 'item', dataFilter), {
                     priority: 'low'
                 });
             });
@@ -3390,14 +3395,22 @@ const STYLE_ATTRIBUTES_TO_PROPAGATE = [
                     const attribute = getAttributeFromListType(previousNodeInList.getAttribute('listType'));
                     const value = previousNodeInList.getAttribute(attribute);
                     if (!isEqual(node.getAttribute(attribute), value) && writer.model.schema.checkAttribute(node, attribute)) {
-                        writer.setAttribute(attribute, value, node);
+                        if (value === undefined) {
+                            writer.removeAttribute(attribute, node);
+                        } else {
+                            writer.setAttribute(attribute, value, node);
+                        }
                         evt.return = true;
                     }
                 }
                 if (previousNodeInList.getAttribute('listItemId') == node.getAttribute('listItemId')) {
                     const value = previousNodeInList.getAttribute('htmlLiAttributes');
                     if (!isEqual(node.getAttribute('htmlLiAttributes'), value) && writer.model.schema.checkAttribute(node, 'htmlLiAttributes')) {
-                        writer.setAttribute('htmlLiAttributes', value, node);
+                        if (value === undefined) {
+                            writer.removeAttribute('htmlLiAttributes', node);
+                        } else {
+                            writer.setAttribute('htmlLiAttributes', value, node);
+                        }
                         evt.return = true;
                     }
                 }
@@ -3434,10 +3447,9 @@ const STYLE_ATTRIBUTES_TO_PROPAGATE = [
                     if (!editor.model.schema.checkAttribute(node, attribute)) {
                         continue;
                     }
-                    // Just reset the attribute.
-                    // If there is a previous indented list that this node should be merged into,
-                    // the postfixer will unify all the attributes of both sub-lists.
-                    writer.setAttribute(attribute, {}, node);
+                    // Clear any attribute inherited from the outer list. If the indented item joins an
+                    // existing nested list, the postfixer will copy the right value from a sibling.
+                    writer.removeAttribute(attribute, node);
                 }
             });
         });
@@ -3448,31 +3460,59 @@ const STYLE_ATTRIBUTES_TO_PROPAGATE = [
  * feature model element.
  *
  * @returns Returns a conversion callback.
- */ function viewToModelListAttributeConverter(attributeName, dataFilter) {
+ */ function viewToModelListAttributeConverter(attributeName, scope, dataFilter) {
     return (evt, data, conversionApi)=>{
         const viewElement = data.viewItem;
         if (!data.modelRange) {
             Object.assign(data, conversionApi.convertChildren(data.viewItem, data.modelCursor));
         }
         const viewAttributes = dataFilter.processViewAttributes(viewElement, conversionApi);
+        if (scope === 'list' && !viewAttributes) {
+            return;
+        }
+        const store = conversionApi.store;
+        store.htmlSupportItemToClosestList ??= new Map();
+        const itemToClosestList = store.htmlSupportItemToClosestList;
+        const closestList = scope === 'item' ? findClosestListAncestor(viewElement) : null;
         for (const item of data.modelRange.getItems({
             shallow: true
         })){
-            // Apply only to list item blocks.
             if (!item.hasAttribute('listItemId')) {
                 continue;
             }
-            // Set list attributes only on same level items, those nested deeper are already handled
-            // by the recursive conversion.
-            if (item.hasAttribute('htmlUlAttributes') || item.hasAttribute('htmlOlAttributes')) {
-                continue;
+            if (scope === 'item') {
+                // Converting `<li>`.
+                if (itemToClosestList.has(item)) {
+                    continue;
+                }
+                // Mark that this list item was already visited.
+                itemToClosestList.set(item, closestList);
+            } else {
+                // Converting `<ul>`/`<ol>`.
+                if (itemToClosestList.get(item) !== viewElement) {
+                    continue;
+                }
             }
-            if (conversionApi.writer.model.schema.checkAttribute(item, attributeName)) {
-                conversionApi.writer.setAttribute(attributeName, viewAttributes || {}, item);
+            // Set `<ul>`/`<ol>`/`<li>` custom attributes if any.
+            if (viewAttributes && conversionApi.writer.model.schema.checkAttribute(item, attributeName)) {
+                conversionApi.writer.setAttribute(attributeName, viewAttributes, item);
             }
         }
     };
 }
+/**
+ * Walks up the view tree from the given element and returns the first `<ul>`/`<ol>` ancestor,
+ * or `null` if there isn't one.
+ */ function findClosestListAncestor(viewElement) {
+    let node = viewElement.parent;
+    while(node){
+        if (node.is('element', 'ul') || node.is('element', 'ol')) {
+            return node;
+        }
+        node = node.parent;
+    }
+    return null;
+}
 /**
  * Returns HTML attribute name based on provided list type.
  */ function getAttributeFromListType(listType) {