@atlaskit/editor-plugin-table 10.4.4 → 10.4.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-table
 
+## 10.4.5
+
+### Patch Changes
+
+- [#127253](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/127253)
+  [`a2593d5c73ccb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a2593d5c73ccb) -
+  [ux] Table overflow menu on floating toolbar
+- Updated dependencies
+
 ## 10.4.4
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -44,6 +44,9 @@
         {
             "path": "../../editor-plugin-editor-viewmode/afm-cc/tsconfig.json"
         },
+        {
+            "path": "../../editor-plugin-extension/afm-cc/tsconfig.json"
+        },
         {
             "path": "../../editor-plugin-guideline/afm-cc/tsconfig.json"
         },

package/afm-jira/tsconfig.json

@@ -44,6 +44,9 @@
 		{
 			"path": "../../editor-plugin-editor-viewmode/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-extension/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-guideline/afm-jira/tsconfig.json"
 		},

package/afm-post-office/tsconfig.json

@@ -44,6 +44,9 @@
 		{
 			"path": "../../editor-plugin-editor-viewmode/afm-post-office/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-extension/afm-post-office/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-guideline/afm-post-office/tsconfig.json"
 		},

package/dist/cjs/nodeviews/TableRow.js

@@ -414,7 +414,7 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
     value: function shouldSticky() {
       if (
       // is Safari
-      navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome') && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_4')) {
+      navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome')) {
         var pos = this.getPos();
         if (typeof pos === 'number') {
           var $tableRowPos = this.view.state.doc.resolve(pos);

package/dist/cjs/ui/toolbar.js

@@ -12,8 +12,10 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _react = require("@emotion/react");
 var _customSteps = require("@atlaskit/custom-steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
+var _nesting = require("@atlaskit/editor-common/nesting");
 var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -24,6 +26,7 @@ var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _alignImageCenter = _interopRequireDefault(require("@atlaskit/icon/core/align-image-center"));
 var _alignImageLeft = _interopRequireDefault(require("@atlaskit/icon/core/align-image-left"));
+var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
 var _customize = _interopRequireDefault(require("@atlaskit/icon/core/customize"));
 var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
 var _tableColumnsDistribute = _interopRequireDefault(require("@atlaskit/icon/core/table-columns-distribute"));
@@ -454,6 +457,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
             onBlur: (0, _commands.clearHoverSelection)()
           }]
         };
+        var isNestedTable = (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes') && (0, _nesting.isSelectionTableNestedInTable)(state);
         return {
           title: 'Table floating controls',
           getDomRef: getDomRef,
@@ -464,16 +468,59 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
           },
           zIndex: _editorSharedStyles.akEditorFloatingPanelZIndex + 1,
           // Place the context menu slightly above the others
-          items: [menu, separator(menu.hidden)].concat((0, _toConsumableArray2.default)(alignmentMenu), [separator(alignmentMenu.length === 0)], (0, _toConsumableArray2.default)(cellItems), (0, _toConsumableArray2.default)(columnSettingsItems), (0, _toConsumableArray2.default)(colorPicker), [
-          // TODO: ED-26961 - editor controls to move to overflow menu
-          {
+          items: [menu, separator(menu.hidden)].concat((0, _toConsumableArray2.default)(alignmentMenu), [separator(alignmentMenu.length === 0)], (0, _toConsumableArray2.default)(cellItems), (0, _toConsumableArray2.default)(columnSettingsItems), (0, _toConsumableArray2.default)(colorPicker), (0, _toConsumableArray2.default)((0, _experiments.editorExperiment)('platform_editor_controls', 'control') ? [{
             type: 'extensions-placeholder',
             separator: 'end'
-          }], (0, _toConsumableArray2.default)((0, _experiments.editorExperiment)('platform_editor_controls', 'control') ? [copyButton, {
+          }, copyButton, {
             type: 'separator'
-          }, deleteButton] : [deleteButton, {
-            type: 'separator'
-          }, copyButton])),
+          }, deleteButton] : [{
+            type: 'overflow-dropdown',
+            dropdownWidth: 220,
+            options: [{
+              type: 'custom',
+              fallback: [],
+              render: function render(editorView, dropdownOptions) {
+                var _api$extension, _api$extension2, _api$extension3;
+                if (!editorView) {
+                  return null;
+                }
+                var extensionState = api === null || api === void 0 || (_api$extension = api.extension) === null || _api$extension === void 0 || (_api$extension = _api$extension.sharedState) === null || _api$extension === void 0 ? void 0 : _api$extension.currentState();
+                var extensionApi = api === null || api === void 0 || (_api$extension2 = api.extension) === null || _api$extension2 === void 0 ? void 0 : _api$extension2.actions.api();
+                if (!extensionApi || !(extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider)) {
+                  return null;
+                }
+                return (0, _react.jsx)(_floatingToolbar.DropdownMenuExtensionItems, {
+                  node: tableObject.node,
+                  editorView: editorView,
+                  extension: {
+                    extensionProvider: extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider ? Promise.resolve(extensionState.extensionProvider) : undefined,
+                    extensionApi: api === null || api === void 0 || (_api$extension3 = api.extension) === null || _api$extension3 === void 0 ? void 0 : _api$extension3.actions.api()
+                  },
+                  dropdownOptions: dropdownOptions,
+                  disabled: function disabled(key) {
+                    return isNestedTable && ['referentiality:connections', 'chart:insert-chart'].includes(key);
+                  }
+                });
+              }
+            }, {
+              title: intl.formatMessage(_messages.default.copyToClipboard),
+              onClick: function onClick() {
+                var _api$core, _api$floatingToolbar;
+                api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute( // @ts-ignore
+                api === null || api === void 0 || (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType));
+                return true;
+              },
+              icon: (0, _react.jsx)(_copy.default, {
+                label: intl.formatMessage(_messages.default.copyToClipboard)
+              })
+            }, {
+              title: intl.formatMessage(_messages.default.delete),
+              onClick: (0, _commandsWithAnalytics.deleteTableWithAnalytics)(editorAnalyticsAPI),
+              icon: (0, _react.jsx)(_delete.default, {
+                label: intl.formatMessage(_messages.default.delete)
+              })
+            }]
+          }])),
           scrollable: true
         };
       }

package/dist/es2019/nodeviews/TableRow.js

@@ -375,7 +375,7 @@ export default class TableRow extends TableNodeView {
   shouldSticky() {
     if (
     // is Safari
-    navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome') && fg('platform_editor_advanced_layouts_post_fix_patch_4')) {
+    navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome')) {
       const pos = this.getPos();
       if (typeof pos === 'number') {
         const $tableRowPos = this.view.state.doc.resolve(pos);

package/dist/es2019/ui/toolbar.js

@@ -7,8 +7,10 @@ import _extends from "@babel/runtime/helpers/extends";
 import { jsx } from '@emotion/react';
 import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
 import { CHANGE_ALIGNMENT_REASON, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { DropdownMenuExtensionItems } from '@atlaskit/editor-common/floating-toolbar';
 import { addColumnAfter, addRowAfter, backspace, tooltip } from '@atlaskit/editor-common/keymaps';
 import commonMessages, { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { isSelectionTableNestedInTable } from '@atlaskit/editor-common/nesting';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { cellBackgroundColorPalette, DEFAULT_BORDER_COLOR } from '@atlaskit/editor-common/ui-color';
 import { closestElement, getChildrenInfo, getNodeName, isReferencedSource } from '@atlaskit/editor-common/utils';
@@ -19,6 +21,7 @@ import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellRectClosestToPos, findTable, getSelectionRect, isSelectionType, splitCell } from '@atlaskit/editor-tables/utils';
 import AlignImageCenterIcon from '@atlaskit/icon/core/align-image-center';
 import AlignImageLeftIcon from '@atlaskit/icon/core/align-image-left';
+import CopyIcon from '@atlaskit/icon/core/copy';
 import CustomizeIcon from '@atlaskit/icon/core/customize';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
@@ -426,6 +429,7 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
         onBlur: clearHoverSelection()
       }]
     };
+    const isNestedTable = fg('platform_editor_use_nested_table_pm_nodes') && isSelectionTableNestedInTable(state);
     return {
       title: 'Table floating controls',
       getDomRef,
@@ -436,16 +440,59 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
       },
       zIndex: akEditorFloatingPanelZIndex + 1,
       // Place the context menu slightly above the others
-      items: [menu, separator(menu.hidden), ...alignmentMenu, separator(alignmentMenu.length === 0), ...cellItems, ...columnSettingsItems, ...colorPicker,
-      // TODO: ED-26961 - editor controls to move to overflow menu
-      {
+      items: [menu, separator(menu.hidden), ...alignmentMenu, separator(alignmentMenu.length === 0), ...cellItems, ...columnSettingsItems, ...colorPicker, ...(editorExperiment('platform_editor_controls', 'control') ? [{
         type: 'extensions-placeholder',
         separator: 'end'
-      }, ...(editorExperiment('platform_editor_controls', 'control') ? [copyButton, {
+      }, copyButton, {
         type: 'separator'
-      }, deleteButton] : [deleteButton, {
-        type: 'separator'
-      }, copyButton])],
+      }, deleteButton] : [{
+        type: 'overflow-dropdown',
+        dropdownWidth: 220,
+        options: [{
+          type: 'custom',
+          fallback: [],
+          render: (editorView, dropdownOptions) => {
+            var _api$extension, _api$extension$shared, _api$extension2, _api$extension3;
+            if (!editorView) {
+              return null;
+            }
+            const extensionState = api === null || api === void 0 ? void 0 : (_api$extension = api.extension) === null || _api$extension === void 0 ? void 0 : (_api$extension$shared = _api$extension.sharedState) === null || _api$extension$shared === void 0 ? void 0 : _api$extension$shared.currentState();
+            const extensionApi = api === null || api === void 0 ? void 0 : (_api$extension2 = api.extension) === null || _api$extension2 === void 0 ? void 0 : _api$extension2.actions.api();
+            if (!extensionApi || !(extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider)) {
+              return null;
+            }
+            return jsx(DropdownMenuExtensionItems, {
+              node: tableObject.node,
+              editorView: editorView,
+              extension: {
+                extensionProvider: extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider ? Promise.resolve(extensionState.extensionProvider) : undefined,
+                extensionApi: api === null || api === void 0 ? void 0 : (_api$extension3 = api.extension) === null || _api$extension3 === void 0 ? void 0 : _api$extension3.actions.api()
+              },
+              dropdownOptions: dropdownOptions,
+              disabled: key => {
+                return isNestedTable && ['referentiality:connections', 'chart:insert-chart'].includes(key);
+              }
+            });
+          }
+        }, {
+          title: intl.formatMessage(commonMessages.copyToClipboard),
+          onClick: () => {
+            var _api$core, _api$floatingToolbar;
+            api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute( // @ts-ignore
+            api === null || api === void 0 ? void 0 : (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType));
+            return true;
+          },
+          icon: jsx(CopyIcon, {
+            label: intl.formatMessage(commonMessages.copyToClipboard)
+          })
+        }, {
+          title: intl.formatMessage(commonMessages.delete),
+          onClick: deleteTableWithAnalytics(editorAnalyticsAPI),
+          icon: jsx(DeleteIcon, {
+            label: intl.formatMessage(commonMessages.delete)
+          })
+        }]
+      }])],
       scrollable: true
     };
   }

package/dist/esm/nodeviews/TableRow.js

@@ -407,7 +407,7 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
     value: function shouldSticky() {
       if (
       // is Safari
-      navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome') && fg('platform_editor_advanced_layouts_post_fix_patch_4')) {
+      navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome')) {
         var pos = this.getPos();
         if (typeof pos === 'number') {
           var $tableRowPos = this.view.state.doc.resolve(pos);

package/dist/esm/ui/toolbar.js

@@ -11,8 +11,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { jsx } from '@emotion/react';
 import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
 import { CHANGE_ALIGNMENT_REASON, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { DropdownMenuExtensionItems } from '@atlaskit/editor-common/floating-toolbar';
 import { addColumnAfter, addRowAfter, backspace, tooltip } from '@atlaskit/editor-common/keymaps';
 import commonMessages, { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { isSelectionTableNestedInTable } from '@atlaskit/editor-common/nesting';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { cellBackgroundColorPalette, DEFAULT_BORDER_COLOR } from '@atlaskit/editor-common/ui-color';
 import { closestElement, getChildrenInfo as _getChildrenInfo, getNodeName, isReferencedSource } from '@atlaskit/editor-common/utils';
@@ -23,6 +25,7 @@ import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellRectClosestToPos, findTable, getSelectionRect, isSelectionType, splitCell } from '@atlaskit/editor-tables/utils';
 import AlignImageCenterIcon from '@atlaskit/icon/core/align-image-center';
 import AlignImageLeftIcon from '@atlaskit/icon/core/align-image-left';
+import CopyIcon from '@atlaskit/icon/core/copy';
 import CustomizeIcon from '@atlaskit/icon/core/customize';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
@@ -446,6 +449,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
             onBlur: clearHoverSelection()
           }]
         };
+        var isNestedTable = fg('platform_editor_use_nested_table_pm_nodes') && isSelectionTableNestedInTable(state);
         return {
           title: 'Table floating controls',
           getDomRef: getDomRef,
@@ -456,16 +460,59 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
           },
           zIndex: akEditorFloatingPanelZIndex + 1,
           // Place the context menu slightly above the others
-          items: [menu, separator(menu.hidden)].concat(_toConsumableArray(alignmentMenu), [separator(alignmentMenu.length === 0)], _toConsumableArray(cellItems), _toConsumableArray(columnSettingsItems), _toConsumableArray(colorPicker), [
-          // TODO: ED-26961 - editor controls to move to overflow menu
-          {
+          items: [menu, separator(menu.hidden)].concat(_toConsumableArray(alignmentMenu), [separator(alignmentMenu.length === 0)], _toConsumableArray(cellItems), _toConsumableArray(columnSettingsItems), _toConsumableArray(colorPicker), _toConsumableArray(editorExperiment('platform_editor_controls', 'control') ? [{
             type: 'extensions-placeholder',
             separator: 'end'
-          }], _toConsumableArray(editorExperiment('platform_editor_controls', 'control') ? [copyButton, {
+          }, copyButton, {
             type: 'separator'
-          }, deleteButton] : [deleteButton, {
-            type: 'separator'
-          }, copyButton])),
+          }, deleteButton] : [{
+            type: 'overflow-dropdown',
+            dropdownWidth: 220,
+            options: [{
+              type: 'custom',
+              fallback: [],
+              render: function render(editorView, dropdownOptions) {
+                var _api$extension, _api$extension2, _api$extension3;
+                if (!editorView) {
+                  return null;
+                }
+                var extensionState = api === null || api === void 0 || (_api$extension = api.extension) === null || _api$extension === void 0 || (_api$extension = _api$extension.sharedState) === null || _api$extension === void 0 ? void 0 : _api$extension.currentState();
+                var extensionApi = api === null || api === void 0 || (_api$extension2 = api.extension) === null || _api$extension2 === void 0 ? void 0 : _api$extension2.actions.api();
+                if (!extensionApi || !(extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider)) {
+                  return null;
+                }
+                return jsx(DropdownMenuExtensionItems, {
+                  node: tableObject.node,
+                  editorView: editorView,
+                  extension: {
+                    extensionProvider: extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider ? Promise.resolve(extensionState.extensionProvider) : undefined,
+                    extensionApi: api === null || api === void 0 || (_api$extension3 = api.extension) === null || _api$extension3 === void 0 ? void 0 : _api$extension3.actions.api()
+                  },
+                  dropdownOptions: dropdownOptions,
+                  disabled: function disabled(key) {
+                    return isNestedTable && ['referentiality:connections', 'chart:insert-chart'].includes(key);
+                  }
+                });
+              }
+            }, {
+              title: intl.formatMessage(commonMessages.copyToClipboard),
+              onClick: function onClick() {
+                var _api$core, _api$floatingToolbar;
+                api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute( // @ts-ignore
+                api === null || api === void 0 || (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType));
+                return true;
+              },
+              icon: jsx(CopyIcon, {
+                label: intl.formatMessage(commonMessages.copyToClipboard)
+              })
+            }, {
+              title: intl.formatMessage(commonMessages.delete),
+              onClick: deleteTableWithAnalytics(editorAnalyticsAPI),
+              icon: jsx(DeleteIcon, {
+                label: intl.formatMessage(commonMessages.delete)
+              })
+            }]
+          }])),
           scrollable: true
         };
       }

package/dist/types/tablePluginType.d.ts

@@ -5,6 +5,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BatchAttributeUpdatesPlugin } from '@atlaskit/editor-plugin-batch-attribute-updates';
 import type { ContentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
@@ -45,7 +46,8 @@ export type TablePluginDependencies = [
     OptionalPlugin<AccessibilityUtilsPlugin>,
     OptionalPlugin<MediaPlugin>,
     OptionalPlugin<EditorViewModePlugin>,
-    OptionalPlugin<FeatureFlagsPlugin>
+    OptionalPlugin<FeatureFlagsPlugin>,
+    OptionalPlugin<ExtensionPlugin>
 ];
 export type TablePlugin = NextEditorPlugin<'table', {
     pluginConfiguration: TablePluginOptions | undefined;

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

@@ -5,6 +5,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BatchAttributeUpdatesPlugin } from '@atlaskit/editor-plugin-batch-attribute-updates';
 import type { ContentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
@@ -45,7 +46,8 @@ export type TablePluginDependencies = [
     OptionalPlugin<AccessibilityUtilsPlugin>,
     OptionalPlugin<MediaPlugin>,
     OptionalPlugin<EditorViewModePlugin>,
-    OptionalPlugin<FeatureFlagsPlugin>
+    OptionalPlugin<FeatureFlagsPlugin>,
+    OptionalPlugin<ExtensionPlugin>
 ];
 export type TablePlugin = NextEditorPlugin<'table', {
     pluginConfiguration: TablePluginOptions | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "10.4.4",
+	"version": "10.4.5",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,13 +32,14 @@
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/button": "^21.1.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^102.10.0",
+		"@atlaskit/editor-common": "^102.11.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.0",
 		"@atlaskit/editor-plugin-guideline": "^2.0.0",
 		"@atlaskit/editor-plugin-selection": "^2.1.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
@@ -152,9 +153,6 @@
 		"platform_editor_nested_tables_paste_wrap_fix": {
 			"type": "boolean"
 		},
-		"platform_editor_advanced_layouts_post_fix_patch_4": {
-			"type": "boolean"
-		},
 		"nested_table_control_padding_with_css": {
 			"type": "boolean"
 		},

package/src/nodeviews/TableRow.ts

@@ -454,8 +454,7 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
 		if (
 			// is Safari
 			navigator.userAgent.includes('AppleWebKit') &&
-			!navigator.userAgent.includes('Chrome') &&
-			fg('platform_editor_advanced_layouts_post_fix_patch_4')
+			!navigator.userAgent.includes('Chrome')
 		) {
 			const pos = this.getPos();
 			if (typeof pos === 'number') {

package/src/nodeviews/TableStickyScrollbar.ts

@@ -150,8 +150,8 @@ export class TableStickyScrollbar {
 			// so the boundingClientRect.top will never be less than the rootBounds.top,
 			// so we need to check if the boundingClientRect.top is less than 20% of the rootBounds.height
 			// to determine if the bottom sentinel is above the scroll area
-			(entry.boundingClientRect.top < ((entry.rootBounds?.height || 0) * 0.2) &&
-			fg('platform_editor_scroll_table_flickering_fix'));
+			(entry.boundingClientRect.top < (entry.rootBounds?.height || 0) * 0.2 &&
+				fg('platform_editor_scroll_table_flickering_fix'));
 
 		this.bottomSentinelState = sentinelIsAboveScrollArea
 			? 'above'
@@ -166,7 +166,6 @@ export class TableStickyScrollbar {
 		const sentinelIsBelowScrollArea =
 			(entry.rootBounds?.bottom || 0) < entry.boundingClientRect.top;
 
-
 		this.topSentinelState = sentinelIsBelowScrollArea
 			? 'below'
 			: entry.isIntersecting

package/src/tablePluginType.ts

@@ -11,6 +11,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BatchAttributeUpdatesPlugin } from '@atlaskit/editor-plugin-batch-attribute-updates';
 import type { ContentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
@@ -80,6 +81,7 @@ export type TablePluginDependencies = [
 	OptionalPlugin<MediaPlugin>,
 	OptionalPlugin<EditorViewModePlugin>,
 	OptionalPlugin<FeatureFlagsPlugin>,
+	OptionalPlugin<ExtensionPlugin>,
 ];
 
 export type TablePlugin = NextEditorPlugin<

package/src/ui/toolbar.tsx

@@ -8,11 +8,12 @@ import { jsx } from '@emotion/react';
 import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { CHANGE_ALIGNMENT_REASON, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { DropdownMenuExtensionItems } from '@atlaskit/editor-common/floating-toolbar';
 import { addColumnAfter, addRowAfter, backspace, tooltip } from '@atlaskit/editor-common/keymaps';
 import commonMessages, { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { isSelectionTableNestedInTable } from '@atlaskit/editor-common/nesting';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import type {
-	typeOption,
 	Command,
 	CommandDispatch,
 	ConfirmDialogOptions,
@@ -24,6 +25,7 @@ import type {
 	GetEditorContainerWidth,
 	GetEditorFeatureFlags,
 	Icon,
+	typeOption,
 } from '@atlaskit/editor-common/types';
 import { cellBackgroundColorPalette, DEFAULT_BORDER_COLOR } from '@atlaskit/editor-common/ui-color';
 import {
@@ -48,6 +50,7 @@ import {
 } from '@atlaskit/editor-tables/utils';
 import AlignImageCenterIcon from '@atlaskit/icon/core/align-image-center';
 import AlignImageLeftIcon from '@atlaskit/icon/core/align-image-left';
+import CopyIcon from '@atlaskit/icon/core/copy';
 import CustomizeIcon from '@atlaskit/icon/core/customize';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
@@ -632,6 +635,9 @@ export const getToolbarConfig =
 				],
 			};
 
+			const isNestedTable =
+				fg('platform_editor_use_nested_table_pm_nodes') && isSelectionTableNestedInTable(state);
+
 			return {
 				title: 'Table floating controls',
 				getDomRef,
@@ -647,18 +653,76 @@ export const getToolbarConfig =
 					...cellItems,
 					...columnSettingsItems,
 					...colorPicker,
-					// TODO: ED-26961 - editor controls to move to overflow menu
-					{
-						type: 'extensions-placeholder',
-						separator: 'end',
-					},
 					...((editorExperiment('platform_editor_controls', 'control')
-						? ([copyButton, { type: 'separator' }, deleteButton] as Array<
-								FloatingToolbarItem<Command>
-							>)
-						: [deleteButton, { type: 'separator' }, copyButton]) as Array<
-						FloatingToolbarItem<Command>
-					>),
+						? ([
+								{
+									type: 'extensions-placeholder',
+									separator: 'end',
+								},
+								copyButton,
+								{ type: 'separator' },
+								deleteButton,
+							] as Array<FloatingToolbarItem<Command>>)
+						: [
+								{
+									type: 'overflow-dropdown',
+									dropdownWidth: 220,
+									options: [
+										{
+											type: 'custom',
+											fallback: [],
+											render: (editorView, dropdownOptions) => {
+												if (!editorView) {
+													return null;
+												}
+
+												const extensionState = api?.extension?.sharedState?.currentState();
+												const extensionApi = api?.extension?.actions.api();
+
+												if (!extensionApi || !extensionState?.extensionProvider) {
+													return null;
+												}
+
+												return (
+													<DropdownMenuExtensionItems
+														node={tableObject.node}
+														editorView={editorView}
+														extension={{
+															extensionProvider: extensionState?.extensionProvider
+																? Promise.resolve(extensionState.extensionProvider)
+																: undefined,
+															extensionApi: api?.extension?.actions.api(),
+														}}
+														dropdownOptions={dropdownOptions}
+														disabled={(key: string) => {
+															return (
+																isNestedTable &&
+																['referentiality:connections', 'chart:insert-chart'].includes(key)
+															);
+														}}
+													/>
+												);
+											},
+										},
+										{
+											title: intl.formatMessage(commonMessages.copyToClipboard),
+											onClick: () => {
+												api?.core?.actions.execute(
+													// @ts-ignore
+													api?.floatingToolbar?.commands.copyNode(nodeType),
+												);
+												return true;
+											},
+											icon: <CopyIcon label={intl.formatMessage(commonMessages.copyToClipboard)} />,
+										},
+										{
+											title: intl.formatMessage(commonMessages.delete),
+											onClick: deleteTableWithAnalytics(editorAnalyticsAPI),
+											icon: <DeleteIcon label={intl.formatMessage(commonMessages.delete)} />,
+										},
+									],
+								},
+							]) as Array<FloatingToolbarItem<Command>>),
 				],
 				scrollable: true,
 			};

package/tsconfig.app.json

@@ -59,6 +59,9 @@
 		{
 			"path": "../editor-plugin-editor-viewmode/tsconfig.app.json"
 		},
+		{
+			"path": "../editor-plugin-extension/tsconfig.app.json"
+		},
 		{
 			"path": "../editor-plugin-feature-flags/tsconfig.app.json"
 		},