@contentful/field-editor-rich-text 2.0.0-next.2 → 2.0.0-next.3

package/dist/field-editor-rich-text.cjs.development.js

@@ -17,14 +17,22 @@ var f36Components = require('@contentful/f36-components');
 var Slate = require('slate-react');
 var f36Icons = require('@contentful/f36-icons');
 var slate = require('slate');
-var plate = require('@udecode/plate');
+var plateCore = require('@udecode/plate-core');
+var plateCommon = require('@udecode/plate-common');
 var constate = _interopDefault(require('constate'));
 var find = _interopDefault(require('lodash/find'));
 var flow = _interopDefault(require('lodash/flow'));
 var get = _interopDefault(require('lodash/get'));
+var plateList = require('@udecode/plate-list');
 var fieldEditorShared = require('@contentful/field-editor-shared');
 var mimetype = _interopDefault(require('@contentful/mimetype'));
+var plateTable = require('@udecode/plate-table');
 var values = _interopDefault(require('lodash/values'));
+var plateHtmlSerializer = require('@udecode/plate-html-serializer');
+var plateAstSerializer = require('@udecode/plate-ast-serializer');
+var plateParagraph = require('@udecode/plate-paragraph');
+var plateBreak = require('@udecode/plate-break');
+var plateTrailingBlock = require('@udecode/plate-trailing-block');
 var PropTypes = _interopDefault(require('prop-types'));
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -560,7 +568,7 @@ function unwrapFromRoot(editor) {
 var isAtEndOfTextSelection = function isAtEndOfTextSelection(editor) {
   var _editor$selection, _editor$selection2;
 
-  return ((_editor$selection = editor.selection) == null ? void 0 : _editor$selection.focus.offset) === plate.getText(editor, (_editor$selection2 = editor.selection) == null ? void 0 : _editor$selection2.focus.path).length;
+  return ((_editor$selection = editor.selection) == null ? void 0 : _editor$selection.focus.offset) === plateCommon.getText(editor, (_editor$selection2 = editor.selection) == null ? void 0 : _editor$selection2.focus.path).length;
 };
 function currentSelectionStartsTableCell(editor) {
   var _editor$selection3;
@@ -569,7 +577,7 @@ function currentSelectionStartsTableCell(editor) {
       tableCellNode = _getNodeEntryFromSele2[0],
       path = _getNodeEntryFromSele2[1];
 
-  return !!tableCellNode && (!plate.getText(editor, path) || ((_editor$selection3 = editor.selection) == null ? void 0 : _editor$selection3.focus.offset) === 0);
+  return !!tableCellNode && (!plateCommon.getText(editor, path) || ((_editor$selection3 = editor.selection) == null ? void 0 : _editor$selection3.focus.offset) === 0);
 }
 /**
  * This traversal strategy is unfortunately necessary because Slate doesn't
@@ -638,9 +646,9 @@ function extractParagraphsAt(editor, path) {
 
 function deserializeLeaf(type, rules) {
   return function (editor) {
-    var pluginOptions = plate.getPlatePluginOptions(editor, type);
+    var pluginOptions = plateCore.getPlatePluginOptions(editor, type);
     return {
-      leaf: plate.getLeafDeserializer(_extends({
+      leaf: plateCommon.getLeafDeserializer(_extends({
         type: type,
         rules: rules
       }, pluginOptions.deserialize))
@@ -649,9 +657,9 @@ function deserializeLeaf(type, rules) {
 }
 function deserializeElement(type, rules) {
   return function (editor) {
-    var pluginOptions = plate.getPlatePluginOptions(editor, type);
+    var pluginOptions = plateCore.getPlatePluginOptions(editor, type);
     return {
-      element: plate.getElementDeserializer(_extends({
+      element: plateCommon.getElementDeserializer(_extends({
         type: type,
         rules: rules
       }, pluginOptions.deserialize))
@@ -669,7 +677,7 @@ function getContentfulEditorId(sdk) {
 function useContentfulEditorHook(_ref) {
   var sdk = _ref.sdk;
   var editorId = getContentfulEditorId(sdk);
-  var editor = plate.usePlateEditorRef(editorId);
+  var editor = plateCore.usePlateEditorRef(editorId);
   return editor;
 }
 
@@ -726,8 +734,8 @@ function ToolbarHrButton(props) {
       }],
       isVoid: true
     };
-    var hasText = !!plate.getText(editor, editor.selection.focus.path);
-    hasText ? slate.Transforms.insertNodes(editor, hr) : plate.setNodes(editor, hr); // Move focus to the next paragraph (added by TrailingParagraph plugin)
+    var hasText = !!plateCommon.getText(editor, editor.selection.focus.path);
+    hasText ? slate.Transforms.insertNodes(editor, hr) : plateCommon.setNodes(editor, hr); // Move focus to the next paragraph (added by TrailingParagraph plugin)
 
     moveToTheNextLine(editor);
     Slate.ReactEditor.focus(editor);
@@ -755,10 +763,10 @@ function Hr(props) {
 }
 function createHrPlugin() {
   return {
-    renderElement: plate.getRenderElement(Contentful.BLOCKS.HR),
+    renderElement: plateCore.getRenderElement(Contentful.BLOCKS.HR),
     pluginKeys: Contentful.BLOCKS.HR,
     onKeyDown: withHrEvents,
-    voidTypes: plate.getPlatePluginTypes(Contentful.BLOCKS.HR),
+    voidTypes: plateCore.getPlatePluginTypes(Contentful.BLOCKS.HR),
     deserialize: deserializeElement(Contentful.BLOCKS.HR, [{
       nodeNames: ['HR']
     }])
@@ -860,19 +868,19 @@ function withHeadingEvents(editor) {
         var cursorIsAtTheEnd = currentTextLength === currentOffset;
 
         if (cursorIsAtTheBeginning) {
-          plate.insertNodes(editor, paragraph, {
+          plateCommon.insertNodes(editor, paragraph, {
             at: editor.selection
           });
         } else if (cursorIsAtTheEnd) {
-          plate.insertNodes(editor, paragraph);
+          plateCommon.insertNodes(editor, paragraph);
         } else {
           // Otherwise the cursor is in the middle
           slate.Transforms.splitNodes(editor);
-          plate.setNodes(editor, paragraph);
+          plateCommon.setNodes(editor, paragraph);
         }
       } else {
-        plate.setNodes(editor, paragraph);
-        plate.insertNodes(editor, heading);
+        plateCommon.setNodes(editor, paragraph);
+        plateCommon.insertNodes(editor, heading);
       }
     } // Toggle heading blocks when pressing cmd/ctrl+alt+1|2|3|4|5|6
 
@@ -896,7 +904,7 @@ function withHeadingEvents(editor) {
         unwrapFromRoot(editor);
       }
 
-      plate.toggleNodeType(editor, {
+      plateCommon.toggleNodeType(editor, {
         activeType: headingKey,
         inactiveType: Contentful.BLOCKS.PARAGRAPH
       });
@@ -947,7 +955,7 @@ function ToolbarHeadingButton(props) {
         unwrapFromRoot(editor);
       }
 
-      plate.toggleNodeType(editor, {
+      plateCommon.toggleNodeType(editor, {
         activeType: type,
         inactiveType: type
       }); // TODO: Figure out why focus only works with timeout here.
@@ -1002,13 +1010,13 @@ var H6 = /*#__PURE__*/createHeading('h6', Contentful.BLOCKS.HEADING_6);
 function createHeadingPlugin() {
   var headings = [Contentful.BLOCKS.HEADING_1, Contentful.BLOCKS.HEADING_2, Contentful.BLOCKS.HEADING_3, Contentful.BLOCKS.HEADING_4, Contentful.BLOCKS.HEADING_5, Contentful.BLOCKS.HEADING_6];
   return {
-    renderElement: plate.getRenderElement(headings),
+    renderElement: plateCore.getRenderElement(headings),
     pluginKeys: headings,
     onKeyDown: withHeadingEvents,
     deserialize: function deserialize(editor) {
       return {
         element: headings.map(function (headingType, index) {
-          var options = plate.getPlatePluginOptions(editor, headingType);
+          var options = plateCore.getPlatePluginOptions(editor, headingType);
           return _extends({
             type: headingType,
             deserialize: function deserialize(element) {
@@ -1150,7 +1158,7 @@ function Quote(props) {
 function createQuotePlugin() {
   return {
     pluginKeys: Contentful.BLOCKS.QUOTE,
-    renderElement: plate.getRenderElement(Contentful.BLOCKS.QUOTE),
+    renderElement: plateCore.getRenderElement(Contentful.BLOCKS.QUOTE),
     onKeyDown: withQuoteEvents,
     deserialize: deserializeElement(Contentful.BLOCKS.QUOTE, [{
       nodeNames: 'BLOCKQUOTE'
@@ -1168,9 +1176,9 @@ var withQuoteOptions = (_withQuoteOptions = {}, _withQuoteOptions[Contentful.BLO
  */
 var getListInsertFragment = function getListInsertFragment(editor) {
   var insertFragment = editor.insertFragment;
-  var li = plate.getPlatePluginOptions(editor, plate.ELEMENT_LI);
-  var ul = plate.getPlatePluginOptions(editor, plate.ELEMENT_UL);
-  var ol = plate.getPlatePluginOptions(editor, plate.ELEMENT_OL);
+  var li = plateCore.getPlatePluginOptions(editor, plateList.ELEMENT_LI);
+  var ul = plateCore.getPlatePluginOptions(editor, plateList.ELEMENT_UL);
+  var ol = plateCore.getPlatePluginOptions(editor, plateList.ELEMENT_OL);
 
   var isListRoot = function isListRoot(node) {
     return [ul.type, ol.type].includes(node.type);
@@ -1207,7 +1215,7 @@ var getListInsertFragment = function getListInsertFragment(editor) {
   };
 
   return function (fragment) {
-    var liEntry = plate.findNode(editor, {
+    var liEntry = plateCommon.findNode(editor, {
       match: {
         type: li.type
       },
@@ -1247,7 +1255,7 @@ function ToolbarListButton(props) {
         unwrapFromRoot(editor);
       }
 
-      plate.toggleList(editor, {
+      plateList.toggleList(editor, {
         type: type
       });
       Slate.ReactEditor.focus(editor);
@@ -1281,15 +1289,15 @@ function createList(Tag, block) {
 var UL = /*#__PURE__*/createList('ul', Contentful.BLOCKS.UL_LIST);
 var OL = /*#__PURE__*/createList('ol', Contentful.BLOCKS.OL_LIST);
 var LI = /*#__PURE__*/createList('li', Contentful.BLOCKS.LIST_ITEM);
-var withListOptions = (_withListOptions = {}, _withListOptions[plate.ELEMENT_LIC] = {
+var withListOptions = (_withListOptions = {}, _withListOptions[plateList.ELEMENT_LIC] = {
   type: Contentful.BLOCKS.PARAGRAPH
-}, _withListOptions[plate.ELEMENT_LI] = {
+}, _withListOptions[plateList.ELEMENT_LI] = {
   type: Contentful.BLOCKS.LIST_ITEM,
   component: LI
-}, _withListOptions[plate.ELEMENT_UL] = {
+}, _withListOptions[plateList.ELEMENT_UL] = {
   type: Contentful.BLOCKS.UL_LIST,
   component: UL
-}, _withListOptions[plate.ELEMENT_OL] = {
+}, _withListOptions[plateList.ELEMENT_OL] = {
   type: Contentful.BLOCKS.OL_LIST,
   component: OL
 }, _withListOptions);
@@ -1311,7 +1319,7 @@ var isListItem = function isListItem(node) {
 };
 
 var hasListAsDirectParent = function hasListAsDirectParent(editor, path) {
-  var _ref = plate.getParent(editor, path) || [],
+  var _ref = plateCommon.getParent(editor, path) || [],
       parentNode = _ref[0];
 
   return isList(parentNode);
@@ -1349,7 +1357,7 @@ var normalizeList = function normalizeList(editor, path) {
 };
 
 var getNearestListAncestor = function getNearestListAncestor(editor, path) {
-  return plate.getAbove(editor, {
+  return plateCommon.getAbove(editor, {
     at: path,
     mode: 'lowest',
     match: isList
@@ -1377,7 +1385,7 @@ var normalizeOrphanedListItem = function normalizeOrphanedListItem(editor, path)
 };
 
 var withCustomList = function withCustomList(options) {
-  var withDefaultOverrides = plate.withList(options);
+  var withDefaultOverrides = plateList.withList(options);
   return function (editor) {
     var insertFragment = editor.insertFragment;
     withDefaultOverrides(editor); // Reverts any overrides to insertFragment
@@ -1439,7 +1447,7 @@ var createListPlugin = function createListPlugin() {
   var options = {
     validLiChildrenTypes: Contentful.LIST_ITEM_BLOCKS
   };
-  var plugin = plate.createListPlugin(options);
+  var plugin = plateList.createListPlugin(options);
   plugin.withOverrides = withCustomList(options);
   return plugin;
 };
@@ -1450,7 +1458,7 @@ function ToolbarBoldButton(props) {
 
   function handleClick() {
     if (!(editor != null && editor.selection)) return;
-    plate.toggleMark(editor, Contentful.MARKS.BOLD);
+    plateCommon.toggleMark(editor, Contentful.MARKS.BOLD);
     Slate.ReactEditor.focus(editor);
   }
 
@@ -1459,7 +1467,7 @@ function ToolbarBoldButton(props) {
     title: "Bold",
     testId: "bold-toolbar-button",
     onClick: handleClick,
-    isActive: plate.isMarkActive(editor, Contentful.MARKS.BOLD),
+    isActive: plateCommon.isMarkActive(editor, Contentful.MARKS.BOLD),
     isDisabled: props.isDisabled
   }, /*#__PURE__*/React.createElement(f36Icons.FormatBoldIcon, null));
 }
@@ -1476,8 +1484,8 @@ function Bold(props) {
 function createBoldPlugin() {
   return {
     pluginKeys: Contentful.MARKS.BOLD,
-    renderLeaf: plate.getRenderLeaf(Contentful.MARKS.BOLD),
-    onKeyDown: plate.getToggleMarkOnKeyDown(Contentful.MARKS.BOLD),
+    renderLeaf: plateCore.getRenderLeaf(Contentful.MARKS.BOLD),
+    onKeyDown: plateCommon.getToggleMarkOnKeyDown(Contentful.MARKS.BOLD),
     deserialize: function deserialize() {
       return {
         leaf: [{
@@ -1508,7 +1516,7 @@ function ToolbarCodeButton(props) {
 
   function handleClick() {
     if (!(editor != null && editor.selection)) return;
-    plate.toggleMark(editor, Contentful.MARKS.CODE);
+    plateCommon.toggleMark(editor, Contentful.MARKS.CODE);
     Slate.ReactEditor.focus(editor);
   }
 
@@ -1517,7 +1525,7 @@ function ToolbarCodeButton(props) {
     title: "Code",
     testId: "code-toolbar-button",
     onClick: handleClick,
-    isActive: plate.isMarkActive(editor, Contentful.MARKS.CODE),
+    isActive: plateCommon.isMarkActive(editor, Contentful.MARKS.CODE),
     isDisabled: props.isDisabled
   }, /*#__PURE__*/React.createElement(f36Icons.CodeIcon, null));
 }
@@ -1542,8 +1550,8 @@ function createCodePlugin() {
   }];
   return {
     pluginKeys: Contentful.MARKS.CODE,
-    renderLeaf: plate.getRenderLeaf(Contentful.MARKS.CODE),
-    onKeyDown: plate.getToggleMarkOnKeyDown(Contentful.MARKS.CODE),
+    renderLeaf: plateCore.getRenderLeaf(Contentful.MARKS.CODE),
+    onKeyDown: plateCommon.getToggleMarkOnKeyDown(Contentful.MARKS.CODE),
     deserialize: deserializeLeaf(Contentful.MARKS.CODE, deserializeRule)
   };
 }
@@ -1559,7 +1567,7 @@ function ToolbarItalicButton(props) {
 
   function handleClick() {
     if (!(editor != null && editor.selection)) return;
-    plate.toggleMark(editor, Contentful.MARKS.ITALIC);
+    plateCommon.toggleMark(editor, Contentful.MARKS.ITALIC);
     Slate.ReactEditor.focus(editor);
   }
 
@@ -1568,7 +1576,7 @@ function ToolbarItalicButton(props) {
     title: "Italic",
     testId: "italic-toolbar-button",
     onClick: handleClick,
-    isActive: plate.isMarkActive(editor, Contentful.MARKS.ITALIC),
+    isActive: plateCommon.isMarkActive(editor, Contentful.MARKS.ITALIC),
     isDisabled: props.isDisabled
   }, /*#__PURE__*/React.createElement(f36Icons.FormatItalicIcon, null));
 }
@@ -1592,8 +1600,8 @@ function createItalicPlugin() {
   }];
   return {
     pluginKeys: Contentful.MARKS.ITALIC,
-    renderLeaf: plate.getRenderLeaf(Contentful.MARKS.ITALIC),
-    onKeyDown: plate.getToggleMarkOnKeyDown(Contentful.MARKS.ITALIC),
+    renderLeaf: plateCore.getRenderLeaf(Contentful.MARKS.ITALIC),
+    onKeyDown: plateCommon.getToggleMarkOnKeyDown(Contentful.MARKS.ITALIC),
     deserialize: deserializeLeaf(Contentful.MARKS.ITALIC, deserializeRules)
   };
 }
@@ -1609,7 +1617,7 @@ function ToolbarUnderlineButton(props) {
 
   function handleClick() {
     if (!(editor != null && editor.selection)) return;
-    plate.toggleMark(editor, Contentful.MARKS.UNDERLINE);
+    plateCommon.toggleMark(editor, Contentful.MARKS.UNDERLINE);
     Slate.ReactEditor.focus(editor);
   }
 
@@ -1618,7 +1626,7 @@ function ToolbarUnderlineButton(props) {
     title: "Underline",
     testId: "underline-toolbar-button",
     onClick: handleClick,
-    isActive: plate.isMarkActive(editor, Contentful.MARKS.UNDERLINE),
+    isActive: plateCommon.isMarkActive(editor, Contentful.MARKS.UNDERLINE),
     isDisabled: props.isDisabled
   }, /*#__PURE__*/React.createElement(f36Icons.FormatUnderlinedIcon, null));
 }
@@ -1635,8 +1643,8 @@ function createUnderlinePlugin() {
   }];
   return {
     pluginKeys: Contentful.MARKS.UNDERLINE,
-    renderLeaf: plate.getRenderLeaf(Contentful.MARKS.UNDERLINE),
-    onKeyDown: plate.getToggleMarkOnKeyDown(Contentful.MARKS.UNDERLINE),
+    renderLeaf: plateCore.getRenderLeaf(Contentful.MARKS.UNDERLINE),
+    onKeyDown: plateCommon.getToggleMarkOnKeyDown(Contentful.MARKS.UNDERLINE),
     deserialize: deserializeLeaf(Contentful.MARKS.UNDERLINE, deserializeRules)
   };
 }
@@ -2568,7 +2576,8 @@ function EntryThumbnail(_ref) {
 function FetchingWrappedEntryCard(props) {
   var _useEntities = fieldEditorReference.useEntities(),
       getOrLoadEntry = _useEntities.getOrLoadEntry,
-      entries = _useEntities.entries;
+      entries = _useEntities.entries,
+      getOrLoadAsset = _useEntities.getOrLoadAsset;
 
   var _React$useState = React.useState(null),
       file = _React$useState[0],
@@ -2592,10 +2601,10 @@ function FetchingWrappedEntryCard(props) {
       contentType: contentType,
       localeCode: props.locale,
       defaultLocaleCode: defaultLocaleCode
-    }, props.sdk.space.getAsset).then(setFile)["catch"](function () {
+    }, getOrLoadAsset).then(setFile)["catch"](function () {
       return setFile(null);
     });
-  }, [entry, contentType, props.locale, defaultLocaleCode, props.sdk, file]);
+  }, [entry, contentType, props.locale, defaultLocaleCode, props.sdk, file, getOrLoadAsset]);
   React.useEffect(function () {
     getOrLoadEntry(props.entryId);
   }, [props.entryId]); // eslint-disable-line
@@ -3230,14 +3239,14 @@ var styles$d = {
 };
 function createHyperlinkPlugin(sdk) {
   return {
-    renderElement: plate.getRenderElement(LINK_TYPES),
+    renderElement: plateCore.getRenderElement(LINK_TYPES),
     pluginKeys: LINK_TYPES,
-    inlineTypes: plate.getPlatePluginTypes(LINK_TYPES),
+    inlineTypes: plateCore.getPlatePluginTypes(LINK_TYPES),
     onKeyDown: buildHyperlinkEventHandler(sdk),
     deserialize: function deserialize(editor) {
-      var hyperlinkOptions = plate.getPlatePluginOptions(editor, Contentful.INLINES.HYPERLINK);
-      var entryHyperlinkOptions = plate.getPlatePluginOptions(editor, Contentful.INLINES.ENTRY_HYPERLINK);
-      var assetHyperlinkOptions = plate.getPlatePluginOptions(editor, Contentful.INLINES.ASSET_HYPERLINK);
+      var hyperlinkOptions = plateCore.getPlatePluginOptions(editor, Contentful.INLINES.HYPERLINK);
+      var entryHyperlinkOptions = plateCore.getPlatePluginOptions(editor, Contentful.INLINES.ENTRY_HYPERLINK);
+      var assetHyperlinkOptions = plateCore.getPlatePluginOptions(editor, Contentful.INLINES.ASSET_HYPERLINK);
 
       var isAnchor = function isAnchor(element) {
         return element.nodeName === 'A' && !!element.getAttribute('href') && element.getAttribute('href') !== '#';
@@ -3523,20 +3532,20 @@ function moveToFirstCellFromSelectedTable(editor) {
 function insertTableAndFocusFirstCell(editor) {
   // FIXME: a table should only be allowed at root level. Currently this
   // code adds it at any level
-  plate.insertTable(editor, {
+  plateTable.insertTable(editor, {
     header: true
   });
   moveToFirstCellFromSelectedTable(editor);
   replaceEmptyParagraphWithTable(editor);
 }
 function isTableActive(editor) {
-  var tableElements = [plate.ELEMENT_TABLE, plate.ELEMENT_TH, plate.ELEMENT_TR, plate.ELEMENT_TD];
+  var tableElements = [plateTable.ELEMENT_TABLE, plateTable.ELEMENT_TH, plateTable.ELEMENT_TR, plateTable.ELEMENT_TD];
   return tableElements.some(function (el) {
     return isBlockSelected(editor, el);
   });
 }
 function isTableHeaderEnabled(editor) {
-  var tableItem = plate.getAbove(editor, {
+  var tableItem = plateCommon.getAbove(editor, {
     match: {
       type: Contentful.BLOCKS.TABLE
     }
@@ -3546,20 +3555,20 @@ function isTableHeaderEnabled(editor) {
     return false;
   }
 
-  var firstRow = plate.getChildren(tableItem)[0];
+  var firstRow = plateCommon.getChildren(tableItem)[0];
 
   if (!firstRow) {
     return false;
   }
 
-  return plate.getChildren(firstRow).every(function (_ref) {
+  return plateCommon.getChildren(firstRow).every(function (_ref) {
     var node = _ref[0];
     return node.type === Contentful.BLOCKS.TABLE_HEADER_CELL;
   });
 }
 function replaceEmptyParagraphWithTable(editor) {
   var tablePath = getAncestorPathFromSelection(editor);
-  if (!tablePath || plate.isFirstChild(tablePath)) return;
+  if (!tablePath || plateCommon.isFirstChild(tablePath)) return;
   var previousPath = slate.Path.previous(tablePath);
   if (!previousPath) return;
 
@@ -3573,7 +3582,7 @@ function replaceEmptyParagraphWithTable(editor) {
 
   if (!nodes) return;
   var previousNode = nodes[0];
-  var isPreviousNodeTextEmpty = plate.isAncestorEmpty(editor, previousNode);
+  var isPreviousNodeTextEmpty = plateCommon.isAncestorEmpty(editor, previousNode);
 
   if (isPreviousNodeTextEmpty) {
     // Switch table with previous empty paragraph
@@ -3612,14 +3621,14 @@ var _constate$2 = /*#__PURE__*/constate(useTracking),
     useTrackingContext = _constate$2[1];
 
 var addRow = function addRow(editor, getNextRowPath) {
-  if (plate.someNode(editor, {
+  if (plateCommon.someNode(editor, {
     match: {
-      type: plate.getPlatePluginType(editor, plate.ELEMENT_TABLE)
+      type: plateCore.getPlatePluginType(editor, plateTable.ELEMENT_TABLE)
     }
   })) {
-    var currentRowItem = plate.getAbove(editor, {
+    var currentRowItem = plateCommon.getAbove(editor, {
       match: {
-        type: plate.getPlatePluginType(editor, plate.ELEMENT_TR)
+        type: plateCore.getPlatePluginType(editor, plateTable.ELEMENT_TR)
       }
     });
 
@@ -3627,8 +3636,8 @@ var addRow = function addRow(editor, getNextRowPath) {
       var currentRowElem = currentRowItem[0],
           currentRowPath = currentRowItem[1];
       var nextRowPath = getNextRowPath(currentRowPath);
-      plate.insertNodes(editor, // @ts-expect-error
-      plate.getEmptyRowNode(editor, {
+      plateCommon.insertNodes(editor, // @ts-expect-error
+      plateTable.getEmptyRowNode(editor, {
         header: false,
         colCount: currentRowElem.children.length
       }), {
@@ -3657,19 +3666,19 @@ var addRowAbove = function addRowAbove(editor) {
 var addColumn = function addColumn(editor, _ref, getNextCellPath) {
   var header = _ref.header;
 
-  if (plate.someNode(editor, {
+  if (plateCommon.someNode(editor, {
     match: {
-      type: plate.getPlatePluginType(editor, plate.ELEMENT_TABLE)
+      type: plateCore.getPlatePluginType(editor, plateTable.ELEMENT_TABLE)
     }
   })) {
-    var currentCellItem = plate.getAbove(editor, {
+    var currentCellItem = plateCommon.getAbove(editor, {
       match: {
-        type: [plate.getPlatePluginType(editor, plate.ELEMENT_TD), plate.getPlatePluginType(editor, plate.ELEMENT_TH)]
+        type: [plateCore.getPlatePluginType(editor, plateTable.ELEMENT_TD), plateCore.getPlatePluginType(editor, plateTable.ELEMENT_TH)]
       }
     });
-    var currentTableItem = plate.getAbove(editor, {
+    var currentTableItem = plateCommon.getAbove(editor, {
       match: {
-        type: plate.getPlatePluginType(editor, plate.ELEMENT_TABLE)
+        type: plateCore.getPlatePluginType(editor, plateTable.ELEMENT_TABLE)
       }
     });
 
@@ -3679,8 +3688,8 @@ var addColumn = function addColumn(editor, _ref, getNextCellPath) {
       var replacePathPos = newCellPath.length - 2;
       currentTableItem[0].children.forEach(function (_, rowIdx) {
         newCellPath[replacePathPos] = rowIdx;
-        plate.insertNodes(editor, // @ts-expect-error
-        plate.getEmptyCellNode(editor, {
+        plateCommon.insertNodes(editor, // @ts-expect-error
+        plateTable.getEmptyCellNode(editor, {
           header: header && rowIdx === 0
         }), {
           at: newCellPath,
@@ -3704,7 +3713,7 @@ var addColumnLeft = function addColumnLeft(editor, options) {
 };
 
 var setHeader = function setHeader(editor, enable) {
-  var tableItem = plate.getAbove(editor, {
+  var tableItem = plateCommon.getAbove(editor, {
     match: {
       type: Contentful.BLOCKS.TABLE
     }
@@ -3714,15 +3723,15 @@ var setHeader = function setHeader(editor, enable) {
     return;
   }
 
-  var firstRow = plate.getChildren(tableItem)[0];
+  var firstRow = plateCommon.getChildren(tableItem)[0];
 
   if (!firstRow) {
     return;
   }
 
-  plate.getChildren(firstRow).forEach(function (_ref) {
+  plateCommon.getChildren(firstRow).forEach(function (_ref) {
     var path = _ref[1];
-    plate.setNodes(editor, {
+    plateCommon.setNodes(editor, {
       type: enable ? Contentful.BLOCKS.TABLE_HEADER_CELL : Contentful.BLOCKS.TABLE_CELL
     }, {
       at: path
@@ -3774,7 +3783,7 @@ var TableActions = function TableActions() {
       return false;
     }
 
-    var headerCell = plate.getAbove(editor, {
+    var headerCell = plateCommon.getAbove(editor, {
       match: {
         type: Contentful.BLOCKS.TABLE_HEADER_CELL
       }
@@ -3834,11 +3843,11 @@ var TableActions = function TableActions() {
   }, "Add column right"), /*#__PURE__*/React__default.createElement(f36Components.Menu.Divider, null), /*#__PURE__*/React__default.createElement(f36Components.Menu.Item, {
     onClick: toggleHeader
   }, isHeaderEnabled ? 'Disable table header' : 'Enable table header'), /*#__PURE__*/React__default.createElement(f36Components.Menu.Divider, null), /*#__PURE__*/React__default.createElement(f36Components.Menu.Item, {
-    onClick: action(plate.deleteRow, 'remove', 'Row')
+    onClick: action(plateTable.deleteRow, 'remove', 'Row')
   }, "Delete row"), /*#__PURE__*/React__default.createElement(f36Components.Menu.Item, {
-    onClick: action(plate.deleteColumn, 'remove', 'Column')
+    onClick: action(plateTable.deleteColumn, 'remove', 'Column')
   }, "Delete column"), /*#__PURE__*/React__default.createElement(f36Components.Menu.Item, {
-    onClick: action(plate.deleteTable, 'remove', 'Table')
+    onClick: action(plateTable.deleteTable, 'remove', 'Table')
   }, "Delete table")));
 };
 
@@ -3975,16 +3984,16 @@ var TD = function TD(props) {
     className: styles$f[Contentful.BLOCKS.TABLE_CELL]
   }), isSelected && /*#__PURE__*/React.createElement(TableActions, null), props.children);
 };
-var withTableOptions = (_withTableOptions = {}, _withTableOptions[plate.ELEMENT_TABLE] = {
+var withTableOptions = (_withTableOptions = {}, _withTableOptions[plateTable.ELEMENT_TABLE] = {
   type: Contentful.BLOCKS.TABLE,
   component: Table
-}, _withTableOptions[plate.ELEMENT_TR] = {
+}, _withTableOptions[plateTable.ELEMENT_TR] = {
   type: Contentful.BLOCKS.TABLE_ROW,
   component: TR
-}, _withTableOptions[plate.ELEMENT_TH] = {
+}, _withTableOptions[plateTable.ELEMENT_TH] = {
   type: Contentful.BLOCKS.TABLE_HEADER_CELL,
   component: TH
-}, _withTableOptions[plate.ELEMENT_TD] = {
+}, _withTableOptions[plateTable.ELEMENT_TD] = {
   type: Contentful.BLOCKS.TABLE_CELL,
   component: TD
 }, _withTableOptions);
@@ -4043,7 +4052,7 @@ function hasHeadersOutsideFirstRow(nodes) {
 
 function createTableOnKeyDown() {
   return function withTableEvents(editor) {
-    var handleKeyDownFromPlateUdecode = plate.getTableOnKeyDown()(editor);
+    var handleKeyDownFromPlateUdecode = plateTable.getTableOnKeyDown()(editor);
     return function handleKeyDown(event) {
       if (event.key === 'Backspace' && currentSelectionStartsTableCell(editor) || event.key === 'Delete' && currentSelectionPrecedesTableCell(editor)) {
         // The default behavior here would be to delete the preceding or forthcoming
@@ -4060,7 +4069,7 @@ function createTableOnKeyDown() {
 }
 
 var createTablePlugin = function createTablePlugin(tracking) {
-  return _extends({}, plate.createTablePlugin(), {
+  return _extends({}, plateTable.createTablePlugin(), {
     onKeyDown: createTableOnKeyDown(),
     withOverrides: function withOverrides(editor) {
       addTableTrackingEvents(editor, tracking);
@@ -4364,7 +4373,7 @@ var createNode = function createNode(nodeType, entity) {
 function insertBlock(editor, nodeType, entity) {
   if (!(editor != null && editor.selection)) return;
   var linkedEntityBlock = createNode(nodeType, entity);
-  var hasText = editor.selection && !!plate.getText(editor, editor.selection.focus.path);
+  var hasText = editor.selection && !!plateCommon.getText(editor, editor.selection.focus.path);
 
   if (hasText) {
     slate.Transforms.insertNodes(editor, linkedEntityBlock);
@@ -4439,14 +4448,14 @@ var _withEmbeddedEntryBlo, _withEmbeddedAssetBlo;
 var createEmbeddedEntityPlugin = function createEmbeddedEntityPlugin(nodeType) {
   return function (sdk) {
     return {
-      renderElement: plate.getRenderElement(nodeType),
+      renderElement: plateCore.getRenderElement(nodeType),
       pluginKeys: nodeType,
       onKeyDown: getWithEmbeddedEntityEvents(nodeType, sdk),
-      voidTypes: plate.getPlatePluginTypes(nodeType),
+      voidTypes: plateCore.getPlatePluginTypes(nodeType),
       deserialize: function deserialize(editor) {
         var _entityTypes;
 
-        var options = plate.getPlatePluginOptions(editor, nodeType);
+        var options = plateCore.getPlatePluginOptions(editor, nodeType);
         var entityTypes = (_entityTypes = {}, _entityTypes[Contentful.BLOCKS.EMBEDDED_ENTRY] = 'Entry', _entityTypes[Contentful.BLOCKS.EMBEDDED_ASSET] = 'Asset', _entityTypes);
         return {
           element: [_extends({
@@ -4817,13 +4826,13 @@ function ToolbarEmbeddedEntityInlineButton(props) {
 }
 function createEmbeddedEntityInlinePlugin(sdk) {
   return {
-    renderElement: plate.getRenderElement(Contentful.INLINES.EMBEDDED_ENTRY),
+    renderElement: plateCore.getRenderElement(Contentful.INLINES.EMBEDDED_ENTRY),
     pluginKeys: Contentful.INLINES.EMBEDDED_ENTRY,
-    inlineTypes: plate.getPlatePluginTypes(Contentful.INLINES.EMBEDDED_ENTRY),
-    voidTypes: plate.getPlatePluginTypes(Contentful.INLINES.EMBEDDED_ENTRY),
+    inlineTypes: plateCore.getPlatePluginTypes(Contentful.INLINES.EMBEDDED_ENTRY),
+    voidTypes: plateCore.getPlatePluginTypes(Contentful.INLINES.EMBEDDED_ENTRY),
     onKeyDown: getWithEmbeddedEntryInlineEvents(sdk),
     deserialize: function deserialize(editor) {
-      var options = plate.getPlatePluginOptions(editor, Contentful.INLINES.EMBEDDED_ENTRY);
+      var options = plateCore.getPlatePluginOptions(editor, Contentful.INLINES.EMBEDDED_ENTRY);
       return {
         element: [_extends({
           type: Contentful.INLINES.EMBEDDED_ENTRY,
@@ -5331,14 +5340,14 @@ function isEmpty(element) {
 }
 
 function createParagraphPlugin() {
-  var elementKeys = [plate.ELEMENT_PARAGRAPH, Contentful.BLOCKS.PARAGRAPH];
+  var elementKeys = [plateParagraph.ELEMENT_PARAGRAPH, Contentful.BLOCKS.PARAGRAPH];
   var deserializer = deserializeElement(Contentful.BLOCKS.PARAGRAPH, [{
     nodeNames: ['P', 'DIV']
   }]);
   return {
-    renderElement: plate.getRenderElement(elementKeys),
+    renderElement: plateCore.getRenderElement(elementKeys),
     pluginKeys: elementKeys,
-    onKeyDown: plate.getToggleElementOnKeyDown(Contentful.BLOCKS.PARAGRAPH),
+    onKeyDown: plateCommon.getToggleElementOnKeyDown(Contentful.BLOCKS.PARAGRAPH),
     deserialize: function deserialize(editor) {
       var _deserializer = deserializer(editor),
           element = _deserializer.element,
@@ -5388,7 +5397,7 @@ function createParagraphPlugin() {
     }
   };
 }
-var withParagraphOptions = (_withParagraphOptions = {}, _withParagraphOptions[plate.ELEMENT_PARAGRAPH] = {
+var withParagraphOptions = (_withParagraphOptions = {}, _withParagraphOptions[plateParagraph.ELEMENT_PARAGRAPH] = {
   // We convert the default slate plugin `p` to Contentful `BLOCKS.PARAGRAPH`
   type: Contentful.BLOCKS.PARAGRAPH,
   component: Paragraph
@@ -5440,11 +5449,11 @@ function createInsertBeforeFirstVoidBlockPlugin() {
       }
     }]
   };
-  return plate.createExitBreakPlugin(optionsExitBreakPlugin);
+  return plateBreak.createExitBreakPlugin(optionsExitBreakPlugin);
 }
 
 var createTrailingParagraphPlugin = function createTrailingParagraphPlugin() {
-  return plate.createTrailingBlockPlugin({
+  return plateTrailingBlock.createTrailingBlockPlugin({
     type: Contentful.BLOCKS.PARAGRAPH,
     level: 0
   });
@@ -5504,9 +5513,9 @@ function createDragAndDropPlugin() {
     // If true, the next handlers will be skipped.
     onDrop: function onDrop(editor) {
       return function (event) {
-        var _Array$from = Array.from(plate.getNodes(editor, {
+        var _Array$from = Array.from(plateCommon.getNodes(editor, {
           match: function match(node) {
-            return slate.Editor.isBlock(editor, node) && DRAGGABLE_TYPES.includes(node.type);
+            return DRAGGABLE_TYPES.includes(node == null ? void 0 : node.type);
           }
         })),
             draggingBlock = _Array$from[0];
@@ -5515,11 +5524,19 @@ function createDragAndDropPlugin() {
         var draggingNode = draggingBlock[0];
         if (!event.nativeEvent.target) return false; // TODO: looking up for html nodes is not the best solution and it won't scale, we need to find a way to know the dropping target slate element
 
-        return getParents(event.nativeEvent.target).some(function (node) {
+        var dropDisallowed = getParents(event.nativeEvent.target).some(function (node) {
           var _ON_DROP_ALLOWED_TYPE;
 
           return ON_DROP_ALLOWED_TYPES[node.nodeName] ? !((_ON_DROP_ALLOWED_TYPE = ON_DROP_ALLOWED_TYPES[node.nodeName]) != null && _ON_DROP_ALLOWED_TYPE.includes(draggingNode.type)) : false;
         });
+
+        if (!dropDisallowed) {
+          // Move the drop event to a new undo batch mitigating the bug where undo not only moves it back,
+          // but also undoes a previous action: https://github.com/ianstormtaylor/slate/issues/4694
+          editor.history.undos.push([]);
+        }
+
+        return dropDisallowed;
       };
     }
   };
@@ -5556,7 +5573,7 @@ function createTextPlugin() {
         if (nodes) {
           var paragraphOrHeading = nodes[0],
               path = nodes[1];
-          var isTextEmpty = plate.isAncestorEmpty(editor, paragraphOrHeading); // We ignore paragraphs/headings that are children of ul, ol, blockquote, tables, etc
+          var isTextEmpty = plateCommon.isAncestorEmpty(editor, paragraphOrHeading); // We ignore paragraphs/headings that are children of ul, ol, blockquote, tables, etc
 
           var isRootLevel = path.length === 1;
 
@@ -5579,16 +5596,16 @@ function createTextPlugin() {
 
 var getPlugins = function getPlugins(sdk, tracking) {
   var plugins = [// Core
-  plate.createReactPlugin(), plate.createHistoryPlugin(), // Behavior
+  plateCore.createReactPlugin(), plateCore.createHistoryPlugin(), // Behavior
   createPastePlugin(), // Global shortcuts
   createNewLinePlugin(), createInsertBeforeFirstVoidBlockPlugin(), createDragAndDropPlugin(), // Block Elements
   createParagraphPlugin(), createListPlugin(), createHrPlugin(), createHeadingPlugin(), createQuotePlugin(), createTablePlugin(tracking), createEmbeddedEntryBlockPlugin(sdk), createEmbeddedAssetBlockPlugin(sdk), // Inline elements
   createHyperlinkPlugin(sdk), createEmbeddedEntityInlinePlugin(sdk), // Marks
   createBoldPlugin(), createCodePlugin(), createItalicPlugin(), createUnderlinePlugin(), // Other
   createTrailingParagraphPlugin(), createTextPlugin()];
-  return plugins.concat([plate.createDeserializeHTMLPlugin({
+  return plugins.concat([plateHtmlSerializer.createDeserializeHTMLPlugin({
     plugins: plugins
-  }), plate.createDeserializeAstPlugin({
+  }), plateAstSerializer.createDeserializeAstPlugin({
     plugins: plugins
   })]);
 };
@@ -5616,7 +5633,7 @@ var ConnectedRichTextEditor = function ConnectedRichTextEditor(props) {
   return /*#__PURE__*/React__default.createElement("div", {
     className: styles.root,
     "data-test-id": "rich-text-editor"
-  }, /*#__PURE__*/React__default.createElement(plate.Plate, {
+  }, /*#__PURE__*/React__default.createElement(plateCore.Plate, {
     id: getContentfulEditorId(props.sdk),
     initialValue: value,
     plugins: plugins,