@ckeditor/ckeditor5-paragraph 39.0.0 → 39.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-paragraph",
-  "version": "39.0.0",
+  "version": "39.0.1",
   "description": "Paragraph feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -12,9 +12,9 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "39.0.0",
-    "@ckeditor/ckeditor5-ui": "39.0.0",
-    "@ckeditor/ckeditor5-utils": "39.0.0"
+    "@ckeditor/ckeditor5-core": "39.0.1",
+    "@ckeditor/ckeditor5-ui": "39.0.1",
+    "@ckeditor/ckeditor5-utils": "39.0.1"
   },
   "engines": {
     "node": ">=16.0.0",

package/src/insertparagraphcommand.d.ts

@@ -38,4 +38,8 @@ export default class InsertParagraphCommand extends Command {
         position: Position;
         attributes: Record<string, unknown>;
     }): void;
+    /**
+     * Returns the best position to insert a new paragraph.
+     */
+    private _findPositionToInsertParagraph;
 }

package/src/insertparagraphcommand.js

@@ -46,43 +46,45 @@ export default class InsertParagraphCommand extends Command {
             return;
         }
         model.change(writer => {
-            const paragraph = writer.createElement('paragraph');
-            const allowedParent = model.schema.findAllowedParent(position, paragraph);
-            // It could be there's no ancestor limit that would allow paragraph.
-            // In theory, "paragraph" could be disallowed even in the "$root".
-            if (!allowedParent) {
+            position = this._findPositionToInsertParagraph(position, writer);
+            if (!position) {
                 return;
             }
+            const paragraph = writer.createElement('paragraph');
             if (attributes) {
                 model.schema.setAllowedAttributes(paragraph, attributes, writer);
             }
-            if (position.path.length < 2) {
-                model.insertContent(paragraph, position);
-                writer.setSelection(paragraph, 'in');
-                return;
-            }
-            const positionParent = position.parent;
-            // E.g.
-            // <paragraph>[]</paragraph> ---> <paragraph></paragraph><paragraph>[]</paragraph>
-            const isInEmptyBlock = positionParent.isEmpty;
-            // E.g.
-            // <paragraph>foo[]</paragraph> ---> <paragraph>foo</paragraph><paragraph>[]</paragraph>
-            const isAtEndOfTextBlock = position.isAtEnd && !positionParent.isEmpty;
-            // E.g.
-            // <paragraph>[]foo</paragraph> ---> <paragraph>[]</paragraph><paragraph>foo</paragraph>
-            const isAtStartOfTextBlock = position.isAtStart && !positionParent.isEmpty;
-            const canBeChild = model.schema.checkChild(positionParent, paragraph);
-            if (isInEmptyBlock || isAtEndOfTextBlock) {
-                position = writer.createPositionAfter(positionParent);
-            }
-            else if (isAtStartOfTextBlock) {
-                position = writer.createPositionBefore(positionParent);
-            }
-            else if (!canBeChild) {
-                position = writer.split(position, allowedParent).position;
-            }
             model.insertContent(paragraph, position);
             writer.setSelection(paragraph, 'in');
         });
     }
+    /**
+     * Returns the best position to insert a new paragraph.
+     */
+    _findPositionToInsertParagraph(position, writer) {
+        const model = this.editor.model;
+        if (model.schema.checkChild(position, 'paragraph')) {
+            return position;
+        }
+        const allowedParent = model.schema.findAllowedParent(position, 'paragraph');
+        // It could be there's no ancestor limit that would allow paragraph.
+        // In theory, "paragraph" could be disallowed even in the "$root".
+        if (!allowedParent) {
+            return null;
+        }
+        const positionParent = position.parent;
+        const isTextAllowed = model.schema.checkChild(positionParent, '$text');
+        // At empty $block or at the end of $block.
+        // <paragraph>[]</paragraph> ---> <paragraph></paragraph><paragraph>[]</paragraph>
+        // <paragraph>foo[]</paragraph> ---> <paragraph>foo</paragraph><paragraph>[]</paragraph>
+        if (positionParent.isEmpty || isTextAllowed && position.isAtEnd) {
+            return model.createPositionAfter(positionParent);
+        }
+        // At the start of $block with text.
+        // <paragraph>[]foo</paragraph> ---> <paragraph>[]</paragraph><paragraph>foo</paragraph>
+        if (!positionParent.isEmpty && isTextAllowed && position.isAtStart) {
+            return model.createPositionBefore(positionParent);
+        }
+        return writer.split(position, allowedParent).position;
+    }
 }