@atlaskit/editor-plugin-table 23.3.3 → 23.3.5

package/dist/es2019/ui/TableMenu/column/items/SortIncreasingItem.js

@@ -29,7 +29,7 @@ export const SortIncreasingItem = ({
       return;
     }
     sortColumnWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.TABLE_CONTEXT_MENU, columnIndex, SortOrder.ASC)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

package/dist/es2019/ui/TableMenu/row/items/AddRowAboveItem.js

@@ -33,7 +33,7 @@ export const AddRowAboveItem = props => {
       index,
       moveCursorToInsertedRow: true
     })(editorView.state, editorView.dispatch);
-    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

package/dist/es2019/ui/TableMenu/row/items/AddRowBelowItem.js

@@ -33,7 +33,7 @@ export const AddRowBelowItem = props => {
       index,
       moveCursorToInsertedRow: true
     })(editorView.state, editorView.dispatch);
-    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

package/dist/es2019/ui/TableMenu/row/items/DeleteRowItem.js

@@ -57,7 +57,7 @@ export const DeleteRowItem = props => {
       return;
     }
     deleteRowsWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect, !!isHeaderRowRequired)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

package/dist/es2019/ui/TableMenu/row/items/MoveRowDownItem.js

@@ -44,7 +44,7 @@ export const MoveRowDownItem = props => {
       return;
     }
     moveSourceWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api === null || api === void 0 ? void 0 : (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 ? void 0 : _api$accessibilityUti.actions.ariaNotify, getPluginState(editorView.state).getIntl)(INPUT_METHOD.TABLE_CONTEXT_MENU, TABLE_ROW, getSelectedRowIndexes(selectionRect), selectionRect.bottom)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
   };
   if (!tableNode || !shouldShowMoveRowDown(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isLastRow)) {

package/dist/es2019/ui/TableMenu/row/items/MoveRowUpItem.js

@@ -44,7 +44,7 @@ export const MoveRowUpItem = props => {
       return;
     }
     moveSourceWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api === null || api === void 0 ? void 0 : (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 ? void 0 : _api$accessibilityUti.actions.ariaNotify, getPluginState(editorView.state).getIntl)(INPUT_METHOD.TABLE_CONTEXT_MENU, TABLE_ROW, getSelectedRowIndexes(selectionRect), selectionRect.top - 1)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
   };
   if (!tableNode || !shouldShowMoveRowUp(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstRow)) {

package/dist/es2019/ui/TableMenu/shared/TableMenu.js

@@ -27,17 +27,17 @@ export const TableMenu = /*#__PURE__*/memo(({
     };
   });
   const tableMenuContext = useMemo(() => {
-    if (!selection || !tableNode) {
-      return {
-        editorView
-      };
+    // rely on selection plugins state to re-render the row/column menu, but use editorView.selection
+    // for cell menu state as the selection plugin won't update when text selection changes within cells
+    if (!tableNode || !editorView || !selection) {
+      return undefined;
     }
     const tableMap = TableMap.get(tableNode);
-    const selectionRect = getSelectionRect(selection);
+    const selectionRect = getSelectionRect(editorView.state.selection);
     const cellOps = {
       editorView,
-      canMergeCells: canMergeCellSelection(selection),
-      canSplitCell: canSplitCellSelection(selection),
+      canMergeCells: canMergeCellSelection(editorView.state.selection),
+      canSplitCell: canSplitCellSelection(editorView.state.selection),
       hasMergedCellsInTable: tableMap.hasMergedCells()
     };
     if (!selectionRect) {
@@ -52,7 +52,7 @@ export const TableMenu = /*#__PURE__*/memo(({
       isLastColumn: selectionRect.right === tableMap.width,
       selectedColumnCount: selectionRect.right - selectionRect.left
     };
-  }, [editorView, selection, tableNode]);
+  }, [editorView, tableNode, selection]);
   if (components.length === 0) {
     return null;
   }

package/dist/es2019/ui/TableMenu/shared/consts.js

@@ -1,4 +1,4 @@
 export const TABLE_MENU_WIDTH = 280;
-export const TABLE_MENU_SELECTOR = '[data-testid="column-handle-menu"], [data-testid="row-handle-menu"], [data-toolbar-nested-dropdown-menu]';
+export const TABLE_MENU_SELECTOR = '[data-testid="column-handle-menu"], [data-testid="row-handle-menu"], [data-toolbar-component="menu"], [data-toolbar-nested-dropdown-menu]';
 export const TABLE_ROW = 'table-row';
 export const TABLE_COLUMN = 'table-column';

package/dist/es2019/ui/TableMenu/shared/items/BackgroundColorItem.js

@@ -46,7 +46,7 @@ export const BackgroundColorItem = ({
       return;
     }
     setColorWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.TABLE_CONTEXT_MENU, color, editorView)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
   }, [api, editorView]);
   // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage

package/dist/es2019/ui/TableMenu/shared/items/ClearCellsItem.js

@@ -29,7 +29,7 @@ export const ClearCellsItem = ({
       targetCellPosition
     } = getPluginState(editorView.state);
     emptyMultipleCellsWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.TABLE_CONTEXT_MENU, targetCellPosition)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

package/dist/esm/pm-plugins/commands/active-table-menu.js

@@ -1,15 +1,24 @@
 import { pluginKey } from '../plugin-key';
-export var closeActiveTableMenu = function closeActiveTableMenu() {
+var applyMenuUserIntent = function applyMenuUserIntent(tr, api, nextActiveTableMenu) {
+  var _api$userIntent;
+  var isRowOrColumnMenuOpen = nextActiveTableMenu.type === 'row' || nextActiveTableMenu.type === 'column';
+  api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || _api$userIntent.commands.setCurrentUserIntent(isRowOrColumnMenuOpen ? 'tableDragMenuPopupOpen' : 'default')({
+    tr: tr
+  });
+};
+export var closeActiveTableMenu = function closeActiveTableMenu(api) {
   return function (_ref) {
     var tr = _ref.tr;
+    var nextActiveTableMenu = {
+      type: 'none'
+    };
     tr.setMeta(pluginKey, {
       type: 'SET_ACTIVE_TABLE_MENU',
       data: {
-        activeTableMenu: {
-          type: 'none'
-        }
+        activeTableMenu: nextActiveTableMenu
       }
     });
+    applyMenuUserIntent(tr, api, nextActiveTableMenu);
     if (!tr.docChanged) {
       tr.setMeta('addToHistory', false);
     }
@@ -25,17 +34,19 @@ var isSameActiveTableMenu = function isSameActiveTableMenu(current, next) {
   }
   return true;
 };
-export var toggleActiveTableMenu = function toggleActiveTableMenu(activeTableMenu, currentActiveTableMenu) {
+export var toggleActiveTableMenu = function toggleActiveTableMenu(activeTableMenu, currentActiveTableMenu, api) {
   return function (_ref2) {
     var tr = _ref2.tr;
+    var nextActiveTableMenu = isSameActiveTableMenu(currentActiveTableMenu, activeTableMenu) ? {
+      type: 'none'
+    } : activeTableMenu;
     tr.setMeta(pluginKey, {
       type: 'SET_ACTIVE_TABLE_MENU',
       data: {
-        activeTableMenu: isSameActiveTableMenu(currentActiveTableMenu, activeTableMenu) ? {
-          type: 'none'
-        } : activeTableMenu
+        activeTableMenu: nextActiveTableMenu
       }
     });
+    applyMenuUserIntent(tr, api, nextActiveTableMenu);
     tr.setMeta('addToHistory', false);
     return tr;
   };

package/dist/esm/pm-plugins/commands/commands-with-analytics.js

@@ -13,7 +13,6 @@ import { deleteRows } from '../transforms/delete-rows';
 import { mergeCells } from '../transforms/merge';
 import { withEditorAnalyticsAPI, getSelectedCellInfo, getSelectedTableInfo } from '../utils/analytics';
 import { checkIfNumberColumnEnabled } from '../utils/nodes';
-import { toggleActiveTableMenu } from './active-table-menu';
 import { clearMultipleCells } from './clear';
 import { wrapTableInExpand } from './collapse';
 import { changeColumnWidthByStep } from './column-resize';
@@ -24,45 +23,6 @@ import { deleteTable, deleteTableIfSelected, getTableSelectionType, setMultipleC
 import { sortByColumn } from './sort';
 import { splitCell } from './split-cell';
 import { toggleHeaderColumn, toggleHeaderRow, toggleNumberColumn } from './toggle';
-export var toggleActiveTableMenuWithAnalytics = function toggleActiveTableMenuWithAnalytics(editorAnalyticsAPI) {
-  return function (direction, index) {
-    var trigger = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'mouse';
-    return withEditorAnalyticsAPI(function (state) {
-      var _getPluginState = getPluginState(state),
-        previousActiveTableMenu = _getPluginState.activeTableMenu;
-      var isSameActiveMenu = (previousActiveTableMenu === null || previousActiveTableMenu === void 0 ? void 0 : previousActiveTableMenu.type) === direction && previousActiveTableMenu.index === index;
-      if (isSameActiveMenu) {
-        return undefined;
-      }
-      return {
-        action: TABLE_ACTION.DRAG_MENU_OPENED,
-        actionSubject: ACTION_SUBJECT.TABLE,
-        actionSubjectId: null,
-        eventType: EVENT_TYPE.TRACK,
-        attributes: {
-          inputMethod: trigger === 'keyboard' ? INPUT_METHOD.KEYBOARD : INPUT_METHOD.MOUSE,
-          direction: direction
-        }
-      };
-    })(editorAnalyticsAPI)(function (state, dispatch) {
-      if (dispatch) {
-        var _getPluginState2 = getPluginState(state),
-          currentActiveTableMenu = _getPluginState2.activeTableMenu;
-        var newTr = toggleActiveTableMenu({
-          type: direction,
-          index: index,
-          openedBy: trigger
-        }, currentActiveTableMenu)({
-          tr: state.tr
-        });
-        if (newTr) {
-          dispatch(newTr);
-        }
-      }
-      return true;
-    });
-  };
-};
 export var emptyMultipleCellsWithAnalytics = function emptyMultipleCellsWithAnalytics(editorAnalyticsAPI) {
   return function (inputMethod, targetCellPosition) {
     return withEditorAnalyticsAPI(function (_ref) {
@@ -227,8 +187,8 @@ export var changeColumnWidthByStepWithAnalytics = function changeColumnWidthBySt
         table = _getSelectedTableInfo2.table,
         totalRowCount = _getSelectedTableInfo2.totalRowCount,
         totalColumnCount = _getSelectedTableInfo2.totalColumnCount;
-      var _getPluginState3 = getPluginState(state),
-        colIndex = _getPluginState3.hoveredCell.colIndex;
+      var _getPluginState = getPluginState(state),
+        colIndex = _getPluginState.hoveredCell.colIndex;
       return {
         action: TABLE_ACTION.COLUMN_RESIZED,
         actionSubject: ACTION_SUBJECT.TABLE,
@@ -348,8 +308,8 @@ export var deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = function delete
     }
     var selectionType = getTableSelectionType(selection);
     if (selectionType === 'row') {
-      var _getPluginState4 = getPluginState(state),
-        pluginConfig = _getPluginState4.pluginConfig;
+      var _getPluginState2 = getPluginState(state),
+        pluginConfig = _getPluginState2.pluginConfig;
       var isHeaderRowRequired = pluginConfig.isHeaderRowRequired || false;
       return deleteRowsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT, rect, isHeaderRowRequired)(state, dispatch);
     } else if (selectionType === 'column') {
@@ -393,8 +353,8 @@ export var toggleHeaderRowWithAnalytics = function toggleHeaderRowWithAnalytics(
     var _getSelectedTableInfo7 = getSelectedTableInfo(state.selection),
       totalRowCount = _getSelectedTableInfo7.totalRowCount,
       totalColumnCount = _getSelectedTableInfo7.totalColumnCount;
-    var _getPluginState5 = getPluginState(state),
-      isHeaderRowEnabled = _getPluginState5.isHeaderRowEnabled;
+    var _getPluginState3 = getPluginState(state),
+      isHeaderRowEnabled = _getPluginState3.isHeaderRowEnabled;
     return {
       action: TABLE_ACTION.TOGGLED_HEADER_ROW,
       actionSubject: ACTION_SUBJECT.TABLE,
@@ -413,8 +373,8 @@ export var toggleHeaderColumnWithAnalytics = function toggleHeaderColumnWithAnal
     var _getSelectedTableInfo8 = getSelectedTableInfo(state.selection),
       totalRowCount = _getSelectedTableInfo8.totalRowCount,
       totalColumnCount = _getSelectedTableInfo8.totalColumnCount;
-    var _getPluginState6 = getPluginState(state),
-      isHeaderColumnEnabled = _getPluginState6.isHeaderColumnEnabled;
+    var _getPluginState4 = getPluginState(state),
+      isHeaderColumnEnabled = _getPluginState4.isHeaderColumnEnabled;
     return {
       action: TABLE_ACTION.TOGGLED_HEADER_COLUMN,
       actionSubject: ACTION_SUBJECT.TABLE,

package/dist/esm/pm-plugins/drag-and-drop/plugin.js

@@ -90,7 +90,7 @@ var destroyFn = function destroyFn(editorView, editorAnalyticsAPI, isTableScalin
         api === null || api === void 0 || api.core.actions.execute(function (_ref7) {
           var _api$userIntent;
           var tr = _ref7.tr;
-          closeActiveTableMenu()({
+          closeActiveTableMenu(api)({
             tr: tr
           });
           api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || _api$userIntent.commands.setCurrentUserIntent('dragging')({

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

@@ -49,7 +49,7 @@ var updateTargetCellPosition = function updateTargetCellPosition(_ref2) {
       }
       var hasTargetCellChanged = pluginState.targetCellPosition !== _targetCellPosition;
       var hasActiveTableMenu = pluginState.activeTableMenu != null && pluginState.activeTableMenu.type !== 'none';
-      var shouldCloseMenu = hasActiveTableMenu && (!tableNode || hasTargetCellChanged || !(tr.selection instanceof CellSelection));
+      var shouldCloseMenu = hasActiveTableMenu && tr.selectionSet && (!tableNode || hasTargetCellChanged || !(tr.selection instanceof CellSelection));
       if (!hasTargetCellChanged && !shouldCloseMenu) {
         return pluginState;
       }

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

@@ -43,7 +43,10 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
     wasFullWidthModeEnabled: previousFullWidthModeEnabled,
     isHeaderRowEnabled: !!pluginConfig.allowHeaderRow,
     isHeaderColumnEnabled: false,
-    isTableScalingEnabled: isTableScalingEnabled
+    isTableScalingEnabled: isTableScalingEnabled,
+    activeTableMenu: {
+      type: 'none'
+    }
   }, defaultHoveredCell), defaultTableSelection), {}, {
     getIntl: getIntl
   }));

package/dist/esm/ui/ContentComponent.js

@@ -5,6 +5,7 @@ import { getDomRefFromSelection } from '@atlaskit/editor-common/get-dom-ref-from
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ResizerBreakoutModeLabel } from '@atlaskit/editor-common/resizer';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import FloatingContextualButton from './FloatingContextualButton';
 import FloatingContextualMenu from './FloatingContextualMenu';
@@ -12,6 +13,7 @@ import FloatingDragMenu from './FloatingDragMenu';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import FloatingInsertButton from './FloatingInsertButton';
+import FloatingTableMenu from './FloatingTableMenu';
 import { FloatingToolbarLabel } from './FloatingToolbarLabel/FloatingToolbarLabel';
 import { GlobalStylesWrapper } from './global-styles';
 import { SizeSelector } from './SizeSelector';
@@ -135,7 +137,15 @@ var ContentComponentInternal = function ContentComponentInternal(_ref) {
     isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor,
     api: api,
     isDragMenuOpen: isDragMenuOpen
-  }), /*#__PURE__*/React.createElement(FloatingDragMenu, {
+  }), expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ? /*#__PURE__*/React.createElement(FloatingTableMenu, {
+    api: api,
+    boundariesElement: popupsBoundariesElement,
+    editorView: editorView,
+    mountPoint: popupsMountPoint,
+    stickyHeaders: stickyHeader,
+    tableWrapper: tableWrapperTarget,
+    targetCellPosition: targetCellPosition
+  }) : /*#__PURE__*/React.createElement(FloatingDragMenu, {
     editorView: editorView,
     mountPoint: popupsMountPoint,
     boundariesElement: popupsBoundariesElement,

package/dist/esm/ui/FloatingContextualButton/index.js

@@ -67,7 +67,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
         toggleActiveTableMenu({
           type: 'cell',
           openedBy: 'mouse'
-        }, currentActiveTableMenu)({
+        }, currentActiveTableMenu, api)({
           tr: tr
         });
         return tr;
@@ -102,7 +102,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
           toggleActiveTableMenu({
             type: 'cell',
             openedBy: 'keyboard'
-          }, currentActiveTableMenu)({
+          }, currentActiveTableMenu, api)({
             tr: tr
           });
           return tr;

package/dist/esm/ui/FloatingContextualMenu/CellMenuPopup.js

@@ -34,11 +34,11 @@ export var CellMenuPopup = function CellMenuPopup(_ref) {
   var closeCellMenu = useCallback(function () {
     var _getPluginState = getPluginState(editorView.state),
       isCellMenuOpenByKeyboard = _getPluginState.isCellMenuOpenByKeyboard;
-    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     if (isCellMenuOpenByKeyboard) {
       setFocusToCellMenu(false)(editorView.state, editorView.dispatch);
     }
-  }, [api === null || api === void 0 ? void 0 : api.core.actions, editorView]);
+  }, [api, editorView]);
   var isEventInsideCellMenu = useCallback(function (event) {
     var _popupContentRef$curr;
     var target = event.target;

package/dist/esm/ui/FloatingContextualMenu/ContextualMenu.js

@@ -14,9 +14,12 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsxRuntime classic
  * @jsx jsx
  */
+
 import React, { Component } from 'react';
+
 /* eslint-disable @typescript-eslint/consistent-type-imports, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766; jsx required at runtime for @jsxRuntime classic */
 import { jsx } from '@emotion/react';
+import memoizeOne from 'memoize-one';
 import { injectIntl } from 'react-intl';
 import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
@@ -54,7 +57,6 @@ import { getMergedCellsPositions } from '../../pm-plugins/utils/table';
 import { TableCssClassName as ClassName } from '../../types';
 import { colorPalletteColumns, contextualMenuDropdownWidthDnD } from '../consts';
 import { cellColourPreviewStyles } from './styles';
-var arrowsList = new Set(!expValEquals('platform_editor_toolbar_submenu_open_click', 'isEnabled', true) ? ['ArrowRight', 'ArrowLeft'] : ['ArrowRight']);
 var dropdownMenuSection = {
   hasSeparator: true
 };
@@ -62,6 +64,10 @@ var elementBeforeIconStyles = xcss({
   marginRight: 'space.negative.075',
   display: 'flex'
 });
+var getArrowsList = memoizeOne(function () {
+  return new Set(!expValEquals('platform_editor_toolbar_submenu_open_click', 'isEnabled', true) ? ['ArrowRight', 'ArrowLeft'] : ['ArrowRight']);
+});
+
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export var ContextualMenu = /*#__PURE__*/function (_Component) {
   function ContextualMenu() {
@@ -564,7 +570,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         var event = payload.event;
         if (event && event instanceof KeyboardEvent) {
           if (!_this.state.isSubmenuOpen) {
-            if (arrowsList.has(event.key)) {
+            if (getArrowsList().has(event.key)) {
               // preventing default behavior for avoiding cursor jump to next/previous table column
               // when left/right arrow pressed.
               event.preventDefault();

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

@@ -1,19 +1,11 @@
 import React from 'react';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { Popup } from '@atlaskit/editor-common/ui';
-import { UserIntentPopupWrapper } from '@atlaskit/editor-common/user-intent';
 import { akEditorFloatingDialogZIndex, akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { TableCssClassName as ClassName } from '../../types';
-import { dragMenuDropdownWidth, dragTableInsertColumnButtonSize, tablePopupMenuFitHeight } from '../consts';
-import { COLUMN_MENU } from '../TableMenu/column/keys';
-import { ROW_MENU } from '../TableMenu/row/keys';
-import { TABLE_MENU_WIDTH } from '../TableMenu/shared/consts';
-import { TableMenu } from '../TableMenu/shared/TableMenu';
+import { dragMenuDropdownWidth, tablePopupMenuFitHeight } from '../consts';
 import DragMenu from './DragMenu';
-var TABLE_MENU_OFFSET = dragTableInsertColumnButtonSize + 4;
 var FloatingDragMenu = function FloatingDragMenu(_ref) {
   var _getEditorFeatureFlag;
   var mountPoint = _ref.mountPoint,
@@ -35,23 +27,11 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     api = _ref.api,
     isCommentEditor = _ref.isCommentEditor,
     tableWrapper = _ref.tableWrapper;
-  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['table'], function (states) {
-      var _states$tableState;
-      return {
-        activeTableMenu: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.activeTableMenu
-      };
-    }),
-    activeTableMenu = _useSharedPluginState.activeTableMenu;
-  var isActiveTableMenuDragMenu = (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'row' || (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'column';
-  var hasActiveTableMenuState = activeTableMenu !== undefined;
-  var isDragMenuOpen = expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) && hasActiveTableMenuState ? isActiveTableMenuDragMenu : isOpen;
-  var dragMenuDirection = expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) && hasActiveTableMenuState ? isActiveTableMenuDragMenu ? activeTableMenu.type : undefined : direction;
-  var dragMenuIndex = expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) && hasActiveTableMenuState ? isActiveTableMenuDragMenu ? activeTableMenu.index : undefined : index;
-  if (!isDragMenuOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
+  if (!isOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
     return null;
   }
   var inStickyMode = (stickyHeaders === null || stickyHeaders === void 0 ? void 0 : stickyHeaders.sticky) || (tableWrapper === null || tableWrapper === void 0 ? void 0 : tableWrapper.classList.contains(ClassName.TABLE_NODE_WRAPPER_NO_OVERFLOW)) && fg('platform_editor_table_sticky_header_patch_7');
-  var targetHandleRef = dragMenuDirection === 'row' ? document.querySelector('#drag-handle-button-row') : document.querySelector('#drag-handle-button-column');
+  var targetHandleRef = direction === 'row' ? document.querySelector('#drag-handle-button-row') : document.querySelector('#drag-handle-button-column');
   if (!targetHandleRef || !(editorView.state.selection instanceof CellSelection)) {
     return null;
   }
@@ -60,8 +40,8 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     tableWithFixedColumnWidthsOption = _ref2$tableWithFixedC === void 0 ? false : _ref2$tableWithFixedC;
   var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (tableWithFixedColumnWidthsOption || isCommentEditor);
   return /*#__PURE__*/React.createElement(Popup, {
-    alignX: dragMenuDirection === 'row' ? 'right' : undefined,
-    alignY: dragMenuDirection === 'row' ? 'start' : undefined
+    alignX: direction === 'row' ? 'right' : undefined,
+    alignY: direction === 'row' ? 'start' : undefined
     // Ignored via go/ees005
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
     ,
@@ -69,7 +49,7 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     mountTo: mountPoint,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
-    fitWidth: expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ? TABLE_MENU_WIDTH : dragMenuDropdownWidth,
+    fitWidth: dragMenuDropdownWidth,
     fitHeight: tablePopupMenuFitHeight
     // z-index value below is to ensure that this menu is above other floating menu
     // in table, but below floating dialogs like typeaheads, pickers, etc.
@@ -77,22 +57,14 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     ,
     zIndex: inStickyMode ? akEditorFloatingDialogZIndex : akEditorFloatingOverlapPanelZIndex,
     forcePlacement: true,
-    preventOverflow: expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ? dragMenuDirection === 'row' : undefined,
-    offset: expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ? [TABLE_MENU_OFFSET, 0] : direction === 'row' ? [-9, 0] : [0, -7],
+    offset: direction === 'row' ? [-9, 0] : [0, -7],
     stick: true
-  }, expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ? /*#__PURE__*/React.createElement(UserIntentPopupWrapper, {
-    api: api,
-    userIntent: "tableDragMenuPopupOpen"
-  }, /*#__PURE__*/React.createElement(TableMenu, {
-    api: api,
-    editorView: editorView,
-    surface: dragMenuDirection === 'row' ? ROW_MENU : COLUMN_MENU
-  })) : /*#__PURE__*/React.createElement(DragMenu, {
+  }, /*#__PURE__*/React.createElement(DragMenu, {
     editorView: editorView,
-    isOpen: isDragMenuOpen,
+    isOpen: isOpen,
     tableNode: tableNode,
-    direction: dragMenuDirection,
-    index: dragMenuIndex,
+    direction: direction,
+    index: index,
     target: targetHandleRef || undefined,
     targetCellPosition: targetCellPosition,
     getEditorContainerWidth: getEditorContainerWidth,