@ckeditor/ckeditor5-code-block 0.0.0-nightly-20240604.0 → 0.0.0-nightly-20240604.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-code-block",
-  "version": "0.0.0-nightly-20240604.0",
+  "version": "0.0.0-nightly-20240604.1",
   "description": "Code block feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,7 +13,7 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "0.0.0-nightly-20240604.0",
+    "ckeditor5": "0.0.0-nightly-20240604.1",
     "lodash-es": "4.17.21"
   },
   "author": "CKSource (http://cksource.com/)",

package/src/codeblockediting.js

@@ -63,8 +63,6 @@ export default class CodeBlockEditing extends Plugin {
         const schema = editor.model.schema;
         const model = editor.model;
         const view = editor.editing.view;
-        const listEditing = editor.plugins.has('ListEditing') ?
-            editor.plugins.get('ListEditing') : null;
         const normalizedLanguagesDefs = getNormalizedAndLocalizedLanguageDefinitions(editor);
         // The main command.
         editor.commands.add('codeBlock', new CodeBlockCommand(editor));
@@ -85,26 +83,19 @@ export default class CodeBlockEditing extends Plugin {
         schema.register('codeBlock', {
             allowWhere: '$block',
             allowChildren: '$text',
-            isBlock: true,
-            allowAttributes: ['language']
+            // Disallow `$inlineObject` and its derivatives like `inlineWidget` inside `codeBlock` to ensure that only text,
+            // not other inline elements like inline images, are allowed. This maintains the semantic integrity of code blocks.
+            disallowChildren: '$inlineObject',
+            allowAttributes: ['language'],
+            allowAttributesOf: '$listItem',
+            isBlock: true
         });
-        // Allow all list* attributes on `codeBlock` (integration with DocumentList).
-        // Disallow all attributes on $text inside `codeBlock`.
-        schema.addAttributeCheck((context, attributeName) => {
-            if (context.endsWith('codeBlock') &&
-                listEditing && listEditing.getListAttributeNames().includes(attributeName)) {
-                return true;
-            }
+        // Disallow all attributes on `$text` inside `codeBlock`.
+        schema.addAttributeCheck(context => {
             if (context.endsWith('codeBlock $text')) {
                 return false;
             }
         });
-        // Disallow object elements inside `codeBlock`. See #9567.
-        editor.model.schema.addChildCheck((context, childDefinition) => {
-            if (context.endsWith('codeBlock') && childDefinition.isObject) {
-                return false;
-            }
-        });
         // Conversion.
         editor.editing.downcastDispatcher.on('insert:codeBlock', modelToViewCodeBlockInsertion(model, normalizedLanguagesDefs, true));
         editor.data.downcastDispatcher.on('insert:codeBlock', modelToViewCodeBlockInsertion(model, normalizedLanguagesDefs));