@atlaskit/editor-plugin-table 10.5.6 → 10.5.8

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-table
 
+## 10.5.8
+
+### Patch Changes
+
+- [#134468](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/134468)
+  [`e312ec529d05a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e312ec529d05a) -
+  [ux] Apply hover decoration when hovering on copy/delete button on overflow menu
+- Updated dependencies
+
+## 10.5.7
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 10.5.6
 
 ### Patch Changes

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

@@ -12,6 +12,7 @@ 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 _editorTables = require("@atlaskit/editor-tables");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _pluginFactory = require("../plugin-factory");
@@ -81,16 +82,19 @@ var transformSliceToRemoveNestedTables = exports.transformSliceToRemoveNestedTab
     tableHeader = _schema$nodes2.tableHeader;
   var openEnd = slice.openEnd;
   var newFragment = (0, _utils.flatmap)(slice.content, function (node, i, fragment) {
+    var _slice$content$firstC;
     // 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 isPasteFullTableInsideEmptyCellEnabled = (0, _platformFeatureFlags.fg)('platform_editor_paste_full_table_inside_empty_cell');
-      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 && (!isPasteFullTableInsideEmptyCellEnabled || slice.openStart !== 0 && slice.openEnd !== 0);
+    var isCellSelection = selection instanceof _editorTables.CellSelection;
+    var isPasteInTable = (0, _utils2.hasParentNodeOfType)([table, tableCell, tableHeader])(selection);
+    var isPasteInNestedTable = (0, _nesting.getParentOfTypeCount)(schema.nodes.table)(selection.$from) > 1;
+    var isPasteFullTableInsideEmptyCellEnabled = (0, _platformFeatureFlags.fg)('platform_editor_paste_full_table_inside_empty_cell');
 
+    // Pasted content only contains a table and no other content
+    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 && (!isPasteFullTableInsideEmptyCellEnabled || slice.openStart !== 0 && slice.openEnd !== 0);
+    if (isNestingAllowed) {
+      var _slice$content$lastCh;
       // 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;
@@ -112,7 +116,7 @@ var transformSliceToRemoveNestedTables = exports.transformSliceToRemoveNestedTab
 
         // 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) {
+        if (isCellPaste || isCellSelection && (0, _platformFeatureFlags.fg)('platform_editor_nested_tables_cellselection_paste')) {
           allowedTableNesting = 1;
           if (isPasteInNestedTable) {
             allowedTableNesting = 0;
@@ -138,10 +142,14 @@ var transformSliceToRemoveNestedTables = exports.transformSliceToRemoveNestedTab
         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));
+    if (isCellSelection && !isCellPaste && (0, _platformFeatureFlags.fg)('platform_editor_nested_tables_cellselection_paste')) {
+      // if pasting into a cell selection, we need to flatten the parent table as well
+      return _unwrapNestedTables(_model.Fragment.fromArray([node]), schema, allowedTableNesting);
+    } else {
+      // 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);
 };

package/dist/cjs/ui/toolbar.js

@@ -454,6 +454,14 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
           }]
         };
         var isNestedTable = (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes') && (0, _nesting.isSelectionTableNestedInTable)(state);
+        var hoverTableProps = function hoverTableProps(isInDanger, isSelected) {
+          return (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_1') ? {
+            onMouseEnter: (0, _commands.hoverTable)(isInDanger, isSelected),
+            onMouseLeave: (0, _commands.clearHoverSelection)(),
+            onFocus: (0, _commands.hoverTable)(isInDanger, isSelected),
+            onBlur: (0, _commands.clearHoverSelection)()
+          } : undefined;
+        };
         return {
           title: 'Table floating controls',
           getDomRef: getDomRef,
@@ -498,7 +506,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
                   }
                 });
               }
-            }, {
+            }, _objectSpread({
               title: intl.formatMessage(_messages.default.copyToClipboard),
               onClick: function onClick() {
                 var _api$core, _api$floatingToolbar;
@@ -509,13 +517,13 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
               icon: (0, _react.jsx)(_copy.default, {
                 label: intl.formatMessage(_messages.default.copyToClipboard)
               })
-            }, {
+            }, hoverTableProps(false, true)), _objectSpread({
               title: intl.formatMessage(_messages.default.delete),
               onClick: (0, _commandsWithAnalytics.deleteTableWithAnalytics)(editorAnalyticsAPI),
               icon: (0, _react.jsx)(_deleteEditorRemove.default, {
                 label: intl.formatMessage(_messages.default.delete)
               })
-            }]
+            }, hoverTableProps(true))]
           }])),
           scrollable: true
         };

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

@@ -2,6 +2,7 @@ import { getParentOfTypeCount } from '@atlaskit/editor-common/nesting';
 import { flatmap, mapChildren, mapSlice } from '@atlaskit/editor-common/utils';
 import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { flatten, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { CellSelection } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getPluginState } from '../plugin-factory';
@@ -71,16 +72,19 @@ export const transformSliceToRemoveNestedTables = (slice, schema, selection) =>
   } = schema.nodes;
   let openEnd = slice.openEnd;
   const newFragment = flatmap(slice.content, (node, i, fragment) => {
+    var _slice$content$firstC;
     // 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 isPasteFullTableInsideEmptyCellEnabled = fg('platform_editor_paste_full_table_inside_empty_cell');
-      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 && (!isPasteFullTableInsideEmptyCellEnabled || slice.openStart !== 0 && slice.openEnd !== 0);
+    const isCellSelection = selection instanceof CellSelection;
+    const isPasteInTable = hasParentNodeOfType([table, tableCell, tableHeader])(selection);
+    const isPasteInNestedTable = getParentOfTypeCount(schema.nodes.table)(selection.$from) > 1;
+    const isPasteFullTableInsideEmptyCellEnabled = fg('platform_editor_paste_full_table_inside_empty_cell');
 
+    // Pasted content only contains a table and no other content
+    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 && (!isPasteFullTableInsideEmptyCellEnabled || slice.openStart !== 0 && slice.openEnd !== 0);
+    if (isNestingAllowed) {
+      var _slice$content$lastCh;
       // 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;
@@ -102,7 +106,7 @@ export const transformSliceToRemoveNestedTables = (slice, schema, selection) =>
 
         // 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) {
+        if (isCellPaste || isCellSelection && fg('platform_editor_nested_tables_cellselection_paste')) {
           allowedTableNesting = 1;
           if (isPasteInNestedTable) {
             allowedTableNesting = 0;
@@ -128,10 +132,14 @@ export const transformSliceToRemoveNestedTables = (slice, schema, selection) =>
         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));
+    if (isCellSelection && !isCellPaste && fg('platform_editor_nested_tables_cellselection_paste')) {
+      // if pasting into a cell selection, we need to flatten the parent table as well
+      return unwrapNestedTables(Fragment.fromArray([node]), schema, allowedTableNesting);
+    } else {
+      // 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);
 };

package/dist/es2019/ui/toolbar.js

@@ -426,6 +426,12 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
       }]
     };
     const isNestedTable = fg('platform_editor_use_nested_table_pm_nodes') && isSelectionTableNestedInTable(state);
+    const hoverTableProps = (isInDanger, isSelected) => fg('platform_editor_controls_patch_1') ? {
+      onMouseEnter: hoverTable(isInDanger, isSelected),
+      onMouseLeave: clearHoverSelection(),
+      onFocus: hoverTable(isInDanger, isSelected),
+      onBlur: clearHoverSelection()
+    } : undefined;
     return {
       title: 'Table floating controls',
       getDomRef,
@@ -480,13 +486,15 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
           },
           icon: jsx(CopyIcon, {
             label: intl.formatMessage(commonMessages.copyToClipboard)
-          })
+          }),
+          ...hoverTableProps(false, true)
         }, {
           title: intl.formatMessage(commonMessages.delete),
           onClick: deleteTableWithAnalytics(editorAnalyticsAPI),
           icon: jsx(DeleteIcon, {
             label: intl.formatMessage(commonMessages.delete)
-          })
+          }),
+          ...hoverTableProps(true)
         }]
       }])],
       scrollable: true

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

@@ -6,6 +6,7 @@ import { getParentOfTypeCount } from '@atlaskit/editor-common/nesting';
 import { flatmap, mapChildren, mapSlice } from '@atlaskit/editor-common/utils';
 import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { flatten, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { CellSelection } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getPluginState } from '../plugin-factory';
@@ -74,16 +75,19 @@ export var transformSliceToRemoveNestedTables = function transformSliceToRemoveN
     tableHeader = _schema$nodes2.tableHeader;
   var openEnd = slice.openEnd;
   var newFragment = flatmap(slice.content, function (node, i, fragment) {
+    var _slice$content$firstC;
     // 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 isPasteFullTableInsideEmptyCellEnabled = fg('platform_editor_paste_full_table_inside_empty_cell');
-      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 && (!isPasteFullTableInsideEmptyCellEnabled || slice.openStart !== 0 && slice.openEnd !== 0);
+    var isCellSelection = selection instanceof CellSelection;
+    var isPasteInTable = hasParentNodeOfType([table, tableCell, tableHeader])(selection);
+    var isPasteInNestedTable = getParentOfTypeCount(schema.nodes.table)(selection.$from) > 1;
+    var isPasteFullTableInsideEmptyCellEnabled = fg('platform_editor_paste_full_table_inside_empty_cell');
 
+    // Pasted content only contains a table and no other content
+    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 && (!isPasteFullTableInsideEmptyCellEnabled || slice.openStart !== 0 && slice.openEnd !== 0);
+    if (isNestingAllowed) {
+      var _slice$content$lastCh;
       // 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;
@@ -105,7 +109,7 @@ export var transformSliceToRemoveNestedTables = function transformSliceToRemoveN
 
         // 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) {
+        if (isCellPaste || isCellSelection && fg('platform_editor_nested_tables_cellselection_paste')) {
           allowedTableNesting = 1;
           if (isPasteInNestedTable) {
             allowedTableNesting = 0;
@@ -131,10 +135,14 @@ export var transformSliceToRemoveNestedTables = function transformSliceToRemoveN
         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));
+    if (isCellSelection && !isCellPaste && fg('platform_editor_nested_tables_cellselection_paste')) {
+      // if pasting into a cell selection, we need to flatten the parent table as well
+      return _unwrapNestedTables(Fragment.fromArray([node]), schema, allowedTableNesting);
+    } else {
+      // 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);
 };

package/dist/esm/ui/toolbar.js

@@ -446,6 +446,14 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
           }]
         };
         var isNestedTable = fg('platform_editor_use_nested_table_pm_nodes') && isSelectionTableNestedInTable(state);
+        var hoverTableProps = function hoverTableProps(isInDanger, isSelected) {
+          return fg('platform_editor_controls_patch_1') ? {
+            onMouseEnter: hoverTable(isInDanger, isSelected),
+            onMouseLeave: clearHoverSelection(),
+            onFocus: hoverTable(isInDanger, isSelected),
+            onBlur: clearHoverSelection()
+          } : undefined;
+        };
         return {
           title: 'Table floating controls',
           getDomRef: getDomRef,
@@ -490,7 +498,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
                   }
                 });
               }
-            }, {
+            }, _objectSpread({
               title: intl.formatMessage(commonMessages.copyToClipboard),
               onClick: function onClick() {
                 var _api$core, _api$floatingToolbar;
@@ -501,13 +509,13 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
               icon: jsx(CopyIcon, {
                 label: intl.formatMessage(commonMessages.copyToClipboard)
               })
-            }, {
+            }, hoverTableProps(false, true)), _objectSpread({
               title: intl.formatMessage(commonMessages.delete),
               onClick: deleteTableWithAnalytics(editorAnalyticsAPI),
               icon: jsx(DeleteIcon, {
                 label: intl.formatMessage(commonMessages.delete)
               })
-            }]
+            }, hoverTableProps(true))]
           }])),
           scrollable: true
         };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "10.5.6",
+	"version": "10.5.8",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,14 +32,14 @@
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/button": "^22.0.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^102.14.0",
+		"@atlaskit/editor-common": "^102.15.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-batch-attribute-updates": "^2.1.0",
 		"@atlaskit/editor-plugin-content-insertion": "^2.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^3.0.0",
-		"@atlaskit/editor-plugin-extension": "5.0.11",
+		"@atlaskit/editor-plugin-extension": "5.1.1",
 		"@atlaskit/editor-plugin-guideline": "^2.0.0",
 		"@atlaskit/editor-plugin-selection": "^2.1.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
 		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.4.0",
+		"@atlaskit/tmp-editor-statsig": "^4.6.0",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@atlaskit/tooltip": "^20.0.0",
@@ -191,6 +191,12 @@
 		},
 		"platform_editor_numbered_column_misalignment": {
 			"type": "boolean"
+		},
+		"platform_editor_nested_tables_cellselection_paste": {
+			"type": "boolean"
+		},
+		"platform_editor_controls_patch_1": {
+			"type": "boolean"
 		}
 	}
 }

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

@@ -4,6 +4,7 @@ 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 { CellSelection } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
@@ -100,19 +101,21 @@ export const transformSliceToRemoveNestedTables = (
 		// if pasted content is a node that supports nesting a table
 		// such as layoutSection or expand allow 1 level by default
 		let allowedTableNesting = 1;
+		const isCellSelection = selection instanceof CellSelection;
+		const isPasteInTable = hasParentNodeOfType([table, tableCell, tableHeader])(selection);
+		const isPasteInNestedTable = getParentOfTypeCount(schema.nodes.table)(selection.$from) > 1;
+		const isPasteFullTableInsideEmptyCellEnabled = fg(
+			'platform_editor_paste_full_table_inside_empty_cell',
+		);
 
-		if (isNestingAllowed) {
-			const isPasteInTable = hasParentNodeOfType([table, tableCell, tableHeader])(selection);
-			const isPasteInNestedTable = getParentOfTypeCount(schema.nodes.table)(selection.$from) > 1;
-			const isPasteFullTableInsideEmptyCellEnabled = fg(
-				'platform_editor_paste_full_table_inside_empty_cell',
-			);
-			const isCellPaste =
-				isPasteInTable &&
-				slice.content.childCount === 1 &&
-				slice.content.firstChild?.type === table &&
-				(!isPasteFullTableInsideEmptyCellEnabled || (slice.openStart !== 0 && slice.openEnd !== 0));
+		// Pasted content only contains a table and no other content
+		const isCellPaste =
+			isPasteInTable &&
+			slice.content.childCount === 1 &&
+			slice.content.firstChild?.type === table &&
+			(!isPasteFullTableInsideEmptyCellEnabled || (slice.openStart !== 0 && slice.openEnd !== 0));
 
+		if (isNestingAllowed) {
 			// 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;
@@ -134,7 +137,10 @@ export const transformSliceToRemoveNestedTables = (
 
 				// 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) {
+				if (
+					isCellPaste ||
+					(isCellSelection && fg('platform_editor_nested_tables_cellselection_paste'))
+				) {
 					allowedTableNesting = 1;
 					if (isPasteInNestedTable) {
 						allowedTableNesting = 0;
@@ -164,9 +170,18 @@ export const transformSliceToRemoveNestedTables = (
 			}
 		}
 
-		// 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));
+		if (
+			isCellSelection &&
+			!isCellPaste &&
+			fg('platform_editor_nested_tables_cellselection_paste')
+		) {
+			// if pasting into a cell selection, we need to flatten the parent table as well
+			return unwrapNestedTables(Fragment.fromArray([node]), schema, allowedTableNesting);
+		} else {
+			// 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);

package/src/ui/common-styles.ts

@@ -1146,14 +1146,16 @@ export const baseTableStyles = (props: { featureFlags?: FeatureFlags }) => css`
 	.${ClassName.ROW_CONTROLS_WRAPPER} {
 		position: absolute;
 		/* this is to fix the misalignment of the numbered column in live page view mode */
-		${props.featureFlags?.tableDragAndDrop && fg('platform_editor_numbered_column_misalignment') ? `
+		${props.featureFlags?.tableDragAndDrop && fg('platform_editor_numbered_column_misalignment')
+			? `
 			margin-top: ${tableMarginTop}px;
 			left: -${tableToolbarSize + 1}px;
-		` : `
+		`
+			: `
 			/* top of corner control is table margin top - corner control height + 1 pixel of table border. */
 			top: ${tableMarginTop - cornerControlHeight + 1}px;
 			left: -${tableToolbarSize}px;
-		` }
+		`}
 	}
 
 	.${ClassName.DRAG_ROW_CONTROLS_WRAPPER}.${ClassName.TABLE_LEFT_SHADOW},

package/src/ui/toolbar.tsx

@@ -634,6 +634,16 @@ export const getToolbarConfig =
 			const isNestedTable =
 				fg('platform_editor_use_nested_table_pm_nodes') && isSelectionTableNestedInTable(state);
 
+			const hoverTableProps = (isInDanger?: boolean, isSelected?: boolean) =>
+				fg('platform_editor_controls_patch_1')
+					? {
+							onMouseEnter: hoverTable(isInDanger, isSelected),
+							onMouseLeave: clearHoverSelection(),
+							onFocus: hoverTable(isInDanger, isSelected),
+							onBlur: clearHoverSelection(),
+						}
+					: undefined;
+
 			return {
 				title: 'Table floating controls',
 				getDomRef,
@@ -710,11 +720,13 @@ export const getToolbarConfig =
 												return true;
 											},
 											icon: <CopyIcon label={intl.formatMessage(commonMessages.copyToClipboard)} />,
+											...hoverTableProps(false, true),
 										},
 										{
 											title: intl.formatMessage(commonMessages.delete),
 											onClick: deleteTableWithAnalytics(editorAnalyticsAPI),
 											icon: <DeleteIcon label={intl.formatMessage(commonMessages.delete)} />,
+											...hoverTableProps(true),
 										},
 									],
 								},