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

package/dist/field-editor-rich-text.esm.js

@@ -10,14 +10,22 @@ import { Button, Tooltip, Menu, EntryCard, MenuItem, AssetCard, Text as Text$1,
 import { useSelected, useFocused, ReactEditor, useReadOnly } from 'slate-react';
 import { HorizontalRuleIcon, ChevronDownIcon, QuoteIcon, ListBulletedIcon, ListNumberedIcon, FormatBoldIcon, CodeIcon, FormatItalicIcon, FormatUnderlinedIcon, ClockIcon, LinkIcon, TableIcon, PlusIcon, AssetIcon, EmbeddedEntryBlockIcon, EmbeddedEntryInlineIcon } from '@contentful/f36-icons';
 import { Editor, Element, Transforms, Text, Node as Node$1, Path, Range } from 'slate';
-import { getText, getElementDeserializer, getPlatePluginOptions, getLeafDeserializer, usePlateEditorRef, getRenderElement, getPlatePluginTypes, setNodes, insertNodes, toggleNodeType, findNode, ELEMENT_LI, ELEMENT_UL, ELEMENT_OL, ELEMENT_LIC, toggleList, createListPlugin as createListPlugin$1, getParent, getAbove, withList, getRenderLeaf, getToggleMarkOnKeyDown, isMarkActive, toggleMark, ELEMENT_TABLE, ELEMENT_TH, ELEMENT_TR, ELEMENT_TD, getChildren, insertTable, isFirstChild as isFirstChild$1, isAncestorEmpty, someNode, getPlatePluginType, getEmptyRowNode, getEmptyCellNode, deleteRow, deleteColumn, deleteTable, createTablePlugin as createTablePlugin$1, getTableOnKeyDown, ELEMENT_PARAGRAPH, getToggleElementOnKeyDown, createExitBreakPlugin, createTrailingBlockPlugin, getNodes, createDeserializeHTMLPlugin, createDeserializeAstPlugin, createReactPlugin, createHistoryPlugin, Plate } from '@udecode/plate';
+import { getPlatePluginOptions, usePlateEditorRef, getRenderElement, getPlatePluginTypes, getRenderLeaf, getPlatePluginType, createReactPlugin, createHistoryPlugin, Plate } from '@udecode/plate-core';
+import { getText, getElementDeserializer, getLeafDeserializer, setNodes, insertNodes, toggleNodeType, findNode, getParent, getAbove, getToggleMarkOnKeyDown, isMarkActive, toggleMark, getChildren, isFirstChild as isFirstChild$1, isAncestorEmpty, someNode, getToggleElementOnKeyDown, getNodes } from '@udecode/plate-common';
 import constate from 'constate';
 import find from 'lodash-es/find';
 import flow from 'lodash-es/flow';
 import get from 'lodash-es/get';
+import { ELEMENT_LI, ELEMENT_UL, ELEMENT_OL, ELEMENT_LIC, toggleList, createListPlugin as createListPlugin$1, withList } from '@udecode/plate-list';
 import { entityHelpers, isValidImage, shortenStorageUnit, ModalDialogLauncher, FieldConnector } from '@contentful/field-editor-shared';
 import mimetype from '@contentful/mimetype';
+import { ELEMENT_TABLE, ELEMENT_TH, ELEMENT_TR, ELEMENT_TD, insertTable, getEmptyRowNode, getEmptyCellNode, deleteRow, deleteColumn, deleteTable, createTablePlugin as createTablePlugin$1, getTableOnKeyDown } from '@udecode/plate-table';
 import values from 'lodash-es/values';
+import { createDeserializeHTMLPlugin } from '@udecode/plate-html-serializer';
+import { createDeserializeAstPlugin } from '@udecode/plate-ast-serializer';
+import { ELEMENT_PARAGRAPH } from '@udecode/plate-paragraph';
+import { createExitBreakPlugin } from '@udecode/plate-break';
+import { createTrailingBlockPlugin } from '@udecode/plate-trailing-block';
 import PropTypes from 'prop-types';
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -2561,7 +2569,8 @@ function EntryThumbnail(_ref) {
 function FetchingWrappedEntryCard(props) {
   var _useEntities = useEntities(),
       getOrLoadEntry = _useEntities.getOrLoadEntry,
-      entries = _useEntities.entries;
+      entries = _useEntities.entries,
+      getOrLoadAsset = _useEntities.getOrLoadAsset;
 
   var _React$useState = useState(null),
       file = _React$useState[0],
@@ -2585,10 +2594,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]);
   useEffect(function () {
     getOrLoadEntry(props.entryId);
   }, [props.entryId]); // eslint-disable-line
@@ -5499,7 +5508,7 @@ function createDragAndDropPlugin() {
       return function (event) {
         var _Array$from = Array.from(getNodes(editor, {
           match: function match(node) {
-            return Editor.isBlock(editor, node) && DRAGGABLE_TYPES.includes(node.type);
+            return DRAGGABLE_TYPES.includes(node == null ? void 0 : node.type);
           }
         })),
             draggingBlock = _Array$from[0];
@@ -5508,11 +5517,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;
       };
     }
   };