@ckeditor/ckeditor5-html-support 48.1.0 → 48.2.0-alpha.0

package/dist/generalhtmlsupportconfig.d.ts

@@ -173,7 +173,7 @@ export interface GHSFullPageConfig {
      *
      * ```ts
      * ClassicEditor
-     * 	.create( editorElement, {
+     * 	.create( {
      * 		htmlSupport: {
      * 			fullPage: {
      * 				allowRenderStylesFromHead: true,

package/dist/index.js

@@ -714,17 +714,14 @@ function modifyGhsAttribute(writer, item, ghsAttributeName, subject, callback) {
             view: 'form',
             modelSchema: {
                 inheritAllFrom: '$container',
-                isBlock: true
+                isBlock: false
             }
         },
         {
             model: 'htmlHgroup',
             view: 'hgroup',
             modelSchema: {
-                allowIn: [
-                    '$root',
-                    '$container'
-                ],
+                allowWhere: '$container',
                 allowChildren: [
                     'paragraph',
                     'htmlP',
@@ -4022,9 +4019,16 @@ const STYLE_ATTRIBUTES_TO_PROPAGATE = [
         const editor = this.editor;
         const loadedCommentsContent = new Map();
         editor.data.processor.skipComments = false;
-        // Allow storing comment's content as the $root attribute with the name `$comment:<unique id>`.
+        // Declare the `$comment` attribute on `$root`. Custom roots that opt into the `$root`
+        // attribute chain via `allowAttributesOf: '$root'` get comment support automatically.
+        editor.model.schema.extend('$root', {
+            allowAttributes: '$comment'
+        });
+        // Allow storing comment's content as a root attribute with the name `$comment:<unique id>`.
+        // Gate the per-comment attribute on the root already allowing the generic `$comment` attribute
+        // so the rule works for any root name.
         editor.model.schema.addAttributeCheck((context, attributeName)=>{
-            if (context.endsWith('$root') && attributeName.startsWith('$comment')) {
+            if (attributeName.startsWith('$comment:') && editor.model.schema.checkAttribute(context, '$comment')) {
                 return true;
             }
         });