@ckeditor/ckeditor5-paragraph 39.0.0 → 39.0.2

package/CHANGELOG.md

@@ -100,7 +100,7 @@ Internal changes only (updated dependencies, documentation, etc.).
 
 ### BREAKING CHANGES
 
-* The license under which CKEditor 5 is released has been changed from a triple GPL, LGPL and MPL license to a GPL2+ only. See [ckeditor/ckeditor5#991](https://github.com/ckeditor/ckeditor5/issues/991) for more information.
+* The license under which CKEditor 5 is released has been changed from a triple GPL, LGPL and MPL license to a GPL2+ only. See [ckeditor/ckeditor5#991](https://github.com/ckeditor/ckeditor5/issues/991) for more information.
 
 
 ## [1.0.0-beta.4](https://github.com/ckeditor/ckeditor5-paragraph/compare/v1.0.0-beta.2...v1.0.0-beta.4) (2018-04-19)

package/LICENSE.md

@@ -1,7 +1,7 @@
 Software License Agreement
 ==========================
 
-**CKEditor 5 paragraph feature** – https://github.com/ckeditor/ckeditor5-paragraph <br>
+**CKEditor&nbsp;5 paragraph feature** – https://github.com/ckeditor/ckeditor5-paragraph <br>
 Copyright (c) 2003-2023, [CKSource Holding sp. z o.o.](https://cksource.com) All rights reserved.
 
 Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).

package/README.md

@@ -1,15 +1,15 @@
-CKEditor 5 paragraph feature
+CKEditor 5 paragraph feature
 ========================================
 
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-paragraph.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-paragraph)
 [![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor5/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5?branch=master)
 [![Build Status](https://travis-ci.com/ckeditor/ckeditor5.svg?branch=master)](https://app.travis-ci.com/github/ckeditor/ckeditor5)
 
-This package implements paragraph support for CKEditor 5.
+This package implements paragraph support for CKEditor 5.
 
 ## Documentation
 
-See the [`@ckeditor/ckeditor5-paragraph` package](https://ckeditor.com/docs/ckeditor5/latest/api/paragraph.html) page in [CKEditor 5 documentation](https://ckeditor.com/docs/ckeditor5/latest/).
+See the [`@ckeditor/ckeditor5-paragraph` package](https://ckeditor.com/docs/ckeditor5/latest/api/paragraph.html) page in [CKEditor 5 documentation](https://ckeditor.com/docs/ckeditor5/latest/).
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-paragraph",
-  "version": "39.0.0",
+  "version": "39.0.2",
   "description": "Paragraph feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -12,13 +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"
-  },
-  "engines": {
-    "node": ">=16.0.0",
-    "npm": ">=5.7.1"
+    "@ckeditor/ckeditor5-core": "39.0.2",
+    "@ckeditor/ckeditor5-ui": "39.0.2",
+    "@ckeditor/ckeditor5-utils": "39.0.2"
   },
   "author": "CKSource (http://cksource.com/)",
   "license": "GPL-2.0-or-later",

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;
+    }
 }