@ckeditor/ckeditor5-html-support 45.0.0-alpha.9 → 45.1.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-html-support",
-  "version": "45.0.0-alpha.9",
+  "version": "45.1.0-alpha.0",
   "description": "HTML Support feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -17,16 +17,16 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "45.0.0-alpha.9",
-    "@ckeditor/ckeditor5-engine": "45.0.0-alpha.9",
-    "@ckeditor/ckeditor5-enter": "45.0.0-alpha.9",
-    "@ckeditor/ckeditor5-heading": "45.0.0-alpha.9",
-    "@ckeditor/ckeditor5-image": "45.0.0-alpha.9",
-    "@ckeditor/ckeditor5-list": "45.0.0-alpha.9",
-    "@ckeditor/ckeditor5-table": "45.0.0-alpha.9",
-    "@ckeditor/ckeditor5-utils": "45.0.0-alpha.9",
-    "@ckeditor/ckeditor5-widget": "45.0.0-alpha.9",
-    "ckeditor5": "45.0.0-alpha.9",
+    "@ckeditor/ckeditor5-core": "45.1.0-alpha.0",
+    "@ckeditor/ckeditor5-engine": "45.1.0-alpha.0",
+    "@ckeditor/ckeditor5-enter": "45.1.0-alpha.0",
+    "@ckeditor/ckeditor5-heading": "45.1.0-alpha.0",
+    "@ckeditor/ckeditor5-image": "45.1.0-alpha.0",
+    "@ckeditor/ckeditor5-list": "45.1.0-alpha.0",
+    "@ckeditor/ckeditor5-table": "45.1.0-alpha.0",
+    "@ckeditor/ckeditor5-utils": "45.1.0-alpha.0",
+    "@ckeditor/ckeditor5-widget": "45.1.0-alpha.0",
+    "ckeditor5": "45.1.0-alpha.0",
     "es-toolkit": "1.32.0"
   },
   "author": "CKSource (http://cksource.com/)",

package/src/datafilter.js

@@ -626,6 +626,43 @@ export default class DataFilter extends Plugin {
             schema.register('htmlEmptyElement', {
                 inheritAllFrom: '$inlineObject'
             });
+            // Helper function to check if an element has any HTML attributes.
+            const hasHtmlAttributes = (element) => Array
+                .from(element.getAttributeKeys())
+                .some(key => key.startsWith('html'));
+            // Register a post-fixer that removes htmlEmptyElement when its htmlXX attribute is removed.
+            // See: https://github.com/ckeditor/ckeditor5/issues/18089
+            editor.model.document.registerPostFixer(writer => {
+                const changes = editor.model.document.differ.getChanges();
+                const elementsToRemove = new Set();
+                for (const change of changes) {
+                    if (change.type === 'remove') {
+                        continue;
+                    }
+                    // Look for removal of html* attributes.
+                    if (change.type === 'attribute' && change.attributeNewValue === null) {
+                        // Find htmlEmptyElement instances in the range that lost their html attribute.
+                        for (const { item } of change.range) {
+                            if (item.is('element', 'htmlEmptyElement') && !hasHtmlAttributes(item)) {
+                                elementsToRemove.add(item);
+                            }
+                        }
+                    }
+                    // Look for insertion of htmlEmptyElement.
+                    if (change.type === 'insert' && change.position.nodeAfter) {
+                        const insertedElement = change.position.nodeAfter;
+                        for (const { item } of writer.createRangeOn(insertedElement)) {
+                            if (item.is('element', 'htmlEmptyElement') && !hasHtmlAttributes(item)) {
+                                elementsToRemove.add(item);
+                            }
+                        }
+                    }
+                }
+                for (const element of elementsToRemove) {
+                    writer.remove(element);
+                }
+                return elementsToRemove.size > 0;
+            });
         }
         editor.data.htmlProcessor.domConverter.registerInlineObjectMatcher(element => {
             // Element must be empty and have any attribute.

package/src/htmlcomment.d.ts

@@ -56,7 +56,8 @@ export default class HtmlComment extends Plugin {
      *
      * By default, it includes comments at the range boundaries.
      *
-     * @param range
+     * @param range The range to search for HTML comments.
+     * @param options Additional options.
      * @param options.skipBoundaries When set to `true` the range boundaries will be skipped.
      * @returns HTML comment IDs
      */

package/src/htmlcomment.js

@@ -205,7 +205,8 @@ export default class HtmlComment extends Plugin {
      *
      * By default, it includes comments at the range boundaries.
      *
-     * @param range
+     * @param range The range to search for HTML comments.
+     * @param options Additional options.
      * @param options.skipBoundaries When set to `true` the range boundaries will be skipped.
      * @returns HTML comment IDs
      */

package/src/schemadefinitions.js

@@ -44,6 +44,8 @@
 //
 // Skipped hidden elements:
 // noscript
+//
+// When adding elements to this list, update the feature guide listing, too.
 export default {
     block: [
         // Existing features.