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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-paragraph",
-  "version": "38.2.0-alpha.0",
+  "version": "38.2.0-alpha.1",
   "description": "Paragraph feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,9 +13,9 @@
   "main": "src/index.js",
   "type": "module",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "38.2.0-alpha.0",
-    "@ckeditor/ckeditor5-ui": "38.2.0-alpha.0",
-    "@ckeditor/ckeditor5-utils": "38.2.0-alpha.0"
+    "@ckeditor/ckeditor5-core": "38.2.0-alpha.1",
+    "@ckeditor/ckeditor5-ui": "38.2.0-alpha.1",
+    "@ckeditor/ckeditor5-utils": "38.2.0-alpha.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';
+import type { Paragraph, ParagraphCommand, InsertParagraphCommand } from './index.js';
 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';
-export { default as ParagraphButtonUI } from './paragraphbuttonui';
-export type { default as ParagraphCommand } from './paragraphcommand';
-export type { default as InsertParagraphCommand } from './insertparagraphcommand';
-import './augmentation';
+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';

package/src/index.js

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

package/src/insertparagraphcommand.js

@@ -47,16 +47,38 @@ export default class InsertParagraphCommand extends Command {
         }
         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) {
+                return;
+            }
             if (attributes) {
                 model.schema.setAllowedAttributes(paragraph, attributes, writer);
             }
-            if (!model.schema.checkChild(position.parent, 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) {
-                    return;
-                }
+            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);

package/src/paragraph.js

@@ -5,8 +5,8 @@
 /**
  * @module paragraph/paragraph
  */
-import ParagraphCommand from './paragraphcommand';
-import InsertParagraphCommand from './insertparagraphcommand';
+import ParagraphCommand from './paragraphcommand.js';
+import InsertParagraphCommand from './insertparagraphcommand.js';
 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';
+import Paragraph from './paragraph.js';
 /**
  * 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';
+import Paragraph from './paragraph.js';
 const icon = icons.paragraph;
 /**
  * This plugin defines the `'paragraph'` button. It can be used together with