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

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

@@ -26,7 +26,7 @@ import { createBoldPlugin as createBoldPlugin$1, createCodePlugin as createCodeP
 import isPlainObject from 'is-plain-obj';
 import { createParagraphPlugin as createParagraphPlugin$1 } from '@udecode/plate-paragraph';
 import { createSelectOnBackspacePlugin as createSelectOnBackspacePlugin$1 } from '@udecode/plate-select';
-import { ELEMENT_TABLE, ELEMENT_TR, getEmptyRowNode, ELEMENT_TD, ELEMENT_TH, getEmptyCellNode, insertTable, deleteRow, deleteColumn, deleteTable, createTablePlugin as createTablePlugin$1, withTable, onKeyDownTable } from '@udecode/plate-table';
+import { ELEMENT_TABLE, ELEMENT_TR, getEmptyRowNode, ELEMENT_TD, ELEMENT_TH, getEmptyCellNode, insertTable, deleteRow, deleteColumn, deleteTable, onKeyDownTable as onKeyDownTable$1, getTableCellEntry, createTablePlugin as createTablePlugin$1, withTable } from '@udecode/plate-table';
 import { toContentfulDocument, toSlatejsDocument } from '@contentful/contentful-slatejs-adapter';
 import { documentToPlainTextString } from '@contentful/rich-text-plain-text-renderer';
 import { createTrailingBlockPlugin } from '@udecode/plate-trailing-block';
@@ -5871,8 +5871,67 @@ var Table = function Table(props) {
   }, props.attributes), /*#__PURE__*/createElement("tbody", null, props.children)));
 };
 
-var createTableOnKeyDown = function createTableOnKeyDown(editor, plugin) {
-  var defaultHandler = onKeyDownTable(editor, plugin);
+/**
+ * Removes table wrappers when pasting a single table cell
+ *
+ * In Plate/Slate, copying the content of a table cell wraps
+ * it in a <table><tr><td>{content}</td></tr></table> even
+ * when copying partial cell content.
+ *
+ * That's really annoying as there is no way to remove the table
+ * wrappers in that case.
+ */
+
+var trimUnnecessaryTableWrapper = function trimUnnecessaryTableWrapper(node) {
+  if (!Element.isElement(node)) {
+    return [node];
+  } // must be a table with a single row
+
+
+  if (node.type !== BLOCKS.TABLE || node.children.length !== 1) {
+    return [node];
+  }
+
+  var row = node.children[0]; // the row must contain a single cell
+
+  if (row.children.length !== 1) {
+    return [node];
+  }
+
+  var cell = row.children[0];
+  return cell.children;
+};
+
+var insertTableFragment = function insertTableFragment(editor) {
+  var insertFragment = editor.insertFragment;
+  return function (fragments) {
+    var _editor$selection;
+
+    if (!editor.selection) {
+      return;
+    }
+
+    fragments = fragments.flatMap(trimUnnecessaryTableWrapper); // 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 isInsertingTable = fragments.some(function (fragment) {
+      return isTable(fragment);
+    });
+    var isTableFirstFragment = fragments.findIndex(function (fragment) {
+      return isTable(fragment);
+    }) === 0;
+    var currentLineHasText = getText(editor, (_editor$selection = editor.selection) == null ? void 0 : _editor$selection.focus.path) !== '';
+
+    if (isInsertingTable && isTableFirstFragment && currentLineHasText) {
+      insertEmptyParagraph(editor);
+    }
+
+    return insertFragment(fragments);
+  };
+};
+
+var onKeyDownTable = function onKeyDownTable(editor, plugin) {
+  var defaultHandler = onKeyDownTable$1(editor, plugin);
   return function (event) {
     // This fixes `Cannot resolve a Slate point from DOM point: [object HTMLDivElement]` when typing while the cursor is before table
     var windowSelection = window.getSelection();
@@ -5904,6 +5963,27 @@ var createTableOnKeyDown = function createTableOnKeyDown(editor, plugin) {
         event.stopPropagation();
         return;
       }
+    } // Pressing Tab on the last cell creates a new row
+    // Otherwise, jumping between cells is handled in the defaultKeyDownTable
+
+
+    if (event.key === 'Tab' && !event.shiftKey) {
+      event.preventDefault();
+      var res = getTableCellEntry(editor, {});
+
+      if (res) {
+        var tableElement = res.tableElement,
+            tableRow = res.tableRow,
+            tableCell = res.tableCell;
+        var isLastCell = isLastChild(tableRow, tableCell[1]);
+        var isLastRow = isLastChild(tableElement, tableRow[1]);
+
+        if (isLastRow && isLastCell) {
+          addRowBelow(editor); // skip default handler
+
+          return;
+        }
+      }
     }
 
     defaultHandler(event);
@@ -5916,34 +5996,13 @@ var createTablePlugin = function createTablePlugin() {
   return createTablePlugin$1({
     type: BLOCKS.TABLE,
     handlers: {
-      onKeyDown: createTableOnKeyDown
+      onKeyDown: onKeyDownTable
     },
     withOverrides: function withOverrides(editor, plugin) {
       // injects important fixes from plate's original table plugin
       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 isInsertingTable = fragments.some(function (fragment) {
-          return isTable(fragment);
-        });
-        var isTableFirstFragment = fragments.findIndex(function (fragment) {
-          return isTable(fragment);
-        }) === 0;
-        var currentLineHasText = getText(editor, (_editor$selection = editor.selection) == null ? void 0 : _editor$selection.focus.path) !== '';
-
-        if (isInsertingTable && isTableFirstFragment && currentLineHasText) {
-          insertEmptyParagraph(editor);
-        }
-
-        insertFragment(fragments);
-      };
-
+      editor.insertFragment = insertTableFragment(editor);
       return editor;
     },
     overrideByKey: (_overrideByKey = {}, _overrideByKey[ELEMENT_TABLE] = {