@contentful/field-editor-rich-text 2.0.0-next.25 → 2.0.0-next.28

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 [];
@@ -590,58 +590,6 @@ function getAncestorPathFromSelection(editor) {
     return level.length === 1;
   });
 }
-var isAtEndOfTextSelection = function isAtEndOfTextSelection(editor) {
-  var _editor$selection2, _editor$selection3;
-
-  return ((_editor$selection2 = editor.selection) == null ? void 0 : _editor$selection2.focus.offset) === plateCore.getText(editor, (_editor$selection3 = editor.selection) == null ? void 0 : _editor$selection3.focus.path).length;
-};
-function currentSelectionStartsTableCell(editor) {
-  var _editor$selection4;
-
-  var _getNodeEntryFromSele2 = getNodeEntryFromSelection(editor, [Contentful.BLOCKS.TABLE_CELL, Contentful.BLOCKS.TABLE_HEADER_CELL]),
-      tableCellNode = _getNodeEntryFromSele2[0],
-      path = _getNodeEntryFromSele2[1];
-
-  return !!tableCellNode && (!plateCore.getText(editor, path) || ((_editor$selection4 = editor.selection) == null ? void 0 : _editor$selection4.focus.offset) === 0);
-}
-/**
- * This traversal strategy is unfortunately necessary because Slate doesn't
- * expose something like Node.next(editor).
- */
-
-function getNextNode(editor) {
-  if (!editor.selection) {
-    return null;
-  }
-
-  var descendants = slate.Node.descendants(editor, {
-    from: editor.selection.focus.path
-  }); // eslint-disable-next-line no-constant-condition
-
-  while (true) {
-    var _descendants$next = descendants.next(),
-        done = _descendants$next.done,
-        value = _descendants$next.value;
-
-    if (done) {
-      return null;
-    }
-
-    var node = value[0],
-        path = value[1];
-
-    if (slate.Path.isCommon(path, editor.selection.focus.path)) {
-      continue;
-    }
-
-    return node;
-  }
-} // TODO: move to table plugin
-
-function currentSelectionPrecedesTableCell(editor) {
-  var nextNode = getNextNode(editor);
-  return !!nextNode && Contentful.TABLE_BLOCKS.includes(nextNode.type) && isAtEndOfTextSelection(editor);
-}
 var INLINE_TYPES = /*#__PURE__*/Object.values(Contentful.INLINES);
 var isInlineOrText = function isInlineOrText(node) {
   // either text or inline elements
@@ -3868,37 +3816,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, {
-        at: at,
-        match: {
-          type: Contentful.BLOCKS.LIST_ITEM
-        },
-        split: true
-      });
-      plateCore.unwrapNodes(editor, {
+      // lift list items to the root level
+      slate.Transforms.liftNodes(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 +3874,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 +3915,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 +3948,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 +3966,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
             }, {
@@ -5910,21 +5871,46 @@ 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) {
   var defaultHandler = plateTable.onKeyDownTable(editor, plugin);
   return function (event) {
-    if (event.key === 'Backspace' && currentSelectionStartsTableCell(editor) || event.key === 'Delete' && currentSelectionPrecedesTableCell(editor)) {
-      // The default behavior here would be to delete the preceding or forthcoming
-      // leaf node, in this case a cell or header cell. But we don't want to do that,
-      // because it would leave us with a non-standard number of table cells.
-      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);
@@ -5939,7 +5925,9 @@ 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;