@contentful/field-editor-rich-text 3.17.2 → 3.17.4

package/dist/cjs/plugins/DeserializeDocx/createDeserializeDocxPlugin.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createDeserializeDocxPlugin", {
+    enumerable: true,
+    get: function() {
+        return createDeserializeDocxPlugin;
+    }
+});
+const _platecommon = require("@udecode/plate-common");
+const _plateserializerdocx = require("@udecode/plate-serializer-docx");
+const createDeserializeDocxPlugin = ()=>(0, _plateserializerdocx.createDeserializeDocxPlugin)({
+        inject: {
+            pluginsByKey: {
+                [_platecommon.KEY_DESERIALIZE_HTML]: {
+                    editor: {
+                        insertData: {
+                            transformData: (data, { dataTransfer })=>{
+                                const rtf = dataTransfer.getData('text/rtf');
+                                const document = new DOMParser().parseFromString((0, _platecommon.preCleanHtml)(data), 'text/html');
+                                const { body } = document;
+                                if (!rtf && !(0, _plateserializerdocx.isDocxContent)(body)) {
+                                    return data;
+                                }
+                                (0, _plateserializerdocx.cleanDocxFootnotes)(body);
+                                (0, _plateserializerdocx.cleanDocxImageElements)(document, rtf, body);
+                                (0, _platecommon.cleanHtmlEmptyElements)(body);
+                                (0, _plateserializerdocx.cleanDocxEmptyParagraphs)(body);
+                                (0, _plateserializerdocx.cleanDocxQuotes)(body);
+                                (0, _plateserializerdocx.cleanDocxSpans)(body);
+                                (0, _platecommon.cleanHtmlTextNodes)(body);
+                                (0, _plateserializerdocx.cleanDocxBrComments)(body);
+                                (0, _platecommon.cleanHtmlBrElements)(body);
+                                (0, _platecommon.cleanHtmlLinkElements)(body);
+                                (0, _platecommon.cleanHtmlFontElements)(body);
+                                (0, _plateserializerdocx.cleanDocxListElements)(body);
+                                (0, _platecommon.copyBlockMarksToSpanChild)(body);
+                                return (0, _platecommon.postCleanHtml)(body.innerHTML);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    });

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createDeserializeDocxPlugin", {
+    enumerable: true,
+    get: function() {
+        return _createDeserializeDocxPlugin.createDeserializeDocxPlugin;
+    }
+});
+const _createDeserializeDocxPlugin = require("./createDeserializeDocxPlugin");

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

@@ -151,16 +151,6 @@ function HyperlinkModal(props) {
             }
         };
     }
-    function entityToResourceLink(entity) {
-        const { urn } = entity.sys;
-        return {
-            sys: {
-                urn,
-                type: 'ResourceLink',
-                linkType: 'Contentful:Entry'
-            }
-        };
-    }
     function isResourceLink(link) {
         return !!link && !!link.sys.urn;
     }
@@ -185,10 +175,10 @@ function HyperlinkModal(props) {
         const options = {
             allowedResources: (0, _getAllowedResourcesForNodeType.default)(props.sdk.field, _richtexttypes.INLINES.RESOURCE_HYPERLINK)
         };
-        const entry = await props.sdk.dialogs.selectSingleResourceEntry(options);
-        if (entry) {
+        const entityLink = await props.sdk.dialogs.selectSingleResourceEntity(options);
+        if (entityLink) {
             setLinkTarget('');
-            setLinkEntity(entityToResourceLink(entry));
+            setLinkEntity(entityLink);
         }
     }
     async function selectAsset() {

package/dist/cjs/plugins/index.js

@@ -16,10 +16,10 @@ _export(exports, {
         return getPlugins;
     }
 });
-const _plateserializerdocx = require("@udecode/plate-serializer-docx");
 const _Break = require("./Break");
 const _CommandPalette = require("./CommandPalette");
 const _useCommands = require("./CommandPalette/useCommands");
+const _DeserializeDocx = require("./DeserializeDocx");
 const _DragAndDrop = require("./DragAndDrop");
 const _EmbeddedEntityBlock = require("./EmbeddedEntityBlock");
 const _EmbeddedEntityInline = require("./EmbeddedEntityInline");
@@ -41,7 +41,7 @@ const _Tracking = require("./Tracking");
 const _TrailingParagraph = require("./TrailingParagraph");
 const _Voids = require("./Voids");
 const getPlugins = (sdk, onAction, restrictedMarks)=>[
-        (0, _plateserializerdocx.createDeserializeDocxPlugin)(),
+        (0, _DeserializeDocx.createDeserializeDocxPlugin)(),
         (0, _Tracking.createTrackingPlugin)(onAction),
         (0, _DragAndDrop.createDragAndDropPlugin)(),
         ...Object.values((0, _useCommands.isCommandPromptPluginEnabled)(sdk)).some(Boolean) ? [

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

@@ -94,14 +94,14 @@ async function selectResourceEntityAndInsert(sdk, editor, logAction) {
     const { field, dialogs } = sdk;
     const config = (0, _config.newResourceEntitySelectorConfigFromRichTextField)(field, _richtexttypes.BLOCKS.EMBEDDED_RESOURCE);
     const { selection } = editor;
-    const entity = await dialogs.selectSingleResourceEntry(config);
-    if (!entity) {
+    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, entity);
+        insertBlock(editor, _richtexttypes.BLOCKS.EMBEDDED_RESOURCE, entityLink);
         ensureFollowingParagraph(editor, [
             _richtexttypes.BLOCKS.EMBEDDED_RESOURCE
         ]);
@@ -127,27 +127,20 @@ function ensureFollowingParagraph(editor, nodeTypes) {
     }
     (0, _editor.moveToTheNextChar)(editor);
 }
-const getLink = (nodeType, entity)=>{
-    if (nodeType === _richtexttypes.BLOCKS.EMBEDDED_RESOURCE) {
-        return {
-            urn: entity.sys.urn,
-            type: 'ResourceLink',
-            linkType: 'Contentful:Entry'
-        };
-    }
+const getLink = (entity)=>{
     return {
-        id: entity.sys.id,
-        type: 'Link',
-        linkType: entity.sys.type
+        sys: {
+            id: entity.sys.id,
+            type: 'Link',
+            linkType: entity.sys.type
+        }
     };
 };
 const createNode = (nodeType, entity)=>{
     return {
         type: nodeType,
         data: {
-            target: {
-                sys: getLink(nodeType, entity)
-            }
+            target: nodeType === _richtexttypes.BLOCKS.EMBEDDED_RESOURCE ? entity : getLink(entity)
         },
         children: [
             {

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

@@ -44,18 +44,13 @@ function getWithEmbeddedEntryInlineEvents(nodeType, sdk) {
         };
     };
 }
-const getLink = (nodeType, entity)=>{
-    if (nodeType === _richtexttypes.INLINES.EMBEDDED_RESOURCE) {
-        return {
-            urn: entity.sys.urn,
-            type: 'ResourceLink',
-            linkType: 'Contentful:Entry'
-        };
-    }
+const getLink = (entity)=>{
     return {
-        id: entity.sys.id,
-        type: 'Link',
-        linkType: entity.sys.type
+        sys: {
+            id: entity.sys.id,
+            type: 'Link',
+            linkType: entity.sys.type
+        }
     };
 };
 const createInlineEntryNode = (nodeType, entity)=>{
@@ -67,9 +62,7 @@ const createInlineEntryNode = (nodeType, entity)=>{
             }
         ],
         data: {
-            target: {
-                sys: getLink(nodeType, entity)
-            }
+            target: nodeType === _richtexttypes.INLINES.EMBEDDED_RESOURCE ? entity : getLink(entity)
         }
     };
 };
@@ -112,14 +105,14 @@ async function selectResourceEntityAndInsert(editor, sdk, logAction) {
         withCreate: true
     };
     const { selection } = editor;
-    const entry = await dialogs.selectSingleResourceEntry(config);
-    if (!entry) {
+    const entryLink = await dialogs.selectSingleResourceEntity(config);
+    if (!entryLink) {
         logAction('cancelCreateEmbedDialog', {
             nodeType
         });
     } else {
         (0, _transforms.select)(editor, selection);
-        (0, _transforms.insertNodes)(editor, createInlineEntryNode(nodeType, entry));
+        (0, _transforms.insertNodes)(editor, createInlineEntryNode(nodeType, entryLink));
         logAction('insert', {
             nodeType
         });

package/dist/esm/plugins/DeserializeDocx/createDeserializeDocxPlugin.js

@@ -0,0 +1,36 @@
+import { KEY_DESERIALIZE_HTML, cleanHtmlBrElements, cleanHtmlEmptyElements, cleanHtmlFontElements, cleanHtmlLinkElements, cleanHtmlTextNodes, copyBlockMarksToSpanChild, postCleanHtml, preCleanHtml } from '@udecode/plate-common';
+import { cleanDocxBrComments, cleanDocxEmptyParagraphs, cleanDocxFootnotes, cleanDocxImageElements, cleanDocxListElements, cleanDocxQuotes, cleanDocxSpans, createDeserializeDocxPlugin as originalCreateDeserializeDocxPlugin, isDocxContent } from '@udecode/plate-serializer-docx';
+export const createDeserializeDocxPlugin = ()=>originalCreateDeserializeDocxPlugin({
+        inject: {
+            pluginsByKey: {
+                [KEY_DESERIALIZE_HTML]: {
+                    editor: {
+                        insertData: {
+                            transformData: (data, { dataTransfer })=>{
+                                const rtf = dataTransfer.getData('text/rtf');
+                                const document = new DOMParser().parseFromString(preCleanHtml(data), 'text/html');
+                                const { body } = document;
+                                if (!rtf && !isDocxContent(body)) {
+                                    return data;
+                                }
+                                cleanDocxFootnotes(body);
+                                cleanDocxImageElements(document, rtf, body);
+                                cleanHtmlEmptyElements(body);
+                                cleanDocxEmptyParagraphs(body);
+                                cleanDocxQuotes(body);
+                                cleanDocxSpans(body);
+                                cleanHtmlTextNodes(body);
+                                cleanDocxBrComments(body);
+                                cleanHtmlBrElements(body);
+                                cleanHtmlLinkElements(body);
+                                cleanHtmlFontElements(body);
+                                cleanDocxListElements(body);
+                                copyBlockMarksToSpanChild(body);
+                                return postCleanHtml(body.innerHTML);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    });

package/dist/esm/plugins/DeserializeDocx/index.js

@@ -0,0 +1 @@
+export { createDeserializeDocxPlugin } from './createDeserializeDocxPlugin';

package/dist/esm/plugins/Hyperlink/HyperlinkModal.js

@@ -87,16 +87,6 @@ export function HyperlinkModal(props) {
             }
         };
     }
-    function entityToResourceLink(entity) {
-        const { urn } = entity.sys;
-        return {
-            sys: {
-                urn,
-                type: 'ResourceLink',
-                linkType: 'Contentful:Entry'
-            }
-        };
-    }
     function isResourceLink(link) {
         return !!link && !!link.sys.urn;
     }
@@ -121,10 +111,10 @@ export function HyperlinkModal(props) {
         const options = {
             allowedResources: getAllowedResourcesForNodeType(props.sdk.field, INLINES.RESOURCE_HYPERLINK)
         };
-        const entry = await props.sdk.dialogs.selectSingleResourceEntry(options);
-        if (entry) {
+        const entityLink = await props.sdk.dialogs.selectSingleResourceEntity(options);
+        if (entityLink) {
             setLinkTarget('');
-            setLinkEntity(entityToResourceLink(entry));
+            setLinkEntity(entityLink);
         }
     }
     async function selectAsset() {

package/dist/esm/plugins/index.js

@@ -1,7 +1,7 @@
-import { createDeserializeDocxPlugin } from '@udecode/plate-serializer-docx';
 import { createSoftBreakPlugin, createExitBreakPlugin, createResetNodePlugin } from './Break';
 import { createCommandPalettePlugin } from './CommandPalette';
 import { isCommandPromptPluginEnabled } from './CommandPalette/useCommands';
+import { createDeserializeDocxPlugin } from './DeserializeDocx';
 import { createDragAndDropPlugin } from './DragAndDrop';
 import { createEmbeddedAssetBlockPlugin, createEmbeddedEntryBlockPlugin } from './EmbeddedEntityBlock';
 import { createEmbeddedEntityInlinePlugin } from './EmbeddedEntityInline';

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

@@ -68,14 +68,14 @@ export async function selectResourceEntityAndInsert(sdk, editor, logAction) {
     const { field, dialogs } = sdk;
     const config = newResourceEntitySelectorConfigFromRichTextField(field, BLOCKS.EMBEDDED_RESOURCE);
     const { selection } = editor;
-    const entity = await dialogs.selectSingleResourceEntry(config);
-    if (!entity) {
+    const entityLink = await dialogs.selectSingleResourceEntity(config);
+    if (!entityLink) {
         logAction('cancelCreateEmbedDialog', {
             nodeType: BLOCKS.EMBEDDED_RESOURCE
         });
     } else {
         select(editor, selection);
-        insertBlock(editor, BLOCKS.EMBEDDED_RESOURCE, entity);
+        insertBlock(editor, BLOCKS.EMBEDDED_RESOURCE, entityLink);
         ensureFollowingParagraph(editor, [
             BLOCKS.EMBEDDED_RESOURCE
         ]);
@@ -101,27 +101,20 @@ function ensureFollowingParagraph(editor, nodeTypes) {
     }
     moveToTheNextChar(editor);
 }
-const getLink = (nodeType, entity)=>{
-    if (nodeType === BLOCKS.EMBEDDED_RESOURCE) {
-        return {
-            urn: entity.sys.urn,
-            type: 'ResourceLink',
-            linkType: 'Contentful:Entry'
-        };
-    }
+const getLink = (entity)=>{
     return {
-        id: entity.sys.id,
-        type: 'Link',
-        linkType: entity.sys.type
+        sys: {
+            id: entity.sys.id,
+            type: 'Link',
+            linkType: entity.sys.type
+        }
     };
 };
 const createNode = (nodeType, entity)=>{
     return {
         type: nodeType,
         data: {
-            target: {
-                sys: getLink(nodeType, entity)
-            }
+            target: nodeType === BLOCKS.EMBEDDED_RESOURCE ? entity : getLink(entity)
         },
         children: [
             {

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

@@ -18,18 +18,13 @@ export function getWithEmbeddedEntryInlineEvents(nodeType, sdk) {
         };
     };
 }
-const getLink = (nodeType, entity)=>{
-    if (nodeType === INLINES.EMBEDDED_RESOURCE) {
-        return {
-            urn: entity.sys.urn,
-            type: 'ResourceLink',
-            linkType: 'Contentful:Entry'
-        };
-    }
+const getLink = (entity)=>{
     return {
-        id: entity.sys.id,
-        type: 'Link',
-        linkType: entity.sys.type
+        sys: {
+            id: entity.sys.id,
+            type: 'Link',
+            linkType: entity.sys.type
+        }
     };
 };
 const createInlineEntryNode = (nodeType, entity)=>{
@@ -41,9 +36,7 @@ const createInlineEntryNode = (nodeType, entity)=>{
             }
         ],
         data: {
-            target: {
-                sys: getLink(nodeType, entity)
-            }
+            target: nodeType === INLINES.EMBEDDED_RESOURCE ? entity : getLink(entity)
         }
     };
 };
@@ -86,14 +79,14 @@ export async function selectResourceEntityAndInsert(editor, sdk, logAction) {
         withCreate: true
     };
     const { selection } = editor;
-    const entry = await dialogs.selectSingleResourceEntry(config);
-    if (!entry) {
+    const entryLink = await dialogs.selectSingleResourceEntity(config);
+    if (!entryLink) {
         logAction('cancelCreateEmbedDialog', {
             nodeType
         });
     } else {
         select(editor, selection);
-        insertNodes(editor, createInlineEntryNode(nodeType, entry));
+        insertNodes(editor, createInlineEntryNode(nodeType, entryLink));
         logAction('insert', {
             nodeType
         });

package/dist/types/plugins/DeserializeDocx/createDeserializeDocxPlugin.d.ts

@@ -0,0 +1,2 @@
+import { PlatePlugin } from '../../internal';
+export declare const createDeserializeDocxPlugin: () => PlatePlugin;

package/dist/types/plugins/DeserializeDocx/index.d.ts

@@ -0,0 +1 @@
+export { createDeserializeDocxPlugin } from './createDeserializeDocxPlugin';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-rich-text",
-  "version": "3.17.2",
+  "version": "3.17.4",
   "source": "./src/index.tsx",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -44,7 +44,7 @@
     "@contentful/f36-icons": "^4.1.1",
     "@contentful/f36-tokens": "^4.0.0",
     "@contentful/f36-utils": "^4.19.0",
-    "@contentful/field-editor-reference": "^5.22.2",
+    "@contentful/field-editor-reference": "^5.22.3",
     "@contentful/field-editor-shared": "^1.4.5",
     "@contentful/rich-text-plain-text-renderer": "^16.0.4",
     "@contentful/rich-text-types": "16.3.0",
@@ -57,7 +57,7 @@
     "@udecode/plate-paragraph": "30.1.2",
     "@udecode/plate-reset-node": "30.1.2",
     "@udecode/plate-select": "30.1.2",
-    "@udecode/plate-serializer-docx": "23.7.0",
+    "@udecode/plate-serializer-docx": "30.1.2",
     "@udecode/plate-serializer-html": "30.1.2",
     "@udecode/plate-table": "30.1.2",
     "@udecode/plate-trailing-block": "30.1.2",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "e9e822565077a5de09c4daa930c5d8aef50910af"
+  "gitHead": "87df8d557b8011b5bd1fcf1560762469683fa32e"
 }