@contentful/field-editor-rich-text 6.0.0 → 6.0.1-canary.1

package/dist/cjs/plugins/shared/EmbeddedBlockUtil.js

@@ -12,6 +12,9 @@ _export(exports, {
     getWithEmbeddedBlockEvents: function() {
         return getWithEmbeddedBlockEvents;
     },
+    replaceEmptyParagraphWithBlock: function() {
+        return replaceEmptyParagraphWithBlock;
+    },
     selectEntityAndInsert: function() {
         return selectEntityAndInsert;
     },
@@ -64,7 +67,6 @@ async function selectEntityAndInsert(nodeType, sdk, editor, logAction) {
         ...baseConfig,
         withCreate: true
     };
-    const { selection } = editor;
     const rteSlide = (0, _sdkNavigatorSlideIn.watchCurrentSlide)(sdk.navigator);
     const entity = await selectEntity(config);
     if (!entity) {
@@ -72,7 +74,6 @@ async function selectEntityAndInsert(nodeType, sdk, editor, logAction) {
             nodeType
         });
     } else {
-        (0, _internal.select)(editor, selection);
         insertBlock(editor, nodeType, entity);
         ensureFollowingParagraph(editor, [
             _richtexttypes.BLOCKS.EMBEDDED_ASSET,
@@ -94,14 +95,12 @@ async function selectResourceEntityAndInsert(sdk, editor, logAction) {
     });
     const { field, dialogs } = sdk;
     const config = (0, _config.newResourceEntitySelectorConfigFromRichTextField)(field, _richtexttypes.BLOCKS.EMBEDDED_RESOURCE);
-    const { selection } = editor;
     const entityLink = await dialogs.selectSingleResourceEntity(config);
     if (!entityLink) {
         logAction('cancelCreateEmbedDialog', {
             nodeType: _richtexttypes.BLOCKS.EMBEDDED_RESOURCE
         });
     } else {
-        (0, _internal.select)(editor, selection);
         insertBlock(editor, _richtexttypes.BLOCKS.EMBEDDED_RESOURCE, entityLink);
         ensureFollowingParagraph(editor, [
             _richtexttypes.BLOCKS.EMBEDDED_RESOURCE
@@ -152,7 +151,6 @@ const createNode = (nodeType, entity)=>{
     };
 };
 function insertBlock(editor, nodeType, entity) {
-    if (!editor?.selection) return;
     const linkedEntityBlock = createNode(nodeType, entity);
     const elementPath = (0, _internal.getSelectionElementPath)(editor);
     if (elementPath && (0, _internal.isEmptyTextContainer)(editor, elementPath)) {
@@ -162,4 +160,27 @@ function insertBlock(editor, nodeType, entity) {
         return;
     }
     (0, _internal.insertNodes)(editor, linkedEntityBlock);
+    replaceEmptyParagraphWithBlock(editor);
+}
+function replaceEmptyParagraphWithBlock(editor) {
+    const blockPath = (0, _editor.getAncestorPathFromSelection)(editor);
+    if (!blockPath || (0, _internal.isFirstChildPath)(blockPath)) return;
+    const previousPath = (0, _internal.getPreviousPath)(blockPath);
+    if (!previousPath) return;
+    const [nodes] = (0, _internal.getNodeEntries)(editor, {
+        at: previousPath,
+        match: (node)=>node.type === _richtexttypes.BLOCKS.PARAGRAPH
+    });
+    if (!nodes) return;
+    const [previousNode] = nodes;
+    const isPreviousNodeTextEmpty = (0, _internal.isAncestorEmpty)(editor, previousNode);
+    if (isPreviousNodeTextEmpty) {
+        (0, _internal.moveNodes)(editor, {
+            at: blockPath,
+            to: previousPath
+        });
+        (0, _internal.removeNodes)(editor, {
+            at: blockPath
+        });
+    }
 }

package/dist/cjs/plugins/shared/EmbeddedInlineToolbarIcon.js

@@ -83,7 +83,9 @@ function EmbeddedInlineToolbarIcon({ onClose, nodeType, isDisabled }) {
     const sdk = (0, _SdkProvider.useSdkContext)();
     async function handleClick(event) {
         event.preventDefault();
-        if (!editor) return;
+        if (!editor) {
+            return;
+        }
         onClose();
         if (nodeType === _richtexttypes.INLINES.EMBEDDED_RESOURCE) {
             await (0, _EmbeddedInlineUtil.selectResourceEntityAndInsert)(editor, sdk, editor.tracking.onToolbarAction);

package/dist/cjs/plugins/shared/EmbeddedInlineUtil.js

@@ -75,7 +75,6 @@ async function selectEntityAndInsert(editor, sdk, logAction) {
         ...(0, _config.newEntitySelectorConfigFromRichTextField)(sdk.field, nodeType),
         withCreate: true
     };
-    const { selection } = editor;
     const rteSlide = (0, _sdkNavigatorSlideIn.watchCurrentSlide)(sdk.navigator);
     const entry = await sdk.dialogs.selectSingleEntry(config);
     if (!entry) {
@@ -83,7 +82,6 @@ async function selectEntityAndInsert(editor, sdk, logAction) {
             nodeType
         });
     } else {
-        (0, _transforms.select)(editor, selection);
         (0, _transforms.insertNodes)(editor, createInlineEntryNode(nodeType, entry));
         logAction('insert', {
             nodeType,

package/dist/esm/plugins/shared/EmbeddedBlockUtil.js

@@ -1,9 +1,9 @@
 import { BLOCKS, TEXT_CONTAINERS } from '@contentful/rich-text-types';
 import isHotkey from 'is-hotkey';
 import { newEntitySelectorConfigFromRichTextField, newResourceEntitySelectorConfigFromRichTextField } from '../../helpers/config';
-import { focus, getNodeEntryFromSelection, insertEmptyParagraph, moveToTheNextChar } from '../../helpers/editor';
+import { focus, getAncestorPathFromSelection, getNodeEntryFromSelection, insertEmptyParagraph, moveToTheNextChar } from '../../helpers/editor';
 import { watchCurrentSlide } from '../../helpers/sdkNavigatorSlideIn';
-import { getAboveNode, getLastNodeByLevel, insertNodes, getSelectionElementPath, isEmptyTextContainer, setNodes, select, removeNodes } from '../../internal';
+import { getAboveNode, getLastNodeByLevel, insertNodes, getSelectionElementPath, isEmptyTextContainer, setNodes, removeNodes, moveNodes, isFirstChildPath, getPreviousPath, getNodeEntries, isAncestorEmpty } from '../../internal';
 export function getWithEmbeddedBlockEvents(nodeType, sdk) {
     return (editor, { options: { hotkey } })=>(event)=>{
             const [, pathToSelectedElement] = getNodeEntryFromSelection(editor, nodeType);
@@ -38,7 +38,6 @@ export async function selectEntityAndInsert(nodeType, sdk, editor, logAction) {
         ...baseConfig,
         withCreate: true
     };
-    const { selection } = editor;
     const rteSlide = watchCurrentSlide(sdk.navigator);
     const entity = await selectEntity(config);
     if (!entity) {
@@ -46,7 +45,6 @@ export async function selectEntityAndInsert(nodeType, sdk, editor, logAction) {
             nodeType
         });
     } else {
-        select(editor, selection);
         insertBlock(editor, nodeType, entity);
         ensureFollowingParagraph(editor, [
             BLOCKS.EMBEDDED_ASSET,
@@ -68,14 +66,12 @@ export async function selectResourceEntityAndInsert(sdk, editor, logAction) {
     });
     const { field, dialogs } = sdk;
     const config = newResourceEntitySelectorConfigFromRichTextField(field, BLOCKS.EMBEDDED_RESOURCE);
-    const { selection } = editor;
     const entityLink = await dialogs.selectSingleResourceEntity(config);
     if (!entityLink) {
         logAction('cancelCreateEmbedDialog', {
             nodeType: BLOCKS.EMBEDDED_RESOURCE
         });
     } else {
-        select(editor, selection);
         insertBlock(editor, BLOCKS.EMBEDDED_RESOURCE, entityLink);
         ensureFollowingParagraph(editor, [
             BLOCKS.EMBEDDED_RESOURCE
@@ -126,7 +122,6 @@ const createNode = (nodeType, entity)=>{
     };
 };
 function insertBlock(editor, nodeType, entity) {
-    if (!editor?.selection) return;
     const linkedEntityBlock = createNode(nodeType, entity);
     const elementPath = getSelectionElementPath(editor);
     if (elementPath && isEmptyTextContainer(editor, elementPath)) {
@@ -136,4 +131,27 @@ function insertBlock(editor, nodeType, entity) {
         return;
     }
     insertNodes(editor, linkedEntityBlock);
+    replaceEmptyParagraphWithBlock(editor);
+}
+export function replaceEmptyParagraphWithBlock(editor) {
+    const blockPath = getAncestorPathFromSelection(editor);
+    if (!blockPath || isFirstChildPath(blockPath)) return;
+    const previousPath = getPreviousPath(blockPath);
+    if (!previousPath) return;
+    const [nodes] = getNodeEntries(editor, {
+        at: previousPath,
+        match: (node)=>node.type === BLOCKS.PARAGRAPH
+    });
+    if (!nodes) return;
+    const [previousNode] = nodes;
+    const isPreviousNodeTextEmpty = isAncestorEmpty(editor, previousNode);
+    if (isPreviousNodeTextEmpty) {
+        moveNodes(editor, {
+            at: blockPath,
+            to: previousPath
+        });
+        removeNodes(editor, {
+            at: blockPath
+        });
+    }
 }

package/dist/esm/plugins/shared/EmbeddedInlineToolbarIcon.js

@@ -27,7 +27,9 @@ export function EmbeddedInlineToolbarIcon({ onClose, nodeType, isDisabled }) {
     const sdk = useSdkContext();
     async function handleClick(event) {
         event.preventDefault();
-        if (!editor) return;
+        if (!editor) {
+            return;
+        }
         onClose();
         if (nodeType === INLINES.EMBEDDED_RESOURCE) {
             await selectResourceEntityAndInsert(editor, sdk, editor.tracking.onToolbarAction);

package/dist/esm/plugins/shared/EmbeddedInlineUtil.js

@@ -49,7 +49,6 @@ export async function selectEntityAndInsert(editor, sdk, logAction) {
         ...newEntitySelectorConfigFromRichTextField(sdk.field, nodeType),
         withCreate: true
     };
-    const { selection } = editor;
     const rteSlide = watchCurrentSlide(sdk.navigator);
     const entry = await sdk.dialogs.selectSingleEntry(config);
     if (!entry) {
@@ -57,7 +56,6 @@ export async function selectEntityAndInsert(editor, sdk, logAction) {
             nodeType
         });
     } else {
-        select(editor, selection);
         insertNodes(editor, createInlineEntryNode(nodeType, entry));
         logAction('insert', {
             nodeType,

package/dist/types/plugins/shared/EmbeddedBlockUtil.d.ts

@@ -1,8 +1,9 @@
 import { FieldAppSDK } from '@contentful/app-sdk';
 import { BLOCKS } from '@contentful/rich-text-types';
 import { HotkeyPlugin } from '@udecode/plate-common';
-import { KeyboardHandler } from '../../internal';
+import { PlateEditor, KeyboardHandler } from '../../internal';
 import { TrackingPluginActions } from '../Tracking';
 export declare function getWithEmbeddedBlockEvents(nodeType: BLOCKS.EMBEDDED_ENTRY | BLOCKS.EMBEDDED_ASSET | BLOCKS.EMBEDDED_RESOURCE, sdk: FieldAppSDK): KeyboardHandler<HotkeyPlugin>;
 export declare function selectEntityAndInsert(nodeType: any, sdk: any, editor: any, logAction: TrackingPluginActions['onToolbarAction'] | TrackingPluginActions['onShortcutAction']): Promise<void>;
 export declare function selectResourceEntityAndInsert(sdk: any, editor: any, logAction: TrackingPluginActions['onToolbarAction'] | TrackingPluginActions['onShortcutAction']): Promise<void>;
+export declare function replaceEmptyParagraphWithBlock(editor: PlateEditor): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-rich-text",
-  "version": "6.0.0",
+  "version": "6.0.1-canary.1+eafc10c9",
   "source": "./src/index.tsx",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -94,5 +94,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "267c2c3194103479b3fa0ba2c61001ef993f4cfd"
+  "gitHead": "eafc10c961d06739843380b49133adb2099a3f5b"
 }