@ckeditor/ckeditor5-paragraph 38.2.0-alpha.1 → 39.0.1

package/README.md

@@ -4,7 +4,6 @@ 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)
-![Dependency Status](https://img.shields.io/librariesio/release/npm/@ckeditor/ckeditor5-paragraph)
 
 This package implements paragraph support for CKEditor 5.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-paragraph",
-  "version": "38.2.0-alpha.1",
+  "version": "39.0.1",
   "description": "Paragraph feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -11,11 +11,10 @@
     "ckeditor5-dll"
   ],
   "main": "src/index.js",
-  "type": "module",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "38.2.0-alpha.1",
-    "@ckeditor/ckeditor5-ui": "38.2.0-alpha.1",
-    "@ckeditor/ckeditor5-utils": "38.2.0-alpha.1"
+    "@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/augmentation.d.ts

@@ -2,7 +2,7 @@
  * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-import type { Paragraph, ParagraphCommand, InsertParagraphCommand } from './index.js';
+import type { Paragraph, ParagraphCommand, InsertParagraphCommand } from './index';
 declare module '@ckeditor/ckeditor5-core' {
     interface CommandsMap {
         insertParagraph: InsertParagraphCommand;

package/src/index.d.ts

@@ -5,8 +5,8 @@
 /**
  * @module paragraph
  */
-export { default as Paragraph } from './paragraph.js';
-export { default as ParagraphButtonUI } from './paragraphbuttonui.js';
-export type { default as ParagraphCommand } from './paragraphcommand.js';
-export type { default as InsertParagraphCommand } from './insertparagraphcommand.js';
-import './augmentation.js';
+export { default as Paragraph } from './paragraph';
+export { default as ParagraphButtonUI } from './paragraphbuttonui';
+export type { default as ParagraphCommand } from './paragraphcommand';
+export type { default as InsertParagraphCommand } from './insertparagraphcommand';
+import './augmentation';

package/src/index.js

@@ -5,6 +5,6 @@
 /**
  * @module paragraph
  */
-export { default as Paragraph } from './paragraph.js';
-export { default as ParagraphButtonUI } from './paragraphbuttonui.js';
-import './augmentation.js';
+export { default as Paragraph } from './paragraph';
+export { default as ParagraphButtonUI } from './paragraphbuttonui';
+import './augmentation';

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

package/src/paragraph.js

@@ -5,8 +5,8 @@
 /**
  * @module paragraph/paragraph
  */
-import ParagraphCommand from './paragraphcommand.js';
-import InsertParagraphCommand from './insertparagraphcommand.js';
+import ParagraphCommand from './paragraphcommand';
+import InsertParagraphCommand from './insertparagraphcommand';
 import { Plugin } from '@ckeditor/ckeditor5-core';
 /**
  * The paragraph feature for the editor.

package/src/paragraphbuttonui.d.ts

@@ -6,7 +6,7 @@
  * @module paragraph/paragraphbuttonui
  */
 import { Plugin } from '@ckeditor/ckeditor5-core';
-import Paragraph from './paragraph.js';
+import Paragraph from './paragraph';
 /**
  * This plugin defines the `'paragraph'` button. It can be used together with
  * {@link module:heading/headingbuttonsui~HeadingButtonsUI} to replace the standard heading dropdown.

package/src/paragraphbuttonui.js

@@ -7,7 +7,7 @@
  */
 import { Plugin, icons } from '@ckeditor/ckeditor5-core';
 import { ButtonView } from '@ckeditor/ckeditor5-ui';
-import Paragraph from './paragraph.js';
+import Paragraph from './paragraph';
 const icon = icons.paragraph;
 /**
  * This plugin defines the `'paragraph'` button. It can be used together with