@contentful/field-editor-rich-text 2.0.0-next.24 → 2.0.0-next.27

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

@@ -461,7 +461,7 @@ function moveToTheNextChar(editor) {
     unit: 'character'
   });
 }
-function insertEmptyParagraph(editor) {
+function insertEmptyParagraph(editor, options) {
   var emptyParagraph = {
     type: Contentful.BLOCKS.PARAGRAPH,
     children: [{
@@ -470,7 +470,7 @@ function insertEmptyParagraph(editor) {
     data: {},
     isVoid: false
   };
-  slate.Transforms.insertNodes(editor, emptyParagraph);
+  slate.Transforms.insertNodes(editor, emptyParagraph, options);
 }
 function getElementFromCurrentSelection(editor) {
   if (!editor.selection) return [];
@@ -3868,37 +3868,44 @@ var moveListItems = function moveListItems(editor, _temp) {
  * Credit: Modified version of Plate's list plugin
  * See: https://github.com/udecode/plate/blob/main/packages/nodes/list
  */
-var listTypes = [Contentful.BLOCKS.UL_LIST, Contentful.BLOCKS.OL_LIST];
+
+function hasUnliftedListItems(editor, at) {
+  return slate.Editor.nodes(editor, {
+    at: at,
+    match: function match(node, path) {
+      return slate.Element.isElement(node) && node.type === Contentful.BLOCKS.LIST_ITEM && path.length >= 2;
+    }
+  }).next().done;
+}
+
 var unwrapList = function unwrapList(editor, _temp) {
   var _ref = _temp === void 0 ? {} : _temp,
       at = _ref.at;
 
   slate.Editor.withoutNormalizing(editor, function () {
     do {
-      plateCore.unwrapNodes(editor, {
+      // lift list items to the root level
+      slate.Transforms.liftNodes(editor, {
         at: at,
-        match: {
-          type: Contentful.BLOCKS.LIST_ITEM
-        },
-        split: true
-      });
-      plateCore.unwrapNodes(editor, {
-        at: at,
-        match: {
-          type: listTypes
+        match: function match(node) {
+          return slate.Element.isElement(node) && node.type === Contentful.BLOCKS.LIST_ITEM;
         },
-        split: true
+        mode: 'lowest'
       });
-    } while (plateCore.getAbove(editor, {
+    } while (!hasUnliftedListItems(editor, at)); // finally unwrap all lifted items
+
+
+    plateCore.unwrapNodes(editor, {
+      at: at,
       match: {
-        type: listTypes,
-        at: at
-      }
-    }));
+        type: Contentful.BLOCKS.LIST_ITEM
+      },
+      split: false
+    });
   });
 };
 
-var listTypes$1 = [Contentful.BLOCKS.UL_LIST, Contentful.BLOCKS.OL_LIST];
+var listTypes = [Contentful.BLOCKS.UL_LIST, Contentful.BLOCKS.OL_LIST];
 var toggleList = function toggleList(editor, _ref) {
   var type = _ref.type;
   return slate.Editor.withoutNormalizing(editor, function () {
@@ -3919,7 +3926,7 @@ var toggleList = function toggleList(editor, _ref) {
           }, {
             at: editor.selection,
             match: function match(n) {
-              return listTypes$1.includes(n.type);
+              return listTypes.includes(n.type);
             },
             mode: 'lowest'
           });
@@ -3960,19 +3967,25 @@ var toggleList = function toggleList(editor, _ref) {
 
       var commonEntry = slate.Node.common(editor, startPoint.path, endPoint.path);
 
-      if (listTypes$1.includes(commonEntry[0].type) || commonEntry[0].type === Contentful.BLOCKS.LIST_ITEM) {
-        if (commonEntry[0].type !== type) {
+      if (listTypes.includes(commonEntry[0].type) || commonEntry[0].type === Contentful.BLOCKS.LIST_ITEM) {
+        var listType = commonEntry[0].type;
+
+        if (commonEntry[0].type === Contentful.BLOCKS.LIST_ITEM) {
+          listType = slate.Editor.parent(editor, commonEntry[1])[0].type;
+        }
+
+        if (listType !== type) {
           var startList = plateCore.findNode(editor, {
             at: slate.Range.start(editor.selection),
             match: {
-              type: listTypes$1
+              type: listTypes
             },
             mode: 'lowest'
           });
           var endList = plateCore.findNode(editor, {
             at: slate.Range.end(editor.selection),
             match: {
-              type: listTypes$1
+              type: listTypes
             },
             mode: 'lowest'
           });
@@ -3987,7 +4000,7 @@ var toggleList = function toggleList(editor, _ref) {
           }, {
             at: editor.selection,
             match: function match(n, path) {
-              return listTypes$1.includes(n.type) && path.length >= rangeLength;
+              return listTypes.includes(n.type) && path.length >= rangeLength;
             },
             mode: 'all'
           });
@@ -4005,7 +4018,7 @@ var toggleList = function toggleList(editor, _ref) {
         }).reverse();
 
         _nodes.forEach(function (n) {
-          if (listTypes$1.includes(n[0].type)) {
+          if (listTypes.includes(n[0].type)) {
             plateCore.setNodes(editor, {
               type: type
             }, {
@@ -5221,9 +5234,9 @@ var sanitizeHTML = function sanitizeHTML(html) {
   // Parse the HTML string and pipe it through our transformers
   var doc = transformers.reduce(function (value, cb) {
     return cb(value);
-  }, new DOMParser().parseFromString(html, 'text/html')); // Remove whitespace between tags
-
-  return doc.body.innerHTML.replace(/>\s+</g, '><');
+  }, new DOMParser().parseFromString(html, 'text/html'));
+  return doc.body.innerHTML.replace(/>\s+</g, '><') // Remove whitespace between tags
+  .replace(/(.*)<div.*>(<table.*<\/table>)<\/div>(.*)/g, '$1$2$3'); // remove div containers from tables
 };
 
 /**
@@ -5764,6 +5777,9 @@ var isNotEmpty = function isNotEmpty(editor, _ref4) {
   var path = _ref4[1];
   return Array.from(slate.Node.children(editor, path)).length !== 0;
 };
+var isTable = function isTable(node) {
+  return slate.Element.isElement(node) && node.type === Contentful.BLOCKS.TABLE;
+};
 
 var styles$i = {
   topRight: /*#__PURE__*/emotion.css({
@@ -5907,9 +5923,11 @@ var Row = function Row(props) {
 var _templateObject$a;
 var style$5 = /*#__PURE__*/emotion.css(_templateObject$a || (_templateObject$a = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin-bottom: 1.5em;\n  border-collapse: collapse;\n  border-radius: 5px;\n  border-style: hidden;\n  box-shadow: 0 0 0 1px ", ";\n  width: 100%;\n  table-layout: fixed;\n  overflow: hidden;\n"])), tokens.gray400);
 var Table = function Table(props) {
-  return /*#__PURE__*/React.createElement("table", Object.assign({}, props.attributes, {
+  return /*#__PURE__*/React.createElement("div", {
+    "data-block-type": Contentful.BLOCKS.TABLE
+  }, /*#__PURE__*/React.createElement("table", Object.assign({
     className: style$5
-  }), /*#__PURE__*/React.createElement("tbody", null, props.children));
+  }, props.attributes), /*#__PURE__*/React.createElement("tbody", null, props.children)));
 };
 
 var createTableOnKeyDown = function createTableOnKeyDown(editor, plugin) {
@@ -5922,6 +5940,38 @@ var createTableOnKeyDown = function createTableOnKeyDown(editor, plugin) {
       event.preventDefault();
       event.stopPropagation();
       return;
+    } // This fixes `Cannot resolve a Slate point from DOM point: [object HTMLDivElement]` when typing while the cursor is before table
+
+
+    var windowSelection = window.getSelection();
+
+    if (windowSelection) {
+      var _windowSelection$anch, _windowSelection$anch2;
+
+      // @ts-expect-error
+      var blockType = (_windowSelection$anch = windowSelection.anchorNode.attributes) == null ? void 0 : (_windowSelection$anch2 = _windowSelection$anch['data-block-type']) == null ? void 0 : _windowSelection$anch2.value; // this attribute comes from `plugins/Table/components/Table.tsx`
+
+      var isBeforeTable = blockType === Contentful.BLOCKS.TABLE;
+
+      if (isBeforeTable) {
+        if (event.key === 'Enter') {
+          var above = plateCore.getAbove(editor, {
+            match: {
+              type: Contentful.BLOCKS.TABLE
+            }
+          });
+          if (!above) return;
+          var tablePath = above[1];
+          insertEmptyParagraph(editor, {
+            at: tablePath,
+            select: true
+          });
+        }
+
+        event.preventDefault();
+        event.stopPropagation();
+        return;
+      }
     }
 
     defaultHandler(event);
@@ -5936,18 +5986,26 @@ var createTablePlugin = function createTablePlugin() {
     handlers: {
       onKeyDown: createTableOnKeyDown
     },
-    withOverrides: function withOverrides(editor) {
+    withOverrides: function withOverrides(editor, plugin) {
+      // injects important fixes from plate's original table plugin
+      plateTable.withTable(editor, plugin);
       addTableTrackingEvents(editor);
       var insertFragment = editor.insertFragment;
 
       editor.insertFragment = function (fragments) {
+        var _editor$selection;
+
         // We need to make sure we have a new, empty and clean paragraph in order to paste tables as-is due to how Slate behaves
         // More info: https://github.com/ianstormtaylor/slate/pull/4489 and https://github.com/ianstormtaylor/slate/issues/4542
-        var fragmentHasTable = fragments.some(function (fragment) {
-          return fragment.type === Contentful.BLOCKS.TABLE;
+        var isInsertingTable = fragments.some(function (fragment) {
+          return isTable(fragment);
         });
+        var isTableFirstFragment = fragments.findIndex(function (fragment) {
+          return isTable(fragment);
+        }) === 0;
+        var currentLineHasText = plateCore.getText(editor, (_editor$selection = editor.selection) == null ? void 0 : _editor$selection.focus.path) !== '';
 
-        if (fragmentHasTable) {
+        if (isInsertingTable && isTableFirstFragment && currentLineHasText) {
           insertEmptyParagraph(editor);
         }