@atlaskit/editor-plugin-table 10.5.0 → 10.5.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-table
 
+## 10.5.2
+
+### Patch Changes
+
+- [#130115](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130115)
+  [`e60f1c02e9715`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e60f1c02e9715) -
+  Clean up feature flag platform_editor_table_drag_menu_mount_point_fix
+- Updated dependencies
+
+## 10.5.1
+
+### Patch Changes
+
+- [#130002](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130002)
+  [`e273880dffa90`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e273880dffa90) -
+  Clean up feature flag platform_editor_nested_table_in_nested_parent_fix
+
 ## 10.5.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/TableComponent.js

@@ -170,7 +170,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       var prevAttrs = prevNode.attrs;
       var isNested = (0, _nodes.isTableNested)(_this.props.view.state, _this.props.getPos());
       var parentWidth = _this.getParentNodeWidth();
-      if (isNested && (0, _nodes.isTableNestedInMoreThanOneNode)(_this.props.view.state, _this.props.getPos()) && (0, _platformFeatureFlags.fg)('platform_editor_nested_table_in_nested_parent_fix')) {
+      if (isNested && (0, _nodes.isTableNestedInMoreThanOneNode)(_this.props.view.state, _this.props.getPos())) {
         var resizeObsWrapperWidth = _this.wrapperWidth || 0;
         var wrapperWidthDiffBetweenRerenders = Math.abs(resizeObsWrapperWidth - (_this.state.parentWidth || 0));
         var isOusideOfThreshold = wrapperWidthDiffBetweenRerenders <= NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MIN_THRESHOLD || wrapperWidthDiffBetweenRerenders > NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MAX_THRESHOLD;
@@ -428,14 +428,15 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       if (isTableScalingEnabled && tableWithFixedColumnWidthsOption && getNode().attrs.displayMode !== 'fixed') {
         this.handleColgroupUpdates(true);
       }
-      if (this.wrapper && (0, _platformFeatureFlags.fg)('platform_editor_nested_table_in_nested_parent_fix')) {
+      if (this.wrapper) {
         this.wrapperReisizeObserver = new ResizeObserver(function (entries) {
           var _iterator2 = _createForOfIteratorHelper(entries),
             _step2;
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              var _entry$contentRect3;
               var entry = _step2.value;
-              _this2.wrapperWidth = entry.contentRect.width;
+              _this2.wrapperWidth = (_entry$contentRect3 = entry.contentRect) === null || _entry$contentRect3 === void 0 ? void 0 : _entry$contentRect3.width;
             }
           } catch (err) {
             _iterator2.e(err);

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

@@ -90,7 +90,8 @@ var transformSliceToRemoveNestedTables = exports.transformSliceToRemoveNestedTab
       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 && slice.openStart !== 0 && slice.openEnd !== 0;
+      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);
 
       // 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

package/dist/cjs/ui/FloatingDragMenu/DragMenu.js

@@ -23,7 +23,6 @@ var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils2 = require("@atlaskit/editor-tables/utils");
 var _paintBucketEditorBackgroundColor = _interopRequireDefault(require("@atlaskit/icon/core/migration/paint-bucket--editor-background-color"));
 var _paintBucket = _interopRequireDefault(require("@atlaskit/icon/core/paint-bucket"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _toggle = _interopRequireDefault(require("@atlaskit/toggle"));
 var _commands = require("../../pm-plugins/commands");
@@ -519,7 +518,6 @@ var DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
     fitHeight: fitHeight,
     fitWidth: fitWidth,
     direction: direction,
-    mountPoint: (0, _platformFeatureFlags.fg)('platform_editor_table_drag_menu_mount_point_fix') ? undefined : mountPoint,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement
   });

package/dist/es2019/nodeviews/TableComponent.js

@@ -158,7 +158,7 @@ class TableComponent extends React.Component {
       const prevAttrs = prevNode.attrs;
       const isNested = isTableNested(this.props.view.state, this.props.getPos());
       let parentWidth = this.getParentNodeWidth();
-      if (isNested && isTableNestedInMoreThanOneNode(this.props.view.state, this.props.getPos()) && fg('platform_editor_nested_table_in_nested_parent_fix')) {
+      if (isNested && isTableNestedInMoreThanOneNode(this.props.view.state, this.props.getPos())) {
         const resizeObsWrapperWidth = this.wrapperWidth || 0;
         const wrapperWidthDiffBetweenRerenders = Math.abs(resizeObsWrapperWidth - (this.state.parentWidth || 0));
         const isOusideOfThreshold = wrapperWidthDiffBetweenRerenders <= NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MIN_THRESHOLD || wrapperWidthDiffBetweenRerenders > NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MAX_THRESHOLD;
@@ -411,10 +411,11 @@ class TableComponent extends React.Component {
     if (isTableScalingEnabled && tableWithFixedColumnWidthsOption && getNode().attrs.displayMode !== 'fixed') {
       this.handleColgroupUpdates(true);
     }
-    if (this.wrapper && fg('platform_editor_nested_table_in_nested_parent_fix')) {
+    if (this.wrapper) {
       this.wrapperReisizeObserver = new ResizeObserver(entries => {
         for (const entry of entries) {
-          this.wrapperWidth = entry.contentRect.width;
+          var _entry$contentRect3;
+          this.wrapperWidth = (_entry$contentRect3 = entry.contentRect) === null || _entry$contentRect3 === void 0 ? void 0 : _entry$contentRect3.width;
         }
       });
       this.wrapperReisizeObserver.observe(this.wrapper);

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

@@ -80,7 +80,8 @@ export const transformSliceToRemoveNestedTables = (slice, schema, selection) =>
       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 && slice.openStart !== 0 && slice.openEnd !== 0;
+      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);
 
       // 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

package/dist/es2019/ui/FloatingDragMenu/DragMenu.js

@@ -21,7 +21,6 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellRectClosestToPos, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 import EditorBackgroundColorIcon from '@atlaskit/icon/core/migration/paint-bucket--editor-background-color';
 import PaintBucketIcon from '@atlaskit/icon/core/paint-bucket';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import Toggle from '@atlaskit/toggle';
 import { clearHoverSelection, hoverColumns, hoverRows } from '../../pm-plugins/commands';
@@ -518,7 +517,6 @@ const DragMenu = /*#__PURE__*/React.memo(({
     fitHeight: fitHeight,
     fitWidth: fitWidth,
     direction: direction,
-    mountPoint: fg('platform_editor_table_drag_menu_mount_point_fix') ? undefined : mountPoint,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement
   });

package/dist/esm/nodeviews/TableComponent.js

@@ -164,7 +164,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       var prevAttrs = prevNode.attrs;
       var isNested = isTableNested(_this.props.view.state, _this.props.getPos());
       var parentWidth = _this.getParentNodeWidth();
-      if (isNested && isTableNestedInMoreThanOneNode(_this.props.view.state, _this.props.getPos()) && fg('platform_editor_nested_table_in_nested_parent_fix')) {
+      if (isNested && isTableNestedInMoreThanOneNode(_this.props.view.state, _this.props.getPos())) {
         var resizeObsWrapperWidth = _this.wrapperWidth || 0;
         var wrapperWidthDiffBetweenRerenders = Math.abs(resizeObsWrapperWidth - (_this.state.parentWidth || 0));
         var isOusideOfThreshold = wrapperWidthDiffBetweenRerenders <= NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MIN_THRESHOLD || wrapperWidthDiffBetweenRerenders > NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MAX_THRESHOLD;
@@ -422,14 +422,15 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       if (isTableScalingEnabled && tableWithFixedColumnWidthsOption && getNode().attrs.displayMode !== 'fixed') {
         this.handleColgroupUpdates(true);
       }
-      if (this.wrapper && fg('platform_editor_nested_table_in_nested_parent_fix')) {
+      if (this.wrapper) {
         this.wrapperReisizeObserver = new ResizeObserver(function (entries) {
           var _iterator2 = _createForOfIteratorHelper(entries),
             _step2;
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              var _entry$contentRect3;
               var entry = _step2.value;
-              _this2.wrapperWidth = entry.contentRect.width;
+              _this2.wrapperWidth = (_entry$contentRect3 = entry.contentRect) === null || _entry$contentRect3 === void 0 ? void 0 : _entry$contentRect3.width;
             }
           } catch (err) {
             _iterator2.e(err);

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

@@ -83,7 +83,8 @@ export var transformSliceToRemoveNestedTables = function transformSliceToRemoveN
       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 && slice.openStart !== 0 && slice.openEnd !== 0;
+      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);
 
       // 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

package/dist/esm/ui/FloatingDragMenu/DragMenu.js

@@ -23,7 +23,6 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellRectClosestToPos, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 import EditorBackgroundColorIcon from '@atlaskit/icon/core/migration/paint-bucket--editor-background-color';
 import PaintBucketIcon from '@atlaskit/icon/core/paint-bucket';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import Toggle from '@atlaskit/toggle';
 import { clearHoverSelection, hoverColumns, hoverRows } from '../../pm-plugins/commands';
@@ -508,7 +507,6 @@ var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
     fitHeight: fitHeight,
     fitWidth: fitWidth,
     direction: direction,
-    mountPoint: fg('platform_editor_table_drag_menu_mount_point_fix') ? undefined : mountPoint,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement
   });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "10.5.0",
+	"version": "10.5.2",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,7 +32,7 @@
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/button": "^21.1.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^102.11.0",
+		"@atlaskit/editor-common": "^102.13.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.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.1.0",
+		"@atlaskit/tmp-editor-statsig": "^4.2.0",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@atlaskit/tooltip": "^20.0.0",
@@ -116,9 +116,6 @@
 		"platform_editor_batch_steps_table": {
 			"type": "boolean"
 		},
-		"platform_editor_nested_table_in_nested_parent_fix": {
-			"type": "boolean"
-		},
 		"platform-visual-refresh-icons": {
 			"type": "boolean"
 		},
@@ -129,9 +126,6 @@
 		"platform_editor_set_alignment_when_resized": {
 			"type": "boolean"
 		},
-		"platform_editor_table_drag_menu_mount_point_fix": {
-			"type": "boolean"
-		},
 		"platform_editor_table_overflow_in_full_width_fix": {
 			"type": "boolean"
 		},
@@ -194,6 +188,9 @@
 		},
 		"platform_editor_scroll_table_flickering_fix": {
 			"type": "boolean"
+		},
+		"platform_editor_paste_full_table_inside_empty_cell": {
+			"type": "boolean"
 		}
 	}
 }

package/src/nodeviews/TableComponent.tsx

@@ -286,10 +286,10 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 			this.handleColgroupUpdates(true);
 		}
 
-		if (this.wrapper && fg('platform_editor_nested_table_in_nested_parent_fix')) {
+		if (this.wrapper) {
 			this.wrapperReisizeObserver = new ResizeObserver((entries) => {
 				for (const entry of entries) {
-					this.wrapperWidth = entry.contentRect.width;
+					this.wrapperWidth = entry.contentRect?.width;
 				}
 			});
 
@@ -1193,8 +1193,7 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 
 		if (
 			isNested &&
-			isTableNestedInMoreThanOneNode(this.props.view.state, this.props.getPos()) &&
-			fg('platform_editor_nested_table_in_nested_parent_fix')
+			isTableNestedInMoreThanOneNode(this.props.view.state, this.props.getPos())
 		) {
 			const resizeObsWrapperWidth = this.wrapperWidth || 0;
 

package/src/pm-plugins/utils/drag-menu.tsx

@@ -183,13 +183,25 @@ export const getDragMenuConfig = (
 					{
 						label: 'above',
 						offset: 0,
-						icon: () => <TableRowAddAboveIcon LEGACY_fallbackIcon={AddRowAboveIcon} spacing={'spacious'} label={''}/>,
+						icon: () => (
+							<TableRowAddAboveIcon
+								LEGACY_fallbackIcon={AddRowAboveIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 						keymap: addRowBefore,
 					},
 					{
 						label: 'below',
 						offset: 1,
-						icon: () => <TableRowAddBelowIcon LEGACY_fallbackIcon={AddRowBelowIcon} spacing={'spacious'} label={''}/>,
+						icon: () => (
+							<TableRowAddBelowIcon
+								LEGACY_fallbackIcon={AddRowBelowIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 						keymap: addRowAfter,
 					},
 				]
@@ -197,13 +209,25 @@ export const getDragMenuConfig = (
 					{
 						label: 'left',
 						offset: 0,
-						icon: () => <TableColumnAddLeftIcon LEGACY_fallbackIcon={AddColLeftIcon} spacing={'spacious'} label={''}/>,
+						icon: () => (
+							<TableColumnAddLeftIcon
+								LEGACY_fallbackIcon={AddColLeftIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 						keymap: addColumnBefore,
 					},
 					{
 						label: 'right',
 						offset: 1,
-						icon: () => <TableColumnAddRightIcon LEGACY_fallbackIcon={AddColRightIcon} spacing={'spacious'} label={''}/>,
+						icon: () => (
+							<TableColumnAddRightIcon
+								LEGACY_fallbackIcon={AddColRightIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 						keymap: addColumnAfter,
 					},
 				];
@@ -212,7 +236,13 @@ export const getDragMenuConfig = (
 			? [
 					{
 						label: 'up',
-						icon: () => <TableRowMoveUpIcon LEGACY_fallbackIcon={ArrowUpIcon} spacing={'spacious'} label={''}/>,
+						icon: () => (
+							<TableRowMoveUpIcon
+								LEGACY_fallbackIcon={ArrowUpIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 						keymap: moveRowUp,
 						canMove: canMove('table-row', -1, tableMap?.height ?? 0, selection, selectionRect),
 						getOriginIndexes: getSelectedRowIndexes,
@@ -220,7 +250,13 @@ export const getDragMenuConfig = (
 					},
 					{
 						label: 'down',
-						icon: () => <TableRowMoveDownIcon LEGACY_fallbackIcon={ArrowDownIcon} spacing={'spacious'} label={''}/>,
+						icon: () => (
+							<TableRowMoveDownIcon
+								LEGACY_fallbackIcon={ArrowDownIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 						keymap: moveRowDown,
 						canMove: canMove('table-row', 1, tableMap?.height ?? 0, selection, selectionRect),
 						getOriginIndexes: getSelectedRowIndexes,
@@ -230,7 +266,13 @@ export const getDragMenuConfig = (
 			: [
 					{
 						label: 'left',
-						icon: () => <TableColumnMoveLeftIcon LEGACY_fallbackIcon={ArrowLeftIcon} spacing={'spacious'} label={''}/>,
+						icon: () => (
+							<TableColumnMoveLeftIcon
+								LEGACY_fallbackIcon={ArrowLeftIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 						keymap: moveColumnLeft,
 						canMove: canMove('table-column', -1, tableMap?.width ?? 0, selection, selectionRect),
 						getOriginIndexes: getSelectedColumnIndexes,
@@ -238,7 +280,13 @@ export const getDragMenuConfig = (
 					},
 					{
 						label: 'right',
-						icon: () => <TableColumnMoveRightIcon LEGACY_fallbackIcon={ArrowRightIcon} spacing={'spacious'} label={''}/>,
+						icon: () => (
+							<TableColumnMoveRightIcon
+								LEGACY_fallbackIcon={ArrowRightIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 						keymap: moveColumnRight,
 						canMove: canMove('table-column', 1, tableMap?.width ?? 0, selection, selectionRect),
 						getOriginIndexes: getSelectedColumnIndexes,
@@ -251,12 +299,24 @@ export const getDragMenuConfig = (
 					{
 						label: 'increasing',
 						order: SortOrder.ASC,
-						icon: () => <SortAscendingIcon LEGACY_fallbackIcon={HipchatChevronDoubleUpIcon} spacing={'spacious'} label={''}/>,
+						icon: () => (
+							<SortAscendingIcon
+								LEGACY_fallbackIcon={HipchatChevronDoubleUpIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 					},
 					{
 						label: 'decreasing',
 						order: SortOrder.DESC,
-						icon: () => <SortDescendingIcon LEGACY_fallbackIcon={HipchatChevronDoubleDownIcon} spacing={'spacious'} label={''}/>,
+						icon: () => (
+							<SortDescendingIcon
+								LEGACY_fallbackIcon={HipchatChevronDoubleDownIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 					},
 				]
 			: [];
@@ -329,7 +389,13 @@ export const getDragMenuConfig = (
 						}
 						return false;
 					},
-					icon: () => <TableColumnsDistributeIcon LEGACY_fallbackIcon={EditorLayoutThreeEqualIcon} spacing={'spacious'} label={''}/>,
+					icon: () => (
+						<TableColumnsDistributeIcon
+							LEGACY_fallbackIcon={EditorLayoutThreeEqualIcon}
+							spacing={'spacious'}
+							label={''}
+						/>
+					),
 				}
 			: undefined,
 		{
@@ -342,7 +408,9 @@ export const getDragMenuConfig = (
 				)(state, dispatch);
 				return true;
 			},
-			icon: () => <TableCellClearIcon LEGACY_fallbackIcon={CrossCircleIcon} spacing={'spacious'} label={''}/>,
+			icon: () => (
+				<TableCellClearIcon LEGACY_fallbackIcon={CrossCircleIcon} spacing={'spacious'} label={''} />
+			),
 			keymap: tooltip(backspace),
 		},
 		{
@@ -371,36 +439,49 @@ export const getDragMenuConfig = (
 				}
 				return true;
 			},
-			icon: direction === 'row' ? () => <TableRowDeleteIcon LEGACY_fallbackIcon={RemoveIcon} spacing={'spacious'} label={''}/> : () => <TableColumnDeleteIcon LEGACY_fallbackIcon={RemoveIcon} spacing={'spacious'} label={''}/>,
+			icon:
+				direction === 'row'
+					? () => (
+							<TableRowDeleteIcon
+								LEGACY_fallbackIcon={RemoveIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						)
+					: () => (
+							<TableColumnDeleteIcon
+								LEGACY_fallbackIcon={RemoveIcon}
+								spacing={'spacious'}
+								label={''}
+							/>
+						),
 			keymap: direction === 'row' ? tooltip(deleteRow) : tooltip(deleteColumn),
 		},
-		...moveOptions.map(
-			({ label, canMove, icon, keymap, getOriginIndexes, getTargetIndex }) => ({
-				id: `move_${direction}_${label}`,
-				title: `Move ${direction} ${label}`,
-				disabled: !canMove,
-				icon: icon,
-				onClick: (state: EditorState, dispatch?: CommandDispatch) => {
-					if (canMove) {
-						requestAnimationFrame(() => {
-							moveSourceWithAnalytics(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)(
-								INPUT_METHOD.TABLE_CONTEXT_MENU,
-								`table-${direction}`,
-								// Ignored via go/ees005
-								// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-								getOriginIndexes(selectionRect!),
-								// Ignored via go/ees005
-								// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-								getTargetIndex(selectionRect!),
-							)(editorView.state, editorView.dispatch);
-						});
-						return true;
-					}
-					return false;
-				},
-				keymap: keymap && tooltip(keymap),
-			}),
-		),
+		...moveOptions.map(({ label, canMove, icon, keymap, getOriginIndexes, getTargetIndex }) => ({
+			id: `move_${direction}_${label}`,
+			title: `Move ${direction} ${label}`,
+			disabled: !canMove,
+			icon: icon,
+			onClick: (state: EditorState, dispatch?: CommandDispatch) => {
+				if (canMove) {
+					requestAnimationFrame(() => {
+						moveSourceWithAnalytics(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)(
+							INPUT_METHOD.TABLE_CONTEXT_MENU,
+							`table-${direction}`,
+							// Ignored via go/ees005
+							// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+							getOriginIndexes(selectionRect!),
+							// Ignored via go/ees005
+							// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+							getTargetIndex(selectionRect!),
+						)(editorView.state, editorView.dispatch);
+					});
+					return true;
+				}
+				return false;
+			},
+			keymap: keymap && tooltip(keymap),
+		})),
 	];
 
 	const allConfigs = [...restConfigs];

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

@@ -106,12 +106,14 @@ export const transformSliceToRemoveNestedTables = (
 		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 &&
-				slice.openStart !== 0 &&
-				slice.openEnd !== 0;
+				(!isPasteFullTableInsideEmptyCellEnabled || (slice.openStart !== 0 && slice.openEnd !== 0));
 
 			// 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

package/src/ui/FloatingDragMenu/DragMenu.tsx

@@ -43,7 +43,6 @@ import {
 } from '@atlaskit/editor-tables/utils';
 import EditorBackgroundColorIcon from '@atlaskit/icon/core/migration/paint-bucket--editor-background-color';
 import PaintBucketIcon from '@atlaskit/icon/core/paint-bucket';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import Toggle from '@atlaskit/toggle';
 
@@ -636,7 +635,6 @@ const DragMenu = React.memo(
 				fitHeight={fitHeight}
 				fitWidth={fitWidth}
 				direction={direction}
-				mountPoint={fg('platform_editor_table_drag_menu_mount_point_fix') ? undefined : mountPoint}
 				boundariesElement={boundariesElement}
 				scrollableElement={scrollableElement}
 			/>

package/src/ui/toolbar.tsx

@@ -840,7 +840,13 @@ const getColumnSettingItems = (
 			id: 'editor.table.distributeColumns',
 			type: 'button',
 			title: formatMessage(messages.distributeColumns),
-			icon: () => <TableColumnsDistributeIcon LEGACY_fallbackIcon={DistributeColumnIcon} spacing={'spacious'} label={''}/>,
+			icon: () => (
+				<TableColumnsDistributeIcon
+					LEGACY_fallbackIcon={DistributeColumnIcon}
+					spacing={'spacious'}
+					label={''}
+				/>
+			),
 			onClick: (state, dispatch, view) =>
 				getDistributeConfig(
 					getEditorContainerWidth,