@atlaskit/editor-plugin-table 9.3.4 → 9.3.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-table
 
+## 9.3.5
+
+### Patch Changes
+
+- [#108813](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108813)
+  [`123953f8b2006`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/123953f8b2006) -
+  [ux] ED-26075 Unwrap content from nested table text block slices on paste
+
 ## 9.3.4
 
 ### Patch Changes

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

@@ -172,12 +172,58 @@ var transformSliceToFixHardBreakProblemOnCopyFromCell = exports.transformSliceTo
   }
   return slice;
 };
+var isNodeSingleCellTable = function isNodeSingleCellTable(node, schema) {
+  var _node$firstChild, _node$firstChild$firs, _node$firstChild$firs2;
+  return node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type) === schema.nodes.tableRow && node.firstChild.childCount === 1 && (((_node$firstChild$firs = node.firstChild.firstChild) === null || _node$firstChild$firs === void 0 ? void 0 : _node$firstChild$firs.type) === schema.nodes.tableCell || ((_node$firstChild$firs2 = node.firstChild.firstChild) === null || _node$firstChild$firs2 === void 0 ? void 0 : _node$firstChild$firs2.type) === schema.nodes.tableHeader);
+};
+var isFragmentSingleCellTable = function isFragmentSingleCellTable(fragment, schema) {
+  return fragment.childCount === 1 && fragment.firstChild !== null && isNodeSingleCellTable(fragment.firstChild, schema);
+};
+var containsTextBlockChildren = function containsTextBlockChildren(fragment, schema) {
+  var containsTextBlock = false;
+  fragment.forEach(function (node) {
+    if (node.isTextblock) {
+      containsTextBlock = true;
+    }
+  });
+  return containsTextBlock;
+};
 var transformSliceToRemoveOpenTable = exports.transformSliceToRemoveOpenTable = function transformSliceToRemoveOpenTable(slice, schema) {
-  var _slice$content$firstC3;
-  // we're removing the table, tableRow and tableCell reducing the open depth by 3
-  var depthDecrement = 3;
+  var _slice$content$firstC4;
+  if ((0, _platformFeatureFlags.fg)('platform_editor_nested_tables_paste_wrap_fix')) {
+    // Case 1: A slice of a textblock selection inside a nested table
+    // Prosemirror wraps nested textblock selections in their respective tables
+    // We are using `safeInsert` to paste nested tables, so we do not want to preserve this wrapping
+
+    // slice starts and ends inside a nested table at the same depth
+    if (slice.openStart >= 7 && slice.openEnd >= 7 && slice.openStart === slice.openEnd) {
+      var cleaned = slice;
+      var descendedDepth = 0;
+      var tableDepthDecrement = 2;
 
-  // Case 1: A slice entirely within a single CELL
+      // if the slice is a single cell table and contains cells with single cell tables, descend into it until we find textblock children
+      if (isFragmentSingleCellTable(slice.content, schema)) {
+        var _slice$content$firstC2;
+        (_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 || _slice$content$firstC2.descendants(function (node, _pos, parent) {
+          if (isNodeSingleCellTable(node, schema)) {
+            descendedDepth += tableDepthDecrement;
+          } else if (node.type === schema.nodes.table) {
+            return false;
+          } else if (containsTextBlockChildren(node.content, schema)) {
+            descendedDepth += tableDepthDecrement;
+            // create a new slice with the content of the textblock children and the depth of the nested tables subtracted
+            cleaned = new _model.Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
+            return false;
+          }
+        });
+      }
+      if (!cleaned.eq(slice)) {
+        return cleaned;
+      }
+    }
+  }
+
+  // Case 2: A slice entirely within a single CELL
   if (
   // starts and ends inside of a cell
   slice.openStart >= 4 && slice.openEnd >= 4 &&
@@ -186,25 +232,28 @@ var transformSliceToRemoveOpenTable = exports.transformSliceToRemoveOpenTable =
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   slice.content.firstChild.type === schema.nodes.table) {
-    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;
+
     // 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$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);
+    var _cleaned = slice;
+    if (((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.content) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.content) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.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);
+    return new _model.Slice((0, _utils.flatmap)(_cleaned.content, unwrapContentFromTable), _cleaned.openStart - depthDecrement, _cleaned.openEnd - depthDecrement);
   }
 
-  // Case 2: A slice starting within a CELL and ending outside the table
+  // Case 3: A slice starting within a CELL and ending outside the table
   if (
   // 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$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type) === schema.nodes.table) {
+  slice.content.childCount > 1 && ((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.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);

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

@@ -163,12 +163,58 @@ export const transformSliceToFixHardBreakProblemOnCopyFromCell = (slice, schema)
   }
   return slice;
 };
+const isNodeSingleCellTable = (node, schema) => {
+  var _node$firstChild, _node$firstChild$firs, _node$firstChild$firs2;
+  return node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type) === schema.nodes.tableRow && node.firstChild.childCount === 1 && (((_node$firstChild$firs = node.firstChild.firstChild) === null || _node$firstChild$firs === void 0 ? void 0 : _node$firstChild$firs.type) === schema.nodes.tableCell || ((_node$firstChild$firs2 = node.firstChild.firstChild) === null || _node$firstChild$firs2 === void 0 ? void 0 : _node$firstChild$firs2.type) === schema.nodes.tableHeader);
+};
+const isFragmentSingleCellTable = (fragment, schema) => {
+  return fragment.childCount === 1 && fragment.firstChild !== null && isNodeSingleCellTable(fragment.firstChild, schema);
+};
+const containsTextBlockChildren = (fragment, schema) => {
+  let containsTextBlock = false;
+  fragment.forEach(node => {
+    if (node.isTextblock) {
+      containsTextBlock = true;
+    }
+  });
+  return containsTextBlock;
+};
 export const transformSliceToRemoveOpenTable = (slice, schema) => {
-  var _slice$content$firstC7;
-  // we're removing the table, tableRow and tableCell reducing the open depth by 3
-  const depthDecrement = 3;
+  var _slice$content$firstC8;
+  if (fg('platform_editor_nested_tables_paste_wrap_fix')) {
+    // Case 1: A slice of a textblock selection inside a nested table
+    // Prosemirror wraps nested textblock selections in their respective tables
+    // We are using `safeInsert` to paste nested tables, so we do not want to preserve this wrapping
+
+    // slice starts and ends inside a nested table at the same depth
+    if (slice.openStart >= 7 && slice.openEnd >= 7 && slice.openStart === slice.openEnd) {
+      let cleaned = slice;
+      let descendedDepth = 0;
+      const tableDepthDecrement = 2;
 
-  // Case 1: A slice entirely within a single CELL
+      // if the slice is a single cell table and contains cells with single cell tables, descend into it until we find textblock children
+      if (isFragmentSingleCellTable(slice.content, schema)) {
+        var _slice$content$firstC2;
+        (_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.descendants((node, _pos, parent) => {
+          if (isNodeSingleCellTable(node, schema)) {
+            descendedDepth += tableDepthDecrement;
+          } else if (node.type === schema.nodes.table) {
+            return false;
+          } else if (containsTextBlockChildren(node.content, schema)) {
+            descendedDepth += tableDepthDecrement;
+            // create a new slice with the content of the textblock children and the depth of the nested tables subtracted
+            cleaned = new Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
+            return false;
+          }
+        });
+      }
+      if (!cleaned.eq(slice)) {
+        return cleaned;
+      }
+    }
+  }
+
+  // Case 2: A slice entirely within a single CELL
   if (
   // starts and ends inside of a cell
   slice.openStart >= 4 && slice.openEnd >= 4 &&
@@ -177,25 +223,28 @@ export const transformSliceToRemoveOpenTable = (slice, schema) => {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   slice.content.firstChild.type === schema.nodes.table) {
-    var _slice$content$firstC2, _slice$content$firstC3, _slice$content$firstC4, _slice$content$firstC5, _slice$content$firstC6;
+    var _slice$content$firstC3, _slice$content$firstC4, _slice$content$firstC5, _slice$content$firstC6, _slice$content$firstC7;
+    // we're removing the table, tableRow and tableCell reducing the open depth by 3
+    const depthDecrement = 3;
+
     // 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$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) {
+    if (((_slice$content$firstC3 = slice.content.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$firstC6 = _slice$content$firstC5.content) === null || _slice$content$firstC6 === void 0 ? void 0 : (_slice$content$firstC7 = _slice$content$firstC6.firstChild) === null || _slice$content$firstC7 === void 0 ? void 0 : _slice$content$firstC7.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);
   }
 
-  // Case 2: A slice starting within a CELL and ending outside the table
+  // Case 3: A slice starting within a CELL and ending outside the table
   if (
   // 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$firstC7 = slice.content.firstChild) === null || _slice$content$firstC7 === void 0 ? void 0 : _slice$content$firstC7.type) === schema.nodes.table) {
+  slice.content.childCount > 1 && ((_slice$content$firstC8 = slice.content.firstChild) === null || _slice$content$firstC8 === void 0 ? void 0 : _slice$content$firstC8.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/utils/paste.js

@@ -165,12 +165,58 @@ export var transformSliceToFixHardBreakProblemOnCopyFromCell = function transfor
   }
   return slice;
 };
+var isNodeSingleCellTable = function isNodeSingleCellTable(node, schema) {
+  var _node$firstChild, _node$firstChild$firs, _node$firstChild$firs2;
+  return node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.type) === schema.nodes.tableRow && node.firstChild.childCount === 1 && (((_node$firstChild$firs = node.firstChild.firstChild) === null || _node$firstChild$firs === void 0 ? void 0 : _node$firstChild$firs.type) === schema.nodes.tableCell || ((_node$firstChild$firs2 = node.firstChild.firstChild) === null || _node$firstChild$firs2 === void 0 ? void 0 : _node$firstChild$firs2.type) === schema.nodes.tableHeader);
+};
+var isFragmentSingleCellTable = function isFragmentSingleCellTable(fragment, schema) {
+  return fragment.childCount === 1 && fragment.firstChild !== null && isNodeSingleCellTable(fragment.firstChild, schema);
+};
+var containsTextBlockChildren = function containsTextBlockChildren(fragment, schema) {
+  var containsTextBlock = false;
+  fragment.forEach(function (node) {
+    if (node.isTextblock) {
+      containsTextBlock = true;
+    }
+  });
+  return containsTextBlock;
+};
 export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpenTable(slice, schema) {
-  var _slice$content$firstC3;
-  // we're removing the table, tableRow and tableCell reducing the open depth by 3
-  var depthDecrement = 3;
+  var _slice$content$firstC4;
+  if (fg('platform_editor_nested_tables_paste_wrap_fix')) {
+    // Case 1: A slice of a textblock selection inside a nested table
+    // Prosemirror wraps nested textblock selections in their respective tables
+    // We are using `safeInsert` to paste nested tables, so we do not want to preserve this wrapping
+
+    // slice starts and ends inside a nested table at the same depth
+    if (slice.openStart >= 7 && slice.openEnd >= 7 && slice.openStart === slice.openEnd) {
+      var cleaned = slice;
+      var descendedDepth = 0;
+      var tableDepthDecrement = 2;
 
-  // Case 1: A slice entirely within a single CELL
+      // if the slice is a single cell table and contains cells with single cell tables, descend into it until we find textblock children
+      if (isFragmentSingleCellTable(slice.content, schema)) {
+        var _slice$content$firstC2;
+        (_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 || _slice$content$firstC2.descendants(function (node, _pos, parent) {
+          if (isNodeSingleCellTable(node, schema)) {
+            descendedDepth += tableDepthDecrement;
+          } else if (node.type === schema.nodes.table) {
+            return false;
+          } else if (containsTextBlockChildren(node.content, schema)) {
+            descendedDepth += tableDepthDecrement;
+            // create a new slice with the content of the textblock children and the depth of the nested tables subtracted
+            cleaned = new Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
+            return false;
+          }
+        });
+      }
+      if (!cleaned.eq(slice)) {
+        return cleaned;
+      }
+    }
+  }
+
+  // Case 2: A slice entirely within a single CELL
   if (
   // starts and ends inside of a cell
   slice.openStart >= 4 && slice.openEnd >= 4 &&
@@ -179,25 +225,28 @@ export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpen
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   slice.content.firstChild.type === schema.nodes.table) {
-    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;
+
     // 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$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);
+    var _cleaned = slice;
+    if (((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.content) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.content) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.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);
+    return new Slice(flatmap(_cleaned.content, unwrapContentFromTable), _cleaned.openStart - depthDecrement, _cleaned.openEnd - depthDecrement);
   }
 
-  // Case 2: A slice starting within a CELL and ending outside the table
+  // Case 3: A slice starting within a CELL and ending outside the table
   if (
   // 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$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type) === schema.nodes.table) {
+  slice.content.childCount > 1 && ((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "9.3.4",
+	"version": "9.3.5",
 	"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.5.0",
 		"@atlaskit/custom-steps": "^0.9.0",
-		"@atlaskit/editor-common": "^99.8.0",
+		"@atlaskit/editor-common": "^99.9.0",
 		"@atlaskit/editor-palette": "1.7.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.11.0",
@@ -43,7 +43,7 @@
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^23.6.0",
+		"@atlaskit/icon": "^23.7.0",
 		"@atlaskit/menu": "^2.14.0",
 		"@atlaskit/platform-feature-flags": "^1.0.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
@@ -51,7 +51,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
 		"@atlaskit/primitives": "^13.4.0",
 		"@atlaskit/theme": "^14.1.0",
-		"@atlaskit/tmp-editor-statsig": "^2.42.0",
+		"@atlaskit/tmp-editor-statsig": "^2.43.0",
 		"@atlaskit/toggle": "^14.1.0",
 		"@atlaskit/tokens": "^3.3.0",
 		"@atlaskit/tooltip": "^19.1.0",
@@ -144,6 +144,9 @@
 		"platform_editor_nested_tables_resizing": {
 			"type": "boolean"
 		},
+		"platform_editor_nested_tables_paste_wrap_fix": {
+			"type": "boolean"
+		},
 		"platform_editor_table_layout_shift_fix": {
 			"type": "boolean"
 		}

package/src/nodeviews/toDOM.ts

@@ -145,7 +145,9 @@ export const tableNodeSpecWithFixedToDOM = (config: Config): NodeSpec => {
 								'--ak-editor-table-min-width': `${tableMinWidth}px`,
 								minWidth: 'var(--ak-editor-table-min-width)',
 								maxWidth: `min(calc(100cqw - var(--ak-editor-table-gutter-padding)), var(--ak-editor-table-max-width))`,
-								width: fg('platform_editor_table_layout_shift_fix') ? `min(calc(100cqw - var(--ak-editor-table-gutter-padding)), ${node.attrs.width}px)` : `min(calc(100cqw - var(--ak-editor-table-gutter-padding)), ${node.attrs.width})`,
+								width: fg('platform_editor_table_layout_shift_fix')
+									? `min(calc(100cqw - var(--ak-editor-table-gutter-padding)), ${node.attrs.width}px)`
+									: `min(calc(100cqw - var(--ak-editor-table-gutter-padding)), ${node.attrs.width})`,
 							}),
 						},
 						[

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

@@ -211,11 +211,75 @@ export const transformSliceToFixHardBreakProblemOnCopyFromCell = (
 	return slice;
 };
 
+const isNodeSingleCellTable = (node: PMNode, schema: Schema): boolean => {
+	return (
+		node.childCount === 1 &&
+		node.firstChild?.type === schema.nodes.tableRow &&
+		node.firstChild.childCount === 1 &&
+		(node.firstChild.firstChild?.type === schema.nodes.tableCell ||
+			node.firstChild.firstChild?.type === schema.nodes.tableHeader)
+	);
+};
+
+const isFragmentSingleCellTable = (fragment: Fragment, schema: Schema): boolean => {
+	return (
+		fragment.childCount === 1 &&
+		fragment.firstChild !== null &&
+		isNodeSingleCellTable(fragment.firstChild, schema)
+	);
+};
+
+const containsTextBlockChildren = (fragment: Fragment, schema: Schema): boolean => {
+	let containsTextBlock = false;
+
+	fragment.forEach((node) => {
+		if (node.isTextblock) {
+			containsTextBlock = true;
+		}
+	});
+
+	return containsTextBlock;
+};
+
 export const transformSliceToRemoveOpenTable = (slice: Slice, schema: Schema): Slice => {
-	// we're removing the table, tableRow and tableCell reducing the open depth by 3
-	const depthDecrement = 3;
+	if (fg('platform_editor_nested_tables_paste_wrap_fix')) {
+		// Case 1: A slice of a textblock selection inside a nested table
+		// Prosemirror wraps nested textblock selections in their respective tables
+		// We are using `safeInsert` to paste nested tables, so we do not want to preserve this wrapping
+
+		// slice starts and ends inside a nested table at the same depth
+		if (slice.openStart >= 7 && slice.openEnd >= 7 && slice.openStart === slice.openEnd) {
+			let cleaned = slice;
+			let descendedDepth = 0;
+			const tableDepthDecrement = 2;
+
+			// if the slice is a single cell table and contains cells with single cell tables, descend into it until we find textblock children
+			if (isFragmentSingleCellTable(slice.content, schema)) {
+				slice.content.firstChild?.descendants((node, _pos, parent) => {
+					if (isNodeSingleCellTable(node, schema)) {
+						descendedDepth += tableDepthDecrement;
+					} else if (node.type === schema.nodes.table) {
+						return false;
+					} else if (containsTextBlockChildren(node.content, schema)) {
+						descendedDepth += tableDepthDecrement;
+						// create a new slice with the content of the textblock children and the depth of the nested tables subtracted
+						cleaned = new Slice(
+							node.content,
+							slice.openStart - descendedDepth - tableDepthDecrement,
+							slice.openEnd - descendedDepth - tableDepthDecrement,
+						);
+						return false;
+					}
+				});
+			}
+
+			if (!cleaned.eq(slice)) {
+				return cleaned;
+			}
+		}
+	}
 
-	// Case 1: A slice entirely within a single CELL
+	// Case 2: A slice entirely within a single CELL
 	if (
 		// starts and ends inside of a cell
 		slice.openStart >= 4 &&
@@ -226,6 +290,9 @@ export const transformSliceToRemoveOpenTable = (slice: Slice, schema: Schema): S
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 		slice.content.firstChild!.type === schema.nodes.table
 	) {
+		// we're removing the table, tableRow and tableCell reducing the open depth by 3
+		const depthDecrement = 3;
+
 		// 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
@@ -250,7 +317,7 @@ export const transformSliceToRemoveOpenTable = (slice: Slice, schema: Schema): S
 		);
 	}
 
-	// Case 2: A slice starting within a CELL and ending outside the table
+	// Case 3: A slice starting within a CELL and ending outside the table
 	if (
 		// starts inside of a cell but ends outside of the starting table
 		slice.openStart >= 4 &&