@atlaskit/editor-plugin-table 8.4.9 → 8.4.11

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-table
 
+## 8.4.11
+
+### Patch Changes
+
+- [#181547](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/181547)
+  [`40f89a75c9468`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/40f89a75c9468) -
+  make guideline plugin optional to media and table plugins
+
+## 8.4.10
+
+### Patch Changes
+
+- [#179922](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/179922)
+  [`3fac1d870e06c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3fac1d870e06c) -
+  [ux] ED-25985 Table pasting logic for nested tables - prevents pasted tables from exceeding
+  nesting depth of 1 by either flattening deeply nested tables or moving the paste location to under
+  the destination table
+
 ## 8.4.9
 
 ### Patch Changes

package/dist/cjs/pm-plugins/main.js

@@ -14,6 +14,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _editorTables = require("@atlaskit/editor-tables");
 var _utils3 = require("@atlaskit/editor-tables/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _lazyNodeViews = require("../nodeviews/lazy-node-views");
 var _plugin = require("../pm-plugins/decorations/plugin");
 var _types = require("../types");
@@ -207,6 +208,9 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
           slice = (0, _misc.transformSliceRemoveCellBackgroundColor)(slice, schema);
         }
         slice = (0, _transforms.transformSliceToRemoveOpenNestedExpand)(slice, schema);
+        if ((0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes')) {
+          slice = (0, _paste.transformSliceToRemoveNestedTables)(slice, schema, editorState.selection);
+        }
         return slice;
       },
       handleClick: function handleClick(_ref2, _pos, event) {

package/dist/cjs/pm-plugins/utils/paste.js

@@ -5,12 +5,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isHeaderRowRequired = isHeaderRowRequired;
-exports.unwrapContentFromTable = exports.transformSliceToRemoveOpenTable = exports.transformSliceToFixHardBreakProblemOnCopyFromCell = exports.transformSliceToCorrectEmptyTableCells = exports.transformSliceTableLayoutDefaultToCenter = exports.removeTableFromLastChild = exports.removeTableFromFirstChild = void 0;
+exports.unwrapContentFromTable = exports.transformSliceToRemoveOpenTable = exports.transformSliceToRemoveNestedTables = exports.transformSliceToFixHardBreakProblemOnCopyFromCell = exports.transformSliceToCorrectEmptyTableCells = exports.transformSliceTableLayoutDefaultToCenter = exports.removeTableFromLastChild = exports.removeTableFromFirstChild = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _nesting = require("@atlaskit/editor-common/nesting");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _pluginFactory = require("../plugin-factory");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -34,12 +36,112 @@ var unwrapContentFromTable = exports.unwrapContentFromTable = function unwrapCon
   }
   return maybeTable;
 };
+
+// Flattens nested tables after a given nesting depth
+// If this looks familiar, it's a heavily modified version of `mapFragment` which has been
+// adjusted to support tracking nesting depth. This wasn't possible by using `mapFragment` directly
+var unwrapNestedTables = function unwrapNestedTables(content, schema, unwrapNestDepth) {
+  var currentNestDepth = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  var flattenNested = function flattenNested(node, tableDepth) {
+    if (node.type === schema.nodes.table) {
+      if (tableDepth >= unwrapNestDepth) {
+        return unwrapContentFromTable(node);
+      }
+      return node;
+    }
+    return node;
+  };
+  var children = [];
+  for (var i = 0, size = content.childCount; i < size; i++) {
+    var node = content.child(i);
+    var transformed = node.isLeaf ? flattenNested(node, currentNestDepth) : flattenNested(node.copy(_model.Fragment.fromArray(unwrapNestedTables(node.content, schema, unwrapNestDepth, node.type === schema.nodes.table ? currentNestDepth + 1 : currentNestDepth))), currentNestDepth);
+    if (transformed) {
+      if (Array.isArray(transformed)) {
+        children.push.apply(children, (0, _toConsumableArray2.default)(transformed));
+      } else {
+        children.push(transformed);
+      }
+    }
+  }
+  return children;
+};
 var removeTableFromFirstChild = exports.removeTableFromFirstChild = function removeTableFromFirstChild(node, i) {
   return i === 0 ? unwrapContentFromTable(node) : node;
 };
 var removeTableFromLastChild = exports.removeTableFromLastChild = function removeTableFromLastChild(node, i, fragment) {
   return i === fragment.childCount - 1 ? unwrapContentFromTable(node) : node;
 };
+var transformSliceToRemoveNestedTables = exports.transformSliceToRemoveNestedTables = function transformSliceToRemoveNestedTables(slice, schema, selection) {
+  var isNestingAllowed = (0, _experiments.editorExperiment)('nested-tables-in-tables', true);
+  var _schema$nodes2 = schema.nodes,
+    table = _schema$nodes2.table,
+    tableCell = _schema$nodes2.tableCell,
+    tableHeader = _schema$nodes2.tableHeader;
+  var openEnd = slice.openEnd;
+  var newFragment = (0, _utils.flatmap)(slice.content, function (node, i, fragment) {
+    // if pasted content is a node that supports nesting a table
+    // such as layoutSection or expand allow 1 level by default
+    var allowedTableNesting = 1;
+    if (isNestingAllowed) {
+      var _slice$content$firstC, _slice$content$lastCh;
+      var isPasteInTable = (0, _utils2.hasParentNodeOfType)([table, tableCell, tableHeader])(selection);
+      var isPasteInNestedTable = (0, _nesting.getParentOfTypeCount)(schema.nodes.table)(selection.$from) > 1;
+      var isCellPaste = isPasteInTable && slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === table;
+
+      // if nesting is allowed we bump up the default nesting allowance to 2 to support
+      // two levels of nesting in nodes that support table nesting already such as layoutSection and expands
+      allowedTableNesting = 2;
+
+      // however if pasted content is a table, allow just one level
+      if (node.type === schema.nodes.table) {
+        allowedTableNesting = 1;
+
+        // if paste is inside a table, allow no further nesting
+        if (isPasteInTable) {
+          allowedTableNesting = 0;
+        }
+
+        // unless we are pasting inside a nested table, then bounce back to 1 level
+        // because editor-plugin-paste will lift the table to the parent table (just below it)
+        if (isPasteInNestedTable) {
+          allowedTableNesting = 1;
+        }
+
+        // paste of table cells into a table cell - content is spread across multiple cells
+        // by editor-tables so needs to be treated a little differently
+        if (isCellPaste) {
+          allowedTableNesting = 1;
+          if (isPasteInNestedTable) {
+            allowedTableNesting = 0;
+          }
+        }
+      }
+
+      // Prevent invalid openEnd after pasting tables with a selection that ends inside a nested table cell.
+      // If the slice ends with a selection that ends inside a nested table, and we paste inside a table we
+      // need to adjust the openEnd because it is no longer correct. If we don't, Prosemirror fires an exception
+      // because it iterates to a non-existent depth and the transform will not be applied
+      if (slice.openEnd >= 7 &&
+      // depth of a nested table cell
+      slice.content.childCount > 1 && ((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.type) === table && isPasteInTable) {
+        // re-point the slice's openEnd to non-nested table cell depth
+        openEnd = 4;
+      }
+    } else {
+      // for layouts and expands, we start with 1 level of nesting as set above
+
+      // if pasted content is a table, don't allow further nesting
+      if (node.type === schema.nodes.table) {
+        allowedTableNesting = 0;
+      }
+    }
+
+    // after we've worked out what the allowed nesting depth is, unwrap nested tables
+    var newChildren = unwrapNestedTables(node.content, schema, allowedTableNesting);
+    return node.copy(_model.Fragment.fromArray(newChildren));
+  });
+  return new _model.Slice(newFragment, slice.openStart, openEnd);
+};
 
 /**
  * When we copy from a table cell with a hardBreak at the end,
@@ -47,10 +149,10 @@ var removeTableFromLastChild = exports.removeTableFromLastChild = function remov
  * This code will look for that pattern and fix it.
  */
 var transformSliceToFixHardBreakProblemOnCopyFromCell = exports.transformSliceToFixHardBreakProblemOnCopyFromCell = function transformSliceToFixHardBreakProblemOnCopyFromCell(slice, schema) {
-  var _schema$nodes2 = schema.nodes,
-    paragraph = _schema$nodes2.paragraph,
-    table = _schema$nodes2.table,
-    hardBreak = _schema$nodes2.hardBreak;
+  var _schema$nodes3 = schema.nodes,
+    paragraph = _schema$nodes3.paragraph,
+    table = _schema$nodes3.table,
+    hardBreak = _schema$nodes3.hardBreak;
   var emptyParagraphNode = paragraph.createAndFill();
   var hardBreakNode = hardBreak === null || hardBreak === void 0 ? void 0 : hardBreak.createAndFill();
   var paragraphNodeSize = emptyParagraphNode ? emptyParagraphNode.nodeSize : 0;
@@ -67,7 +169,7 @@ var transformSliceToFixHardBreakProblemOnCopyFromCell = exports.transformSliceTo
   return slice;
 };
 var transformSliceToRemoveOpenTable = exports.transformSliceToRemoveOpenTable = function transformSliceToRemoveOpenTable(slice, schema) {
-  var _slice$content$firstC2;
+  var _slice$content$firstC3;
   // we're removing the table, tableRow and tableCell reducing the open depth by 3
   var depthDecrement = 3;
 
@@ -77,14 +179,14 @@ var transformSliceToRemoveOpenTable = exports.transformSliceToRemoveOpenTable =
   slice.openStart >= 4 && slice.openEnd >= 4 &&
   // slice is a table node
   slice.content.childCount === 1 && slice.content.firstChild.type === schema.nodes.table) {
-    var _slice$content$firstC;
+    var _slice$content$firstC2;
     // prosemirror-view has a bug that it duplicates table entry when selecting multiple paragraphs in a table cell.
     // https://github.com/ProseMirror/prosemirror/issues/1270
     // The structure becomes
     // table(genuine) > tableRow(genuine) > table(duplicated) > tableRow(duplicated) > tableCell/tableHeader(genuine) > contents(genuine)
     // As we are removing wrapping table anyway, we keep duplicated table and tableRow for simplicity
     var cleaned = slice;
-    if (((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 || (_slice$content$firstC = _slice$content$firstC.content) === null || _slice$content$firstC === void 0 || (_slice$content$firstC = _slice$content$firstC.firstChild) === null || _slice$content$firstC === void 0 || (_slice$content$firstC = _slice$content$firstC.content) === null || _slice$content$firstC === void 0 || (_slice$content$firstC = _slice$content$firstC.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === schema.nodes.table) {
+    if (((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 || (_slice$content$firstC2 = _slice$content$firstC2.content) === null || _slice$content$firstC2 === void 0 || (_slice$content$firstC2 = _slice$content$firstC2.firstChild) === null || _slice$content$firstC2 === void 0 || (_slice$content$firstC2 = _slice$content$firstC2.content) === null || _slice$content$firstC2 === void 0 || (_slice$content$firstC2 = _slice$content$firstC2.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type) === schema.nodes.table) {
       cleaned = new _model.Slice(slice.content.firstChild.content.firstChild.content, slice.openStart - 2, slice.openEnd - 2);
     }
     return new _model.Slice((0, _utils.flatmap)(cleaned.content, unwrapContentFromTable), cleaned.openStart - depthDecrement, cleaned.openEnd - depthDecrement);
@@ -95,7 +197,7 @@ var transformSliceToRemoveOpenTable = exports.transformSliceToRemoveOpenTable =
   // starts inside of a cell but ends outside of the starting table
   slice.openStart >= 4 &&
   // slice starts from a table node (and spans across more than one node)
-  slice.content.childCount > 1 && ((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type) === schema.nodes.table) {
+  slice.content.childCount > 1 && ((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type) === schema.nodes.table) {
     // repoint the slice's cutting depth so that cell content where the slice starts
     // does not get lifted out of the cell on paste
     return new _model.Slice(slice.content, 1, slice.openEnd);
@@ -103,9 +205,9 @@ var transformSliceToRemoveOpenTable = exports.transformSliceToRemoveOpenTable =
   return slice;
 };
 var transformSliceToCorrectEmptyTableCells = exports.transformSliceToCorrectEmptyTableCells = function transformSliceToCorrectEmptyTableCells(slice, schema) {
-  var _schema$nodes3 = schema.nodes,
-    tableCell = _schema$nodes3.tableCell,
-    tableHeader = _schema$nodes3.tableHeader;
+  var _schema$nodes4 = schema.nodes,
+    tableCell = _schema$nodes4.tableCell,
+    tableHeader = _schema$nodes4.tableHeader;
   return (0, _utils.mapSlice)(slice, function (node) {
     if (node && (node.type === tableCell || node.type === tableHeader) && !node.content.childCount) {
       return node.type.createAndFill(node.attrs) || node;

package/dist/es2019/pm-plugins/main.js

@@ -6,6 +6,7 @@ import { browser, closestElement } from '@atlaskit/editor-common/utils';
 import { findParentDomRefOfType, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables';
 import { findTable } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { lazyTableCellView, lazyTableHeaderView, lazyTableRowView, lazyTableView } from '../nodeviews/lazy-node-views';
 import { pluginKey as decorationsPluginKey } from '../pm-plugins/decorations/plugin';
 import { TableCssClassName as ClassName } from '../types';
@@ -18,7 +19,7 @@ import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
 import { fixTables, replaceSelectedTable } from './transforms';
 import { findControlsHoverDecoration, transformSliceToCorrectEmptyTableCells, transformSliceToFixHardBreakProblemOnCopyFromCell, transformSliceToRemoveOpenTable } from './utils';
-import { isHeaderRowRequired, transformSliceTableLayoutDefaultToCenter } from './utils/paste';
+import { isHeaderRowRequired, transformSliceTableLayoutDefaultToCenter, transformSliceToRemoveNestedTables } from './utils/paste';
 export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI, nodeViewPortalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, getIntl, fullWidthModeEnabled, previousFullWidthModeEnabled, dragAndDropEnabled, editorAnalyticsAPI, pluginInjectionApi, isTableScalingEnabled, shouldUseIncreasedScalingPercent, isCommentEditor, isChromelessEditor) => {
   var _accessibilityUtils;
   const state = createPluginState(dispatch, {
@@ -199,6 +200,9 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
           slice = transformSliceRemoveCellBackgroundColor(slice, schema);
         }
         slice = transformSliceToRemoveOpenNestedExpand(slice, schema);
+        if (fg('platform_editor_use_nested_table_pm_nodes')) {
+          slice = transformSliceToRemoveNestedTables(slice, schema, editorState.selection);
+        }
         return slice;
       },
       handleClick: ({

package/dist/es2019/pm-plugins/utils/paste.js

@@ -1,6 +1,8 @@
+import { getParentOfTypeCount } from '@atlaskit/editor-common/nesting';
 import { flatmap, mapChildren, mapSlice } from '@atlaskit/editor-common/utils';
-import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { flatten } from '@atlaskit/editor-prosemirror/utils';
+import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
+import { flatten, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getPluginState } from '../plugin-factory';
 
 // lifts up the content of each cell, returning an array of nodes
@@ -24,12 +26,112 @@ export const unwrapContentFromTable = maybeTable => {
   }
   return maybeTable;
 };
+
+// Flattens nested tables after a given nesting depth
+// If this looks familiar, it's a heavily modified version of `mapFragment` which has been
+// adjusted to support tracking nesting depth. This wasn't possible by using `mapFragment` directly
+const unwrapNestedTables = (content, schema, unwrapNestDepth, currentNestDepth = 0) => {
+  const flattenNested = (node, tableDepth) => {
+    if (node.type === schema.nodes.table) {
+      if (tableDepth >= unwrapNestDepth) {
+        return unwrapContentFromTable(node);
+      }
+      return node;
+    }
+    return node;
+  };
+  const children = [];
+  for (let i = 0, size = content.childCount; i < size; i++) {
+    const node = content.child(i);
+    const transformed = node.isLeaf ? flattenNested(node, currentNestDepth) : flattenNested(node.copy(Fragment.fromArray(unwrapNestedTables(node.content, schema, unwrapNestDepth, node.type === schema.nodes.table ? currentNestDepth + 1 : currentNestDepth))), currentNestDepth);
+    if (transformed) {
+      if (Array.isArray(transformed)) {
+        children.push(...transformed);
+      } else {
+        children.push(transformed);
+      }
+    }
+  }
+  return children;
+};
 export const removeTableFromFirstChild = (node, i) => {
   return i === 0 ? unwrapContentFromTable(node) : node;
 };
 export const removeTableFromLastChild = (node, i, fragment) => {
   return i === fragment.childCount - 1 ? unwrapContentFromTable(node) : node;
 };
+export const transformSliceToRemoveNestedTables = (slice, schema, selection) => {
+  const isNestingAllowed = editorExperiment('nested-tables-in-tables', true);
+  const {
+    table,
+    tableCell,
+    tableHeader
+  } = schema.nodes;
+  let openEnd = slice.openEnd;
+  const newFragment = flatmap(slice.content, (node, i, fragment) => {
+    // if pasted content is a node that supports nesting a table
+    // such as layoutSection or expand allow 1 level by default
+    let allowedTableNesting = 1;
+    if (isNestingAllowed) {
+      var _slice$content$firstC, _slice$content$lastCh;
+      const isPasteInTable = hasParentNodeOfType([table, tableCell, tableHeader])(selection);
+      const isPasteInNestedTable = getParentOfTypeCount(schema.nodes.table)(selection.$from) > 1;
+      const isCellPaste = isPasteInTable && slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === table;
+
+      // if nesting is allowed we bump up the default nesting allowance to 2 to support
+      // two levels of nesting in nodes that support table nesting already such as layoutSection and expands
+      allowedTableNesting = 2;
+
+      // however if pasted content is a table, allow just one level
+      if (node.type === schema.nodes.table) {
+        allowedTableNesting = 1;
+
+        // if paste is inside a table, allow no further nesting
+        if (isPasteInTable) {
+          allowedTableNesting = 0;
+        }
+
+        // unless we are pasting inside a nested table, then bounce back to 1 level
+        // because editor-plugin-paste will lift the table to the parent table (just below it)
+        if (isPasteInNestedTable) {
+          allowedTableNesting = 1;
+        }
+
+        // paste of table cells into a table cell - content is spread across multiple cells
+        // by editor-tables so needs to be treated a little differently
+        if (isCellPaste) {
+          allowedTableNesting = 1;
+          if (isPasteInNestedTable) {
+            allowedTableNesting = 0;
+          }
+        }
+      }
+
+      // Prevent invalid openEnd after pasting tables with a selection that ends inside a nested table cell.
+      // If the slice ends with a selection that ends inside a nested table, and we paste inside a table we
+      // need to adjust the openEnd because it is no longer correct. If we don't, Prosemirror fires an exception
+      // because it iterates to a non-existent depth and the transform will not be applied
+      if (slice.openEnd >= 7 &&
+      // depth of a nested table cell
+      slice.content.childCount > 1 && ((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.type) === table && isPasteInTable) {
+        // re-point the slice's openEnd to non-nested table cell depth
+        openEnd = 4;
+      }
+    } else {
+      // for layouts and expands, we start with 1 level of nesting as set above
+
+      // if pasted content is a table, don't allow further nesting
+      if (node.type === schema.nodes.table) {
+        allowedTableNesting = 0;
+      }
+    }
+
+    // after we've worked out what the allowed nesting depth is, unwrap nested tables
+    const newChildren = unwrapNestedTables(node.content, schema, allowedTableNesting);
+    return node.copy(Fragment.fromArray(newChildren));
+  });
+  return new Slice(newFragment, slice.openStart, openEnd);
+};
 
 /**
  * When we copy from a table cell with a hardBreak at the end,
@@ -58,7 +160,7 @@ export const transformSliceToFixHardBreakProblemOnCopyFromCell = (slice, schema)
   return slice;
 };
 export const transformSliceToRemoveOpenTable = (slice, schema) => {
-  var _slice$content$firstC6;
+  var _slice$content$firstC7;
   // we're removing the table, tableRow and tableCell reducing the open depth by 3
   const depthDecrement = 3;
 
@@ -68,14 +170,14 @@ export const transformSliceToRemoveOpenTable = (slice, schema) => {
   slice.openStart >= 4 && slice.openEnd >= 4 &&
   // slice is a table node
   slice.content.childCount === 1 && slice.content.firstChild.type === schema.nodes.table) {
-    var _slice$content$firstC, _slice$content$firstC2, _slice$content$firstC3, _slice$content$firstC4, _slice$content$firstC5;
+    var _slice$content$firstC2, _slice$content$firstC3, _slice$content$firstC4, _slice$content$firstC5, _slice$content$firstC6;
     // prosemirror-view has a bug that it duplicates table entry when selecting multiple paragraphs in a table cell.
     // https://github.com/ProseMirror/prosemirror/issues/1270
     // The structure becomes
     // table(genuine) > tableRow(genuine) > table(duplicated) > tableRow(duplicated) > tableCell/tableHeader(genuine) > contents(genuine)
     // As we are removing wrapping table anyway, we keep duplicated table and tableRow for simplicity
     let cleaned = slice;
-    if (((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : (_slice$content$firstC2 = _slice$content$firstC.content) === null || _slice$content$firstC2 === void 0 ? void 0 : (_slice$content$firstC3 = _slice$content$firstC2.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : (_slice$content$firstC4 = _slice$content$firstC3.content) === null || _slice$content$firstC4 === void 0 ? void 0 : (_slice$content$firstC5 = _slice$content$firstC4.firstChild) === null || _slice$content$firstC5 === void 0 ? void 0 : _slice$content$firstC5.type) === schema.nodes.table) {
+    if (((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : (_slice$content$firstC3 = _slice$content$firstC2.content) === null || _slice$content$firstC3 === void 0 ? void 0 : (_slice$content$firstC4 = _slice$content$firstC3.firstChild) === null || _slice$content$firstC4 === void 0 ? void 0 : (_slice$content$firstC5 = _slice$content$firstC4.content) === null || _slice$content$firstC5 === void 0 ? void 0 : (_slice$content$firstC6 = _slice$content$firstC5.firstChild) === null || _slice$content$firstC6 === void 0 ? void 0 : _slice$content$firstC6.type) === schema.nodes.table) {
       cleaned = new Slice(slice.content.firstChild.content.firstChild.content, slice.openStart - 2, slice.openEnd - 2);
     }
     return new Slice(flatmap(cleaned.content, unwrapContentFromTable), cleaned.openStart - depthDecrement, cleaned.openEnd - depthDecrement);
@@ -86,7 +188,7 @@ export const transformSliceToRemoveOpenTable = (slice, schema) => {
   // starts inside of a cell but ends outside of the starting table
   slice.openStart >= 4 &&
   // slice starts from a table node (and spans across more than one node)
-  slice.content.childCount > 1 && ((_slice$content$firstC6 = slice.content.firstChild) === null || _slice$content$firstC6 === void 0 ? void 0 : _slice$content$firstC6.type) === schema.nodes.table) {
+  slice.content.childCount > 1 && ((_slice$content$firstC7 = slice.content.firstChild) === null || _slice$content$firstC7 === void 0 ? void 0 : _slice$content$firstC7.type) === schema.nodes.table) {
     // repoint the slice's cutting depth so that cell content where the slice starts
     // does not get lifted out of the cell on paste
     return new Slice(slice.content, 1, slice.openEnd);

package/dist/esm/pm-plugins/main.js

@@ -9,6 +9,7 @@ import { browser, closestElement } from '@atlaskit/editor-common/utils';
 import { findParentDomRefOfType, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables';
 import { findTable } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { lazyTableCellView, lazyTableHeaderView, lazyTableRowView, lazyTableView } from '../nodeviews/lazy-node-views';
 import { pluginKey as decorationsPluginKey } from '../pm-plugins/decorations/plugin';
 import { TableCssClassName as ClassName } from '../types';
@@ -21,7 +22,7 @@ import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
 import { fixTables, replaceSelectedTable } from './transforms';
 import { findControlsHoverDecoration, transformSliceToCorrectEmptyTableCells, transformSliceToFixHardBreakProblemOnCopyFromCell, transformSliceToRemoveOpenTable } from './utils';
-import { isHeaderRowRequired, transformSliceTableLayoutDefaultToCenter } from './utils/paste';
+import { isHeaderRowRequired, transformSliceTableLayoutDefaultToCenter, transformSliceToRemoveNestedTables } from './utils/paste';
 export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, nodeViewPortalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, getIntl, fullWidthModeEnabled, previousFullWidthModeEnabled, dragAndDropEnabled, editorAnalyticsAPI, pluginInjectionApi, isTableScalingEnabled, shouldUseIncreasedScalingPercent, isCommentEditor, isChromelessEditor) {
   var _accessibilityUtils;
   var state = createPluginState(dispatch, _objectSpread(_objectSpread(_objectSpread({
@@ -200,6 +201,9 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
           slice = transformSliceRemoveCellBackgroundColor(slice, schema);
         }
         slice = transformSliceToRemoveOpenNestedExpand(slice, schema);
+        if (fg('platform_editor_use_nested_table_pm_nodes')) {
+          slice = transformSliceToRemoveNestedTables(slice, schema, editorState.selection);
+        }
         return slice;
       },
       handleClick: function handleClick(_ref2, _pos, event) {

package/dist/esm/pm-plugins/utils/paste.js

@@ -2,9 +2,11 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { getParentOfTypeCount } from '@atlaskit/editor-common/nesting';
 import { flatmap, mapChildren, mapSlice } from '@atlaskit/editor-common/utils';
-import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { flatten } from '@atlaskit/editor-prosemirror/utils';
+import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
+import { flatten, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getPluginState } from '../plugin-factory';
 
 // lifts up the content of each cell, returning an array of nodes
@@ -27,12 +29,112 @@ export var unwrapContentFromTable = function unwrapContentFromTable(maybeTable)
   }
   return maybeTable;
 };
+
+// Flattens nested tables after a given nesting depth
+// If this looks familiar, it's a heavily modified version of `mapFragment` which has been
+// adjusted to support tracking nesting depth. This wasn't possible by using `mapFragment` directly
+var unwrapNestedTables = function unwrapNestedTables(content, schema, unwrapNestDepth) {
+  var currentNestDepth = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  var flattenNested = function flattenNested(node, tableDepth) {
+    if (node.type === schema.nodes.table) {
+      if (tableDepth >= unwrapNestDepth) {
+        return unwrapContentFromTable(node);
+      }
+      return node;
+    }
+    return node;
+  };
+  var children = [];
+  for (var i = 0, size = content.childCount; i < size; i++) {
+    var node = content.child(i);
+    var transformed = node.isLeaf ? flattenNested(node, currentNestDepth) : flattenNested(node.copy(Fragment.fromArray(unwrapNestedTables(node.content, schema, unwrapNestDepth, node.type === schema.nodes.table ? currentNestDepth + 1 : currentNestDepth))), currentNestDepth);
+    if (transformed) {
+      if (Array.isArray(transformed)) {
+        children.push.apply(children, _toConsumableArray(transformed));
+      } else {
+        children.push(transformed);
+      }
+    }
+  }
+  return children;
+};
 export var removeTableFromFirstChild = function removeTableFromFirstChild(node, i) {
   return i === 0 ? unwrapContentFromTable(node) : node;
 };
 export var removeTableFromLastChild = function removeTableFromLastChild(node, i, fragment) {
   return i === fragment.childCount - 1 ? unwrapContentFromTable(node) : node;
 };
+export var transformSliceToRemoveNestedTables = function transformSliceToRemoveNestedTables(slice, schema, selection) {
+  var isNestingAllowed = editorExperiment('nested-tables-in-tables', true);
+  var _schema$nodes2 = schema.nodes,
+    table = _schema$nodes2.table,
+    tableCell = _schema$nodes2.tableCell,
+    tableHeader = _schema$nodes2.tableHeader;
+  var openEnd = slice.openEnd;
+  var newFragment = flatmap(slice.content, function (node, i, fragment) {
+    // if pasted content is a node that supports nesting a table
+    // such as layoutSection or expand allow 1 level by default
+    var allowedTableNesting = 1;
+    if (isNestingAllowed) {
+      var _slice$content$firstC, _slice$content$lastCh;
+      var isPasteInTable = hasParentNodeOfType([table, tableCell, tableHeader])(selection);
+      var isPasteInNestedTable = getParentOfTypeCount(schema.nodes.table)(selection.$from) > 1;
+      var isCellPaste = isPasteInTable && slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === table;
+
+      // if nesting is allowed we bump up the default nesting allowance to 2 to support
+      // two levels of nesting in nodes that support table nesting already such as layoutSection and expands
+      allowedTableNesting = 2;
+
+      // however if pasted content is a table, allow just one level
+      if (node.type === schema.nodes.table) {
+        allowedTableNesting = 1;
+
+        // if paste is inside a table, allow no further nesting
+        if (isPasteInTable) {
+          allowedTableNesting = 0;
+        }
+
+        // unless we are pasting inside a nested table, then bounce back to 1 level
+        // because editor-plugin-paste will lift the table to the parent table (just below it)
+        if (isPasteInNestedTable) {
+          allowedTableNesting = 1;
+        }
+
+        // paste of table cells into a table cell - content is spread across multiple cells
+        // by editor-tables so needs to be treated a little differently
+        if (isCellPaste) {
+          allowedTableNesting = 1;
+          if (isPasteInNestedTable) {
+            allowedTableNesting = 0;
+          }
+        }
+      }
+
+      // Prevent invalid openEnd after pasting tables with a selection that ends inside a nested table cell.
+      // If the slice ends with a selection that ends inside a nested table, and we paste inside a table we
+      // need to adjust the openEnd because it is no longer correct. If we don't, Prosemirror fires an exception
+      // because it iterates to a non-existent depth and the transform will not be applied
+      if (slice.openEnd >= 7 &&
+      // depth of a nested table cell
+      slice.content.childCount > 1 && ((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.type) === table && isPasteInTable) {
+        // re-point the slice's openEnd to non-nested table cell depth
+        openEnd = 4;
+      }
+    } else {
+      // for layouts and expands, we start with 1 level of nesting as set above
+
+      // if pasted content is a table, don't allow further nesting
+      if (node.type === schema.nodes.table) {
+        allowedTableNesting = 0;
+      }
+    }
+
+    // after we've worked out what the allowed nesting depth is, unwrap nested tables
+    var newChildren = unwrapNestedTables(node.content, schema, allowedTableNesting);
+    return node.copy(Fragment.fromArray(newChildren));
+  });
+  return new Slice(newFragment, slice.openStart, openEnd);
+};
 
 /**
  * When we copy from a table cell with a hardBreak at the end,
@@ -40,10 +142,10 @@ export var removeTableFromLastChild = function removeTableFromLastChild(node, i,
  * This code will look for that pattern and fix it.
  */
 export var transformSliceToFixHardBreakProblemOnCopyFromCell = function transformSliceToFixHardBreakProblemOnCopyFromCell(slice, schema) {
-  var _schema$nodes2 = schema.nodes,
-    paragraph = _schema$nodes2.paragraph,
-    table = _schema$nodes2.table,
-    hardBreak = _schema$nodes2.hardBreak;
+  var _schema$nodes3 = schema.nodes,
+    paragraph = _schema$nodes3.paragraph,
+    table = _schema$nodes3.table,
+    hardBreak = _schema$nodes3.hardBreak;
   var emptyParagraphNode = paragraph.createAndFill();
   var hardBreakNode = hardBreak === null || hardBreak === void 0 ? void 0 : hardBreak.createAndFill();
   var paragraphNodeSize = emptyParagraphNode ? emptyParagraphNode.nodeSize : 0;
@@ -60,7 +162,7 @@ export var transformSliceToFixHardBreakProblemOnCopyFromCell = function transfor
   return slice;
 };
 export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpenTable(slice, schema) {
-  var _slice$content$firstC2;
+  var _slice$content$firstC3;
   // we're removing the table, tableRow and tableCell reducing the open depth by 3
   var depthDecrement = 3;
 
@@ -70,14 +172,14 @@ export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpen
   slice.openStart >= 4 && slice.openEnd >= 4 &&
   // slice is a table node
   slice.content.childCount === 1 && slice.content.firstChild.type === schema.nodes.table) {
-    var _slice$content$firstC;
+    var _slice$content$firstC2;
     // prosemirror-view has a bug that it duplicates table entry when selecting multiple paragraphs in a table cell.
     // https://github.com/ProseMirror/prosemirror/issues/1270
     // The structure becomes
     // table(genuine) > tableRow(genuine) > table(duplicated) > tableRow(duplicated) > tableCell/tableHeader(genuine) > contents(genuine)
     // As we are removing wrapping table anyway, we keep duplicated table and tableRow for simplicity
     var cleaned = slice;
-    if (((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 || (_slice$content$firstC = _slice$content$firstC.content) === null || _slice$content$firstC === void 0 || (_slice$content$firstC = _slice$content$firstC.firstChild) === null || _slice$content$firstC === void 0 || (_slice$content$firstC = _slice$content$firstC.content) === null || _slice$content$firstC === void 0 || (_slice$content$firstC = _slice$content$firstC.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === schema.nodes.table) {
+    if (((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 || (_slice$content$firstC2 = _slice$content$firstC2.content) === null || _slice$content$firstC2 === void 0 || (_slice$content$firstC2 = _slice$content$firstC2.firstChild) === null || _slice$content$firstC2 === void 0 || (_slice$content$firstC2 = _slice$content$firstC2.content) === null || _slice$content$firstC2 === void 0 || (_slice$content$firstC2 = _slice$content$firstC2.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type) === schema.nodes.table) {
       cleaned = new Slice(slice.content.firstChild.content.firstChild.content, slice.openStart - 2, slice.openEnd - 2);
     }
     return new Slice(flatmap(cleaned.content, unwrapContentFromTable), cleaned.openStart - depthDecrement, cleaned.openEnd - depthDecrement);
@@ -88,7 +190,7 @@ export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpen
   // starts inside of a cell but ends outside of the starting table
   slice.openStart >= 4 &&
   // slice starts from a table node (and spans across more than one node)
-  slice.content.childCount > 1 && ((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type) === schema.nodes.table) {
+  slice.content.childCount > 1 && ((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type) === schema.nodes.table) {
     // repoint the slice's cutting depth so that cell content where the slice starts
     // does not get lifted out of the cell on paste
     return new Slice(slice.content, 1, slice.openEnd);
@@ -96,9 +198,9 @@ export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpen
   return slice;
 };
 export var transformSliceToCorrectEmptyTableCells = function transformSliceToCorrectEmptyTableCells(slice, schema) {
-  var _schema$nodes3 = schema.nodes,
-    tableCell = _schema$nodes3.tableCell,
-    tableHeader = _schema$nodes3.tableHeader;
+  var _schema$nodes4 = schema.nodes,
+    tableCell = _schema$nodes4.tableCell,
+    tableHeader = _schema$nodes4.tableHeader;
   return mapSlice(slice, function (node) {
     if (node && (node.type === tableCell || node.type === tableHeader) && !node.content.childCount) {
       return node.type.createAndFill(node.attrs) || node;

package/dist/types/pm-plugins/utils/paste.d.ts

@@ -1,9 +1,10 @@
-import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { Schema } from '@atlaskit/editor-prosemirror/model';
+import { Slice, Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 export declare const unwrapContentFromTable: (maybeTable: PMNode) => PMNode | PMNode[];
 export declare const removeTableFromFirstChild: (node: PMNode, i: number) => PMNode | PMNode[];
 export declare const removeTableFromLastChild: (node: PMNode, i: number, fragment: Fragment) => PMNode | PMNode[];
+export declare const transformSliceToRemoveNestedTables: (slice: Slice, schema: Schema, selection: Selection) => Slice;
 /**
  * When we copy from a table cell with a hardBreak at the end,
  * the slice generated will come with a hardBreak outside of the table.

package/dist/types/tablePluginType.d.ts

@@ -43,8 +43,8 @@ export type TablePlugin = NextEditorPlugin<'table', {
         AnalyticsPlugin,
         ContentInsertionPlugin,
         WidthPlugin,
-        GuidelinePlugin,
         SelectionPlugin,
+        OptionalPlugin<GuidelinePlugin>,
         OptionalPlugin<BatchAttributeUpdatesPlugin>,
         OptionalPlugin<AccessibilityUtilsPlugin>,
         OptionalPlugin<MediaPlugin>,

package/dist/types/ui/TableFloatingColumnControls/ColumnControls/index.d.ts

@@ -58,14 +58,6 @@ export declare const ColumnControls: ({ editorView, tableActive, tableRef, hover
             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>];
         } & import("@atlaskit/editor-plugin-content-insertion").InsertNodeAPI, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
             sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
-        }, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
-            dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
-                sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
-            }, undefined>];
-            sharedState: import("@atlaskit/editor-common/guideline").GuidelinePluginState | null;
-            actions: {
-                displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
-            };
         }, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
             pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
             actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
@@ -73,7 +65,15 @@ export declare const ColumnControls: ({ editorView, tableActive, tableRef, hover
                 displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
             };
             sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
-        }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
+        }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
+            dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
+                sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
+            }, undefined>];
+            sharedState: import("@atlaskit/editor-common/guideline").GuidelinePluginState | null;
+            actions: {
+                displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
+            };
+        }, undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
             actions: {
                 batchSteps: import("@atlaskit/editor-plugin-batch-attribute-updates").BatchStepsAction;
             };

package/dist/types/ui/TableFloatingControls/CornerControls/DragCornerControls.d.ts

@@ -39,14 +39,6 @@ export declare const DragCornerControlsWithSelection: React.FC<import("react-int
             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>];
         } & import("@atlaskit/editor-plugin-content-insertion").InsertNodeAPI, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
             sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
-        }, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
-            dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
-                sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
-            }, undefined>];
-            sharedState: import("@atlaskit/editor-common/guideline").GuidelinePluginState | null;
-            actions: {
-                displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
-            };
         }, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
             pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
             actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
@@ -54,7 +46,15 @@ export declare const DragCornerControlsWithSelection: React.FC<import("react-int
                 displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
             };
             sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
-        }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
+        }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
+            dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
+                sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
+            }, undefined>];
+            sharedState: import("@atlaskit/editor-common/guideline").GuidelinePluginState | null;
+            actions: {
+                displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
+            };
+        }, undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
             actions: {
                 batchSteps: import("@atlaskit/editor-plugin-batch-attribute-updates").BatchStepsAction;
             };
@@ -125,14 +125,6 @@ export declare const DragCornerControlsWithSelection: React.FC<import("react-int
                 }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>];
             } & import("@atlaskit/editor-plugin-content-insertion").InsertNodeAPI, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
                 sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
-            }, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
-                dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
-                    sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
-                }, undefined>];
-                sharedState: import("@atlaskit/editor-common/guideline").GuidelinePluginState | null;
-                actions: {
-                    displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
-                };
             }, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
                 pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
                 actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
@@ -140,7 +132,15 @@ export declare const DragCornerControlsWithSelection: React.FC<import("react-int
                     displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
                 };
                 sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
-            }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
+            }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
+                dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
+                    sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
+                }, undefined>];
+                sharedState: import("@atlaskit/editor-common/guideline").GuidelinePluginState | null;
+                actions: {
+                    displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
+                };
+            }, undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
                 actions: {
                     batchSteps: import("@atlaskit/editor-plugin-batch-attribute-updates").BatchStepsAction;
                 };

package/dist/types/ui/TableFloatingControls/index.d.ts

@@ -68,14 +68,6 @@ export declare const TableFloatingControls: ({ editorView, tableRef, tableNode,
             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>];
         } & import("@atlaskit/editor-plugin-content-insertion").InsertNodeAPI, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
             sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
-        }, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
-            dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
-                sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
-            }, undefined>];
-            sharedState: import("@atlaskit/editor-common/guideline").GuidelinePluginState | null;
-            actions: {
-                displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
-            };
         }, undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
             pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
             actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
@@ -83,7 +75,15 @@ export declare const TableFloatingControls: ({ editorView, tableRef, tableNode,
                 displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
             };
             sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
-        }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
+        }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
+            dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
+                sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
+            }, undefined>];
+            sharedState: import("@atlaskit/editor-common/guideline").GuidelinePluginState | null;
+            actions: {
+                displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
+            };
+        }, undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
             actions: {
                 batchSteps: import("@atlaskit/editor-plugin-batch-attribute-updates").BatchStepsAction;
             };

package/dist/types-ts4.5/pm-plugins/utils/paste.d.ts

@@ -1,9 +1,10 @@
-import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { Schema } from '@atlaskit/editor-prosemirror/model';
+import { Slice, Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 export declare const unwrapContentFromTable: (maybeTable: PMNode) => PMNode | PMNode[];
 export declare const removeTableFromFirstChild: (node: PMNode, i: number) => PMNode | PMNode[];
 export declare const removeTableFromLastChild: (node: PMNode, i: number, fragment: Fragment) => PMNode | PMNode[];
+export declare const transformSliceToRemoveNestedTables: (slice: Slice, schema: Schema, selection: Selection) => Slice;
 /**
  * When we copy from a table cell with a hardBreak at the end,
  * the slice generated will come with a hardBreak outside of the table.

package/dist/types-ts4.5/tablePluginType.d.ts

@@ -43,8 +43,8 @@ export type TablePlugin = NextEditorPlugin<'table', {
         AnalyticsPlugin,
         ContentInsertionPlugin,
         WidthPlugin,
-        GuidelinePlugin,
         SelectionPlugin,
+        OptionalPlugin<GuidelinePlugin>,
         OptionalPlugin<BatchAttributeUpdatesPlugin>,
         OptionalPlugin<AccessibilityUtilsPlugin>,
         OptionalPlugin<MediaPlugin>,

package/dist/types-ts4.5/ui/TableFloatingColumnControls/ColumnControls/index.d.ts

@@ -68,7 +68,15 @@ export declare const ColumnControls: ({ editorView, tableActive, tableRef, hover
             import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
                 sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
             }, undefined>,
-            import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
+            import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
+                pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
+                actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
+                commands: {
+                    displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
+                };
+                sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
+            }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>,
+            import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
                 dependencies: [
                     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
                         sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
@@ -78,15 +86,7 @@ export declare const ColumnControls: ({ editorView, tableActive, tableRef, hover
                 actions: {
                     displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
                 };
-            }, undefined>,
-            import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
-                pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
-                actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
-                commands: {
-                    displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
-                };
-                sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
-            }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>,
+            }, undefined>>,
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
                 actions: {
                     batchSteps: import("@atlaskit/editor-plugin-batch-attribute-updates").BatchStepsAction;

package/dist/types-ts4.5/ui/TableFloatingControls/CornerControls/DragCornerControls.d.ts

@@ -49,7 +49,15 @@ export declare const DragCornerControlsWithSelection: React.FC<import("react-int
             import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
                 sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
             }, undefined>,
-            import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
+            import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
+                pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
+                actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
+                commands: {
+                    displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
+                };
+                sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
+            }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>,
+            import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
                 dependencies: [
                     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
                         sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
@@ -59,15 +67,7 @@ export declare const DragCornerControlsWithSelection: React.FC<import("react-int
                 actions: {
                     displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
                 };
-            }, undefined>,
-            import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
-                pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
-                actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
-                commands: {
-                    displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
-                };
-                sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
-            }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>,
+            }, undefined>>,
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
                 actions: {
                     batchSteps: import("@atlaskit/editor-plugin-batch-attribute-updates").BatchStepsAction;
@@ -156,7 +156,15 @@ export declare const DragCornerControlsWithSelection: React.FC<import("react-int
                 import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
                     sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
                 }, undefined>,
-                import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
+                import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
+                    pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
+                    actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
+                    commands: {
+                        displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
+                    };
+                    sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
+                }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>,
+                import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
                     dependencies: [
                         import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
                             sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
@@ -166,15 +174,7 @@ export declare const DragCornerControlsWithSelection: React.FC<import("react-int
                     actions: {
                         displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
                     };
-                }, undefined>,
-                import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
-                    pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
-                    actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
-                    commands: {
-                        displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
-                    };
-                    sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
-                }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>,
+                }, undefined>>,
                 import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
                     actions: {
                         batchSteps: import("@atlaskit/editor-plugin-batch-attribute-updates").BatchStepsAction;

package/dist/types-ts4.5/ui/TableFloatingControls/index.d.ts

@@ -78,7 +78,15 @@ export declare const TableFloatingControls: ({ editorView, tableRef, tableNode,
             import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
                 sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
             }, undefined>,
-            import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
+            import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
+                pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
+                actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
+                commands: {
+                    displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
+                };
+                sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
+            }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>,
+            import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"guideline", {
                 dependencies: [
                     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
                         sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
@@ -88,15 +96,7 @@ export declare const TableFloatingControls: ({ editorView, tableRef, tableNode,
                 actions: {
                     displayGuideline: import("@atlaskit/editor-common/guideline").DisplayGuideline;
                 };
-            }, undefined>,
-            import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
-                pluginConfiguration: import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined;
-                actions: import("@atlaskit/editor-plugin-selection").EditorSelectionAPI;
-                commands: {
-                    displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
-                };
-                sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
-            }, import("@atlaskit/editor-plugin-selection").SelectionPluginOptions | undefined>,
+            }, undefined>>,
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {
                 actions: {
                     batchSteps: import("@atlaskit/editor-plugin-batch-attribute-updates").BatchStepsAction;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "8.4.9",
+	"version": "8.4.11",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
 		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/button": "^20.3.0",
 		"@atlaskit/custom-steps": "^0.9.0",
-		"@atlaskit/editor-common": "^96.5.0",
+		"@atlaskit/editor-common": "^96.7.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
@@ -51,7 +51,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.27.0",
+		"@atlaskit/tmp-editor-statsig": "^2.29.0",
 		"@atlaskit/toggle": "^14.0.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@atlaskit/tooltip": "^19.0.0",

package/src/pm-plugins/main.ts

@@ -25,6 +25,7 @@ import { findParentDomRefOfType, findParentNodeOfType } from '@atlaskit/editor-p
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables';
 import { findTable } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 import {
 	lazyTableCellView,
@@ -73,7 +74,11 @@ import {
 	transformSliceToFixHardBreakProblemOnCopyFromCell,
 	transformSliceToRemoveOpenTable,
 } from './utils';
-import { isHeaderRowRequired, transformSliceTableLayoutDefaultToCenter } from './utils/paste';
+import {
+	isHeaderRowRequired,
+	transformSliceTableLayoutDefaultToCenter,
+	transformSliceToRemoveNestedTables,
+} from './utils/paste';
 
 export const createPlugin = (
 	dispatchAnalyticsEvent: DispatchAnalyticsEvent,
@@ -304,6 +309,10 @@ export const createPlugin = (
 
 				slice = transformSliceToRemoveOpenNestedExpand(slice, schema);
 
+				if (fg('platform_editor_use_nested_table_pm_nodes')) {
+					slice = transformSliceToRemoveNestedTables(slice, schema, editorState.selection);
+				}
+
 				return slice;
 			},
 			handleClick: ({ state, dispatch }, _pos, event: MouseEvent) => {

package/src/pm-plugins/utils/paste.ts

@@ -1,8 +1,10 @@
+import { getParentOfTypeCount } from '@atlaskit/editor-common/nesting';
 import { flatmap, mapChildren, mapSlice } from '@atlaskit/editor-common/utils';
-import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { flatten } from '@atlaskit/editor-prosemirror/utils';
+import type { Schema } from '@atlaskit/editor-prosemirror/model';
+import { Slice, Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
+import { flatten, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
 import { getPluginState } from '../plugin-factory';
 
@@ -23,6 +25,54 @@ export const unwrapContentFromTable = (maybeTable: PMNode): PMNode | PMNode[] =>
 	return maybeTable;
 };
 
+// Flattens nested tables after a given nesting depth
+// If this looks familiar, it's a heavily modified version of `mapFragment` which has been
+// adjusted to support tracking nesting depth. This wasn't possible by using `mapFragment` directly
+const unwrapNestedTables = (
+	content: Fragment,
+	schema: Schema,
+	unwrapNestDepth: number,
+	currentNestDepth = 0,
+): PMNode[] => {
+	const flattenNested = (node: PMNode, tableDepth: number) => {
+		if (node.type === schema.nodes.table) {
+			if (tableDepth >= unwrapNestDepth) {
+				return unwrapContentFromTable(node);
+			}
+			return node;
+		}
+		return node;
+	};
+
+	const children = [] as PMNode[];
+	for (let i = 0, size = content.childCount; i < size; i++) {
+		const node = content.child(i);
+		const transformed = node.isLeaf
+			? flattenNested(node, currentNestDepth)
+			: flattenNested(
+					node.copy(
+						Fragment.fromArray(
+							unwrapNestedTables(
+								node.content,
+								schema,
+								unwrapNestDepth,
+								node.type === schema.nodes.table ? currentNestDepth + 1 : currentNestDepth,
+							),
+						),
+					),
+					currentNestDepth,
+				);
+		if (transformed) {
+			if (Array.isArray(transformed)) {
+				children.push(...transformed);
+			} else {
+				children.push(transformed);
+			}
+		}
+	}
+	return children;
+};
+
 export const removeTableFromFirstChild = (node: PMNode, i: number): PMNode | PMNode[] => {
 	return i === 0 ? unwrapContentFromTable(node) : node;
 };
@@ -35,6 +85,87 @@ export const removeTableFromLastChild = (
 	return i === fragment.childCount - 1 ? unwrapContentFromTable(node) : node;
 };
 
+export const transformSliceToRemoveNestedTables = (
+	slice: Slice,
+	schema: Schema,
+	selection: Selection,
+): Slice => {
+	const isNestingAllowed = editorExperiment('nested-tables-in-tables', true);
+	const { table, tableCell, tableHeader } = schema.nodes;
+	let openEnd = slice.openEnd;
+
+	const newFragment = flatmap(slice.content, (node, i, fragment) => {
+		// if pasted content is a node that supports nesting a table
+		// such as layoutSection or expand allow 1 level by default
+		let allowedTableNesting = 1;
+
+		if (isNestingAllowed) {
+			const isPasteInTable = hasParentNodeOfType([table, tableCell, tableHeader])(selection);
+			const isPasteInNestedTable = getParentOfTypeCount(schema.nodes.table)(selection.$from) > 1;
+			const isCellPaste =
+				isPasteInTable &&
+				slice.content.childCount === 1 &&
+				slice.content.firstChild?.type === table;
+
+			// if nesting is allowed we bump up the default nesting allowance to 2 to support
+			// two levels of nesting in nodes that support table nesting already such as layoutSection and expands
+			allowedTableNesting = 2;
+
+			// however if pasted content is a table, allow just one level
+			if (node.type === schema.nodes.table) {
+				allowedTableNesting = 1;
+
+				// if paste is inside a table, allow no further nesting
+				if (isPasteInTable) {
+					allowedTableNesting = 0;
+				}
+
+				// unless we are pasting inside a nested table, then bounce back to 1 level
+				// because editor-plugin-paste will lift the table to the parent table (just below it)
+				if (isPasteInNestedTable) {
+					allowedTableNesting = 1;
+				}
+
+				// paste of table cells into a table cell - content is spread across multiple cells
+				// by editor-tables so needs to be treated a little differently
+				if (isCellPaste) {
+					allowedTableNesting = 1;
+					if (isPasteInNestedTable) {
+						allowedTableNesting = 0;
+					}
+				}
+			}
+
+			// Prevent invalid openEnd after pasting tables with a selection that ends inside a nested table cell.
+			// If the slice ends with a selection that ends inside a nested table, and we paste inside a table we
+			// need to adjust the openEnd because it is no longer correct. If we don't, Prosemirror fires an exception
+			// because it iterates to a non-existent depth and the transform will not be applied
+			if (
+				slice.openEnd >= 7 && // depth of a nested table cell
+				slice.content.childCount > 1 &&
+				slice.content.lastChild?.type === table &&
+				isPasteInTable
+			) {
+				// re-point the slice's openEnd to non-nested table cell depth
+				openEnd = 4;
+			}
+		} else {
+			// for layouts and expands, we start with 1 level of nesting as set above
+
+			// if pasted content is a table, don't allow further nesting
+			if (node.type === schema.nodes.table) {
+				allowedTableNesting = 0;
+			}
+		}
+
+		// after we've worked out what the allowed nesting depth is, unwrap nested tables
+		const newChildren = unwrapNestedTables(node.content, schema, allowedTableNesting);
+		return node.copy(Fragment.fromArray(newChildren));
+	});
+
+	return new Slice(newFragment, slice.openStart, openEnd);
+};
+
 /**
  * When we copy from a table cell with a hardBreak at the end,
  * the slice generated will come with a hardBreak outside of the table.

package/src/tablePluginType.ts

@@ -67,8 +67,8 @@ export type TablePlugin = NextEditorPlugin<
 			AnalyticsPlugin,
 			ContentInsertionPlugin,
 			WidthPlugin,
-			GuidelinePlugin,
 			SelectionPlugin,
+			OptionalPlugin<GuidelinePlugin>,
 			OptionalPlugin<BatchAttributeUpdatesPlugin>,
 			OptionalPlugin<AccessibilityUtilsPlugin>,
 			OptionalPlugin<MediaPlugin>,