@contentful/field-editor-rich-text 3.5.0 → 3.6.0

package/dist/cjs/Toolbar/components/EmbedEntityWidget.js

@@ -13,8 +13,8 @@ const _richtexttypes = require("@contentful/rich-text-types");
 const _ContentfulEditorProvider = require("../../ContentfulEditorProvider");
 const _editor = require("../../helpers/editor");
 const _validations = require("../../helpers/validations");
-const _EmbeddedEntityBlock = require("../../plugins/EmbeddedEntityBlock");
 const _EmbeddedEntityInline = require("../../plugins/EmbeddedEntityInline");
+const _EmbeddedBlockToolbarIcon = require("../../plugins/shared/EmbeddedBlockToolbarIcon");
 const _SdkProvider = require("../../SdkProvider");
 const _EmbeddedEntityDropdownButton = require("./EmbeddedEntityDropdownButton");
 function _getRequireWildcardCache(nodeInterop) {
@@ -64,15 +64,20 @@ const EmbedEntityWidget = ({ isDisabled , canInsertBlocks  })=>{
     const onToggleEntityDropdown = ()=>setEmbedDropdownOpen(!isEmbedDropdownOpen);
     const inlineEntryEmbedEnabled = (0, _validations.isNodeTypeEnabled)(sdk.field, _richtexttypes.INLINES.EMBEDDED_ENTRY);
     const blockEntryEmbedEnabled = (0, _validations.isNodeTypeEnabled)(sdk.field, _richtexttypes.BLOCKS.EMBEDDED_ENTRY) && canInsertBlocks;
+    const blockResourceEmbedEnabled = (0, _validations.isNodeTypeEnabled)(sdk.field, _richtexttypes.BLOCKS.EMBEDDED_RESOURCE) && canInsertBlocks;
     const blockAssetEmbedEnabled = (0, _validations.isNodeTypeEnabled)(sdk.field, _richtexttypes.BLOCKS.EMBEDDED_ASSET) && canInsertBlocks;
-    const actions = _react.default.createElement(_react.default.Fragment, null, blockEntryEmbedEnabled && _react.default.createElement(_EmbeddedEntityBlock.ToolbarIcon, {
+    const actions = _react.default.createElement(_react.default.Fragment, null, blockEntryEmbedEnabled && _react.default.createElement(_EmbeddedBlockToolbarIcon.EmbeddedBlockToolbarIcon, {
         isDisabled: !!isDisabled,
         nodeType: _richtexttypes.BLOCKS.EMBEDDED_ENTRY,
         onClose: onCloseEntityDropdown
+    }), blockResourceEmbedEnabled && _react.default.createElement(_EmbeddedBlockToolbarIcon.EmbeddedBlockToolbarIcon, {
+        isDisabled: !!isDisabled,
+        nodeType: _richtexttypes.BLOCKS.EMBEDDED_RESOURCE,
+        onClose: onCloseEntityDropdown
     }), inlineEntryEmbedEnabled && _react.default.createElement(_EmbeddedEntityInline.ToolbarEmbeddedEntityInlineButton, {
         isDisabled: !!isDisabled || (0, _editor.isLinkActive)(editor),
         onClose: onCloseEntityDropdown
-    }), blockAssetEmbedEnabled && _react.default.createElement(_EmbeddedEntityBlock.ToolbarIcon, {
+    }), blockAssetEmbedEnabled && _react.default.createElement(_EmbeddedBlockToolbarIcon.EmbeddedBlockToolbarIcon, {
         isDisabled: !!isDisabled,
         nodeType: _richtexttypes.BLOCKS.EMBEDDED_ASSET,
         onClose: onCloseEntityDropdown

package/dist/cjs/helpers/__tests__/removeInternalMarks.test.js

@@ -11,36 +11,52 @@ describe('internal mark', ()=>{
         const data = [
             {
                 title: 'Paragraph mark is removed',
-                input: (0, _contentfulslatejsadapter.toContentfulDocument)((0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", {
-                    [_constants.COMMAND_PROMPT]: true
-                }))).children),
-                expected: (0, _contentfulslatejsadapter.toContentfulDocument)((0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", null))).children)
+                input: (0, _contentfulslatejsadapter.toContentfulDocument)({
+                    document: (0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", {
+                        [_constants.COMMAND_PROMPT]: true
+                    }))).children
+                }),
+                expected: (0, _contentfulslatejsadapter.toContentfulDocument)({
+                    document: (0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", null))).children
+                })
             },
             {
                 title: 'Heading mark is removed',
-                input: (0, _contentfulslatejsadapter.toContentfulDocument)((0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hh1", null, (0, _testutils.jsx)("htext", {
-                    [_constants.COMMAND_PROMPT]: true
-                }))).children),
-                expected: (0, _contentfulslatejsadapter.toContentfulDocument)((0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hh1", null, (0, _testutils.jsx)("htext", null))).children)
+                input: (0, _contentfulslatejsadapter.toContentfulDocument)({
+                    document: (0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hh1", null, (0, _testutils.jsx)("htext", {
+                        [_constants.COMMAND_PROMPT]: true
+                    }))).children
+                }),
+                expected: (0, _contentfulslatejsadapter.toContentfulDocument)({
+                    document: (0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hh1", null, (0, _testutils.jsx)("htext", null))).children
+                })
             },
             {
                 title: 'Block quote mark is removed',
-                input: (0, _contentfulslatejsadapter.toContentfulDocument)((0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hquote", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", {
-                    [_constants.COMMAND_PROMPT]: true
-                })))).children),
-                expected: (0, _contentfulslatejsadapter.toContentfulDocument)((0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hquote", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", null)))).children)
+                input: (0, _contentfulslatejsadapter.toContentfulDocument)({
+                    document: (0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hquote", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", {
+                        [_constants.COMMAND_PROMPT]: true
+                    })))).children
+                }),
+                expected: (0, _contentfulslatejsadapter.toContentfulDocument)({
+                    document: (0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hquote", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", null)))).children
+                })
             },
             {
                 title: 'Other marks are not removed',
-                input: (0, _contentfulslatejsadapter.toContentfulDocument)((0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hquote", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", {
-                    bold: true,
-                    underline: true,
-                    [_constants.COMMAND_PROMPT]: true
-                })))).children),
-                expected: (0, _contentfulslatejsadapter.toContentfulDocument)((0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hquote", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", {
-                    bold: true,
-                    underline: true
-                })))).children)
+                input: (0, _contentfulslatejsadapter.toContentfulDocument)({
+                    document: (0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hquote", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", {
+                        bold: true,
+                        underline: true,
+                        [_constants.COMMAND_PROMPT]: true
+                    })))).children
+                }),
+                expected: (0, _contentfulslatejsadapter.toContentfulDocument)({
+                    document: (0, _testutils.jsx)("editor", null, (0, _testutils.jsx)("hquote", null, (0, _testutils.jsx)("hp", null, (0, _testutils.jsx)("htext", {
+                        bold: true,
+                        underline: true
+                    })))).children
+                })
             }
         ];
         for (const { input , expected , title  } of data){

package/dist/cjs/helpers/getAllowedResourcesForNodeType.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return getAllowedResourcesForNodeType;
+    }
+});
+const _find = _interop_require_default(require("lodash/find"));
+const _flow = _interop_require_default(require("lodash/flow"));
+const _get = _interop_require_default(require("lodash/get"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function getAllowedResourcesForNodeType(field, nodeType) {
+    return (0, _flow.default)((validations)=>(0, _find.default)(validations, 'nodes'), (validations)=>(0, _get.default)(validations, [
+            'nodes',
+            nodeType,
+            'allowedResources'
+        ], []))(field.validations);
+}

package/dist/cjs/helpers/newResourceEntitySelectorConfigFromRichTextField.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return newResourceEntitySelectorConfigFromRichTextField;
+    }
+});
+const _getAllowedResourcesForNodeType = _interop_require_default(require("./getAllowedResourcesForNodeType"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function newResourceEntitySelectorConfigFromRichTextField(field, nodeType) {
+    return {
+        allowedResources: (0, _getAllowedResourcesForNodeType.default)(field, nodeType)
+    };
+}

package/dist/cjs/plugins/DragAndDrop/index.js

@@ -14,6 +14,7 @@ function createDragAndDropPlugin() {
     const DRAGGABLE_TYPES = [
         _richtexttypes.BLOCKS.EMBEDDED_ENTRY,
         _richtexttypes.BLOCKS.EMBEDDED_ASSET,
+        _richtexttypes.BLOCKS.EMBEDDED_RESOURCE,
         _richtexttypes.BLOCKS.HR,
         _richtexttypes.INLINES.EMBEDDED_ENTRY
     ];

package/dist/cjs/plugins/EmbeddedEntityBlock/LinkedEntityBlock.js

@@ -9,15 +9,15 @@ Object.defineProperty(exports, "LinkedEntityBlock", {
     }
 });
 const _react = _interop_require_wildcard(require("react"));
-const _emotion = require("emotion");
 const _slatereact = require("slate-react");
 const _ContentfulEditorProvider = require("../../ContentfulEditorProvider");
-const _environment = require("../../helpers/environment");
 const _queries = require("../../internal/queries");
 const _transforms = require("../../internal/transforms");
 const _SdkProvider = require("../../SdkProvider");
+const _linkstracking = require("../links-tracking");
 const _FetchingWrappedAssetCard = require("../shared/FetchingWrappedAssetCard");
 const _FetchingWrappedEntryCard = require("../shared/FetchingWrappedEntryCard");
+const _LinkedBlockWrapper = require("../shared/LinkedBlockWrapper");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -57,19 +57,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-const styles = {
-    root: (0, _emotion.css)({
-        marginBottom: '1.25rem !important',
-        display: 'block'
-    }),
-    container: (0, _emotion.css)({
-        display: 'inline-block',
-        verticalAlign: 'text-top',
-        width: '100%'
-    })
-};
 function LinkedEntityBlock(props) {
-    const { attributes , children , element , onEntityFetchComplete  } = props;
+    const { attributes , children , element  } = props;
+    const { onEntityFetchComplete  } = (0, _linkstracking.useLinkTracking)();
     const isSelected = (0, _slatereact.useSelected)();
     const editor = (0, _ContentfulEditorProvider.useContentfulEditor)();
     const sdk = (0, _SdkProvider.useSdkContext)();
@@ -95,34 +85,27 @@ function LinkedEntityBlock(props) {
         editor,
         element
     ]);
-    return _react.createElement("div", {
-        ...attributes,
-        className: styles.root,
-        "data-entity-type": entityType,
-        "data-entity-id": entityId,
-        contentEditable: _environment.IS_CHROME ? undefined : false,
-        draggable: _environment.IS_CHROME ? true : undefined
-    }, _react.createElement("div", {
-        contentEditable: _environment.IS_CHROME ? false : undefined,
-        draggable: _environment.IS_CHROME ? true : undefined,
-        className: styles.container
-    }, entityType === 'Entry' && _react.createElement(_FetchingWrappedEntryCard.FetchingWrappedEntryCard, {
-        sdk: sdk,
-        entryId: entityId,
-        locale: sdk.field.locale,
-        isDisabled: isDisabled,
-        isSelected: isSelected,
-        onRemove: handleRemoveClick,
-        onEdit: handleEditClick,
-        onEntityFetchComplete: onEntityFetchComplete
-    }), entityType === 'Asset' && _react.createElement(_FetchingWrappedAssetCard.FetchingWrappedAssetCard, {
-        sdk: sdk,
-        assetId: entityId,
-        locale: sdk.field.locale,
-        isDisabled: isDisabled,
-        isSelected: isSelected,
-        onRemove: handleRemoveClick,
-        onEdit: handleEditClick,
-        onEntityFetchComplete: onEntityFetchComplete
-    })), children);
+    return _react.createElement(_LinkedBlockWrapper.LinkedBlockWrapper, {
+        attributes: attributes,
+        card: _react.createElement(_react.Fragment, null, entityType === 'Entry' && _react.createElement(_FetchingWrappedEntryCard.FetchingWrappedEntryCard, {
+            sdk: sdk,
+            entryId: entityId,
+            locale: sdk.field.locale,
+            isDisabled: isDisabled,
+            isSelected: isSelected,
+            onRemove: handleRemoveClick,
+            onEdit: handleEditClick,
+            onEntityFetchComplete: onEntityFetchComplete
+        }), entityType === 'Asset' && _react.createElement(_FetchingWrappedAssetCard.FetchingWrappedAssetCard, {
+            sdk: sdk,
+            assetId: entityId,
+            locale: sdk.field.locale,
+            isDisabled: isDisabled,
+            isSelected: isSelected,
+            onRemove: handleRemoveClick,
+            onEdit: handleEditClick,
+            onEntityFetchComplete: onEntityFetchComplete
+        })),
+        element: element
+    }, children);
 }

package/dist/cjs/plugins/EmbeddedEntityBlock/index.js

@@ -9,9 +9,6 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    ToolbarIcon: function() {
-        return _ToolbarIcon.EmbeddedEntityBlockToolbarIcon;
-    },
     createEmbeddedEntryBlockPlugin: function() {
         return createEmbeddedEntryBlockPlugin;
     },
@@ -20,52 +17,23 @@ _export(exports, {
     }
 });
 const _richtexttypes = require("@contentful/rich-text-types");
-const _ishotkey = _interop_require_default(require("is-hotkey"));
-const _editor = require("../../helpers/editor");
-const _transforms = require("../../internal/transforms");
-const _linkstracking = require("../links-tracking");
+const _EmbeddedBlockUtil = require("../shared/EmbeddedBlockUtil");
 const _LinkedEntityBlock = require("./LinkedEntityBlock");
-const _Util = require("./Util");
-const _ToolbarIcon = require("./ToolbarIcon");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 const entityTypes = {
     [_richtexttypes.BLOCKS.EMBEDDED_ENTRY]: 'Entry',
     [_richtexttypes.BLOCKS.EMBEDDED_ASSET]: 'Asset'
 };
-function getWithEmbeddedEntityEvents(nodeType, sdk) {
-    return (editor, { options: { hotkey  }  })=>(event)=>{
-            const [, pathToSelectedElement] = (0, _editor.getNodeEntryFromSelection)(editor, nodeType);
-            if (pathToSelectedElement) {
-                const isDelete = event.key === 'Delete';
-                const isBackspace = event.key === 'Backspace';
-                if (isDelete || isBackspace) {
-                    event.preventDefault();
-                    (0, _transforms.removeNodes)(editor, {
-                        at: pathToSelectedElement
-                    });
-                }
-                return;
-            }
-            if (hotkey && (0, _ishotkey.default)(hotkey, event)) {
-                (0, _Util.selectEntityAndInsert)(nodeType, sdk, editor, editor.tracking.onShortcutAction);
-            }
-        };
-}
 const createEmbeddedEntityPlugin = (nodeType, hotkey)=>(sdk)=>({
             key: nodeType,
             type: nodeType,
             isElement: true,
             isVoid: true,
-            component: (0, _linkstracking.withLinkTracking)(_LinkedEntityBlock.LinkedEntityBlock),
+            component: _LinkedEntityBlock.LinkedEntityBlock,
             options: {
                 hotkey
             },
             handlers: {
-                onKeyDown: getWithEmbeddedEntityEvents(nodeType, sdk)
+                onKeyDown: (0, _EmbeddedBlockUtil.getWithEmbeddedBlockEvents)(nodeType, sdk)
             },
             deserializeHtml: {
                 rules: [

package/dist/cjs/plugins/EmbeddedEntityInline/index.js

@@ -98,6 +98,7 @@ function EmbeddedEntityInline(props) {
     const isSelected = (0, _slatereact.useSelected)();
     const { id: entryId  } = props.element.data.target.sys;
     const isDisabled = (0, _slatereact.useReadOnly)();
+    const { onEntityFetchComplete  } = (0, _linkstracking.useLinkTracking)();
     function handleEditClick() {
         return sdk.navigator.openEntry(entryId, {
             slideIn: {
@@ -130,7 +131,7 @@ function EmbeddedEntityInline(props) {
         isDisabled: isDisabled,
         onRemove: handleRemoveClick,
         onEdit: handleEditClick,
-        onEntityFetchComplete: props.onEntityFetchComplete
+        onEntityFetchComplete: onEntityFetchComplete
     })), props.children);
 }
 async function selectEntityAndInsert(editor, sdk, logAction) {
@@ -191,7 +192,7 @@ function createEmbeddedEntityInlinePlugin(sdk) {
         isElement: true,
         isInline: true,
         isVoid: true,
-        component: (0, _linkstracking.withLinkTracking)(EmbeddedEntityInline),
+        component: EmbeddedEntityInline,
         options: {
             hotkey: 'mod+shift+2'
         },

package/dist/cjs/plugins/EmbeddedResourceBlock/LinkedResourceBlock.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "LinkedResourceBlock", {
+    enumerable: true,
+    get: function() {
+        return LinkedResourceBlock;
+    }
+});
+const _react = _interop_require_default(require("react"));
+const _slatereact = require("slate-react");
+const _ContentfulEditorProvider = require("../../ContentfulEditorProvider");
+const _internal = require("../../internal");
+const _SdkProvider = require("../../SdkProvider");
+const _linkstracking = require("../links-tracking");
+const _FetchingWrappedResourceCard = require("../shared/FetchingWrappedResourceCard");
+const _LinkedBlockWrapper = require("../shared/LinkedBlockWrapper");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function LinkedResourceBlock(props) {
+    const { attributes , children , element  } = props;
+    const { onEntityFetchComplete  } = (0, _linkstracking.useLinkTracking)();
+    const isSelected = (0, _slatereact.useSelected)();
+    const editor = (0, _ContentfulEditorProvider.useContentfulEditor)();
+    const sdk = (0, _SdkProvider.useSdkContext)();
+    const isDisabled = (0, _slatereact.useReadOnly)();
+    const link = element.data.target.sys;
+    const handleRemoveClick = _react.default.useCallback(()=>{
+        if (!editor) return;
+        const pathToElement = (0, _internal.findNodePath)(editor, element);
+        (0, _internal.removeNodes)(editor, {
+            at: pathToElement
+        });
+    }, [
+        editor,
+        element
+    ]);
+    return _react.default.createElement(_LinkedBlockWrapper.LinkedBlockWrapper, {
+        attributes: attributes,
+        element: element,
+        card: _react.default.createElement(_FetchingWrappedResourceCard.FetchingWrappedResourceCard, {
+            sdk: sdk,
+            link: link,
+            isDisabled: isDisabled,
+            isSelected: isSelected,
+            onRemove: handleRemoveClick,
+            onEntityFetchComplete: onEntityFetchComplete
+        })
+    }, children);
+}

package/dist/cjs/plugins/EmbeddedResourceBlock/index.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createEmbeddedResourceBlockPlugin", {
+    enumerable: true,
+    get: function() {
+        return createEmbeddedResourceBlockPlugin;
+    }
+});
+const _richtexttypes = require("@contentful/rich-text-types");
+const _EmbeddedBlockUtil = require("../shared/EmbeddedBlockUtil");
+const _LinkedResourceBlock = require("./LinkedResourceBlock");
+const createEmbeddedResourcePlugin = (nodeType, hotkey)=>(sdk)=>({
+            key: nodeType,
+            type: nodeType,
+            isElement: true,
+            isVoid: true,
+            component: _LinkedResourceBlock.LinkedResourceBlock,
+            options: {
+                hotkey
+            },
+            handlers: {
+                onKeyDown: (0, _EmbeddedBlockUtil.getWithEmbeddedBlockEvents)(nodeType, sdk)
+            },
+            deserializeHtml: {
+                rules: [
+                    {
+                        validAttribute: {
+                            'data-entity-type': 'Contentful:Entry'
+                        }
+                    }
+                ],
+                withoutChildren: true,
+                getNode: (el)=>({
+                        type: nodeType,
+                        children: [
+                            {
+                                text: ''
+                            }
+                        ],
+                        isVoid: true,
+                        data: {
+                            target: {
+                                sys: {
+                                    urn: el.getAttribute('data-entity-id'),
+                                    linkType: el.getAttribute('data-entity-type'),
+                                    type: 'ResourceLink'
+                                }
+                            }
+                        }
+                    })
+            }
+        });
+const createEmbeddedResourceBlockPlugin = createEmbeddedResourcePlugin(_richtexttypes.BLOCKS.EMBEDDED_RESOURCE, 'mod+shift+s');

package/dist/cjs/plugins/Hyperlink/components/EntityHyperlink.js

@@ -13,6 +13,7 @@ const _f36components = require("@contentful/f36-components");
 const _ContentfulEditorProvider = require("../../../ContentfulEditorProvider");
 const _internal = require("../../../internal");
 const _SdkProvider = require("../../../SdkProvider");
+const _linkstracking = require("../../links-tracking");
 const _HyperlinkModal = require("../HyperlinkModal");
 const _useEntityInfo = require("../useEntityInfo");
 const _styles = require("./styles");
@@ -59,7 +60,7 @@ function EntityHyperlink(props) {
     const editor = (0, _ContentfulEditorProvider.useContentfulEditor)();
     const sdk = (0, _SdkProvider.useSdkContext)();
     const { target  } = props.element.data;
-    const { onEntityFetchComplete  } = props;
+    const { onEntityFetchComplete  } = (0, _linkstracking.useLinkTracking)();
     const tooltipContent = (0, _useEntityInfo.useEntityInfo)({
         target,
         sdk,

package/dist/cjs/plugins/Hyperlink/createHyperlinkPlugin.js

@@ -13,7 +13,6 @@ const _richtexttypes = require("@contentful/rich-text-types");
 const _ishotkey = _interop_require_default(require("is-hotkey"));
 const _editor = require("../../helpers/editor");
 const _transformers = require("../../helpers/transformers");
-const _linkstracking = require("../links-tracking");
 const _EntityHyperlink = require("./components/EntityHyperlink");
 const _UrlHyperlink = require("./components/UrlHyperlink");
 const _HyperlinkModal = require("./HyperlinkModal");
@@ -131,7 +130,7 @@ const createHyperlinkPlugin = (sdk)=>{
                 ...common,
                 key: _richtexttypes.INLINES.ENTRY_HYPERLINK,
                 type: _richtexttypes.INLINES.ENTRY_HYPERLINK,
-                component: (0, _linkstracking.withLinkTracking)(_EntityHyperlink.EntityHyperlink),
+                component: _EntityHyperlink.EntityHyperlink,
                 deserializeHtml: {
                     rules: [
                         {
@@ -148,7 +147,7 @@ const createHyperlinkPlugin = (sdk)=>{
                 ...common,
                 key: _richtexttypes.INLINES.ASSET_HYPERLINK,
                 type: _richtexttypes.INLINES.ASSET_HYPERLINK,
-                component: (0, _linkstracking.withLinkTracking)(_EntityHyperlink.EntityHyperlink),
+                component: _EntityHyperlink.EntityHyperlink,
                 deserializeHtml: {
                     rules: [
                         {

package/dist/cjs/plugins/Text/createTextPlugin.js

@@ -95,6 +95,7 @@ function deleteEmptyParagraph(unit, editor, deleteFunction) {
                             allow: [
                                 _richtexttypes.BLOCKS.EMBEDDED_ASSET,
                                 _richtexttypes.BLOCKS.EMBEDDED_ENTRY,
+                                _richtexttypes.BLOCKS.EMBEDDED_RESOURCE,
                                 _richtexttypes.BLOCKS.HR
                             ]
                         }),

package/dist/cjs/plugins/index.js

@@ -24,6 +24,7 @@ const _useCommands = require("./CommandPalette/useCommands");
 const _DragAndDrop = require("./DragAndDrop");
 const _EmbeddedEntityBlock = require("./EmbeddedEntityBlock");
 const _EmbeddedEntityInline = require("./EmbeddedEntityInline");
+const _EmbeddedResourceBlock = require("./EmbeddedResourceBlock");
 const _Heading = require("./Heading");
 const _Hr = require("./Hr");
 const _Hyperlink = require("./Hyperlink");
@@ -56,6 +57,7 @@ const getPlugins = (sdk, onAction, restrictedMarks)=>[
         (0, _Table.createTablePlugin)(),
         (0, _EmbeddedEntityBlock.createEmbeddedEntryBlockPlugin)(sdk),
         (0, _EmbeddedEntityBlock.createEmbeddedAssetBlockPlugin)(sdk),
+        (0, _EmbeddedResourceBlock.createEmbeddedResourceBlockPlugin)(sdk),
         (0, _Hyperlink.createHyperlinkPlugin)(sdk),
         (0, _EmbeddedEntityInline.createEmbeddedEntityInlinePlugin)(sdk),
         (0, _Marks.createMarksPlugin)(),

package/dist/cjs/plugins/links-tracking.js

@@ -2,28 +2,19 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "withLinkTracking", {
+Object.defineProperty(exports, "useLinkTracking", {
     enumerable: true,
     get: function() {
-        return withLinkTracking;
+        return useLinkTracking;
     }
 });
-const _react = _interop_require_default(require("react"));
+const _react = require("react");
 const _ContentfulEditorProvider = require("../ContentfulEditorProvider");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function withLinkTracking(Component) {
-    return function ComponentWithTracking(props) {
-        const editor = (0, _ContentfulEditorProvider.useContentfulEditorRef)();
-        const onEntityFetchComplete = _react.default.useCallback(()=>editor?.tracking.onViewportAction('linkRendered'), [
+function useLinkTracking() {
+    const editor = (0, _ContentfulEditorProvider.useContentfulEditorRef)();
+    return {
+        onEntityFetchComplete: (0, _react.useCallback)(()=>editor?.tracking.onViewportAction('linkRendered'), [
             editor
-        ]);
-        return _react.default.createElement(Component, {
-            ...props,
-            onEntityFetchComplete: onEntityFetchComplete
-        });
+        ])
     };
 }

package/dist/cjs/plugins/{EmbeddedEntityBlock/ToolbarIcon.js → shared/EmbeddedBlockToolbarIcon.js}

@@ -12,17 +12,18 @@ _export(exports, {
     styles: function() {
         return styles;
     },
-    EmbeddedEntityBlockToolbarIcon: function() {
-        return EmbeddedEntityBlockToolbarIcon;
+    EmbeddedBlockToolbarIcon: function() {
+        return EmbeddedBlockToolbarIcon;
     }
 });
 const _react = _interop_require_wildcard(require("react"));
 const _f36components = require("@contentful/f36-components");
 const _f36icons = require("@contentful/f36-icons");
+const _richtexttypes = require("@contentful/rich-text-types");
 const _emotion = require("emotion");
 const _ContentfulEditorProvider = require("../../ContentfulEditorProvider");
 const _SdkProvider = require("../../SdkProvider");
-const _Util = require("./Util");
+const _EmbeddedBlockUtil = require("../shared/EmbeddedBlockUtil");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -67,7 +68,7 @@ const styles = {
         marginRight: '10px'
     })
 };
-function EmbeddedEntityBlockToolbarIcon({ isDisabled , nodeType , onClose  }) {
+function EmbeddedBlockToolbarIcon({ isDisabled , nodeType , onClose  }) {
     const editor = (0, _ContentfulEditorProvider.useContentfulEditor)();
     const sdk = (0, _SdkProvider.useSdkContext)();
     const handleClick = async (event)=>{
@@ -76,7 +77,11 @@ function EmbeddedEntityBlockToolbarIcon({ isDisabled , nodeType , onClose  }) {
             return;
         }
         onClose();
-        await (0, _Util.selectEntityAndInsert)(nodeType, sdk, editor, editor.tracking.onToolbarAction);
+        if (nodeType == _richtexttypes.BLOCKS.EMBEDDED_RESOURCE) {
+            await (0, _EmbeddedBlockUtil.selectResourceEntityAndInsert)(sdk, editor, editor.tracking.onToolbarAction);
+        } else {
+            await (0, _EmbeddedBlockUtil.selectEntityAndInsert)(nodeType, sdk, editor, editor.tracking.onToolbarAction);
+        }
     };
     const type = getEntityTypeFromNodeType(nodeType);
     const baseClass = `rich-text__${nodeType}`;
@@ -92,11 +97,14 @@ function EmbeddedEntityBlockToolbarIcon({ isDisabled , nodeType , onClose  }) {
         as: type === 'Asset' ? _f36icons.AssetIcon : _f36icons.EmbeddedEntryBlockIcon,
         className: `rich-text__embedded-entry-list-icon ${styles.icon}`,
         variant: "secondary"
-    }), _react.createElement("span", null, type)));
+    }), _react.createElement("span", null, type, nodeType == _richtexttypes.BLOCKS.EMBEDDED_RESOURCE && _react.createElement(_react.Fragment, null, ' ', "(different space)", ' ', _react.createElement(_f36components.Badge, {
+        variant: "primary-filled",
+        size: "small"
+    }, "new")))));
 }
 function getEntityTypeFromNodeType(nodeType) {
     const words = nodeType.toLowerCase().split('-');
-    if (words.includes('entry')) {
+    if (words.includes('entry') || words.includes('resource')) {
         return 'Entry';
     }
     if (words.includes('asset')) {