@atlaskit/editor-plugin-table 22.4.14 → 22.4.16

package/dist/esm/pm-plugins/utils/tableMode/smart-adjust/distribute-column-widths.js

@@ -0,0 +1,77 @@
+import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
+import { akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
+import { EVEN_SHARE_RATIO } from './constants';
+export var sumWidths = function sumWidths(widths) {
+  return widths.reduce(function (sum, width) {
+    return sum + width;
+  }, 0);
+};
+
+// 2px absorbs sub-pixel rounding in `getRenderedColgroupColumnWidths`.
+var SUB_PIXEL_ROUNDING_ALLOWANCE = 2;
+
+/**
+ * Clamps each desired width to `[tableCellMinWidth, MAX × evenShare]`. Greedy
+ * columns (paragraphs) hit the ceiling and wrap; small columns stay at their
+ * natural width. Leftover canvas budget grows ceiling-hitters up to their
+ * desired; overflow reclaims from ceiling-hitters only.
+ */
+export var distributeByEvenShareRatio = function distributeByEvenShareRatio(desiredWidths, editorContainerWidth) {
+  if (desiredWidths.length === 0 || !isFinite(editorContainerWidth) || editorContainerWidth <= 0) {
+    return desiredWidths;
+  }
+  var usableWidth = Math.max(editorContainerWidth - akEditorGutterPaddingDynamic() * 2, tableCellMinWidth * desiredWidths.length);
+  var evenShare = usableWidth / desiredWidths.length;
+  var ceiling = EVEN_SHARE_RATIO.MAX * evenShare;
+  var isCompactColumn = function isCompactColumn(width) {
+    return width <= ceiling;
+  };
+  var desiredCeil = desiredWidths.map(function (desired) {
+    return Math.max(tableCellMinWidth, Math.ceil(desired) + SUB_PIXEL_ROUNDING_ALLOWANCE);
+  });
+  var capped = desiredCeil.map(function (desired) {
+    return isCompactColumn(desired) ? desired : Math.min(ceiling, desired);
+  });
+  var sum = sumWidths(capped);
+
+  // Underflow: grow non-protected ceiling-hitters into the leftover, up to their desired.
+  if (sum < usableWidth) {
+    var leftover = usableWidth - sum;
+    var growthHeadroom = capped.map(function (width, index) {
+      return !isCompactColumn(desiredCeil[index]) && width >= ceiling ? Math.max(desiredCeil[index] - width, 0) : 0;
+    });
+    var totalHeadroom = sumWidths(growthHeadroom);
+    if (totalHeadroom > 0) {
+      var totalGrowth = Math.min(leftover, totalHeadroom);
+      return capped.map(function (width, index) {
+        var headroom = growthHeadroom[index];
+        if (headroom <= 0) {
+          return width;
+        }
+        return width + headroom / totalHeadroom * totalGrowth;
+      });
+    }
+    return capped;
+  }
+  if (sum === usableWidth) {
+    return capped;
+  }
+
+  // Overflow: reclaim from non-protected ceiling-hitters only.
+  var overage = sum - usableWidth;
+  var slacks = capped.map(function (width, index) {
+    return !isCompactColumn(desiredCeil[index]) && width >= ceiling ? Math.max(width - tableCellMinWidth, 0) : 0;
+  });
+  var totalSlack = sumWidths(slacks);
+  if (totalSlack <= 0) {
+    return capped;
+  }
+  return capped.map(function (width, index) {
+    var slack = slacks[index];
+    if (slack <= 0) {
+      return width;
+    }
+    var share = slack / totalSlack * Math.min(overage, totalSlack);
+    return Math.max(width - share, tableCellMinWidth);
+  });
+};

package/dist/esm/pm-plugins/utils/tableMode/smart-adjust/run-smart-adjust.js

@@ -0,0 +1,49 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { getTableMeasurement } from '../../../transforms/content-mode';
+import { distributeByEvenShareRatio, sumWidths } from './distribute-column-widths';
+var measureWithIntrinsicWidth = function measureWithIntrinsicWidth(tableRef, resizerContainer, resizerItem) {
+  if (resizerContainer) {
+    resizerContainer.style.width = 'var(--ak-editor-table-width)';
+    resizerContainer.style.setProperty('--ak-editor-table-width', 'max-content');
+  }
+  if (resizerItem) {
+    resizerItem.style.width = 'max-content';
+  }
+  var prevTableWidth = tableRef.style.width;
+  var prevTableMaxWidth = tableRef.style.maxWidth;
+  var prevTableMinWidth = tableRef.style.minWidth;
+  tableRef.style.setProperty('width', 'max-content', 'important');
+  tableRef.style.setProperty('max-width', 'none', 'important');
+  tableRef.style.setProperty('min-width', '0', 'important');
+  try {
+    return getTableMeasurement(tableRef);
+  } finally {
+    tableRef.style.width = prevTableWidth;
+    tableRef.style.maxWidth = prevTableMaxWidth;
+    tableRef.style.minWidth = prevTableMinWidth;
+  }
+};
+export var restoreResizerContainer = function restoreResizerContainer(resizerContainer) {
+  if (!resizerContainer) {
+    return;
+  }
+  resizerContainer.style.width = 'var(--ak-editor-table-width)';
+  resizerContainer.style.removeProperty('--ak-editor-table-width');
+};
+
+/**
+ * Smart-adjust: measure unconstrained max-content per column, then clamp via
+ * `distributeByEvenShareRatio`.
+ */
+export var runSmartAdjust = function runSmartAdjust(tableRef, resizerContainer, resizerItem, editorContainerWidthFromApi) {
+  var preferredMeasurement = measureWithIntrinsicWidth(tableRef, resizerContainer, resizerItem);
+  var desiredWidths = preferredMeasurement.colWidths;
+  var editorContainerWidth = editorContainerWidthFromApi !== null && editorContainerWidthFromApi !== void 0 ? editorContainerWidthFromApi : sumWidths(desiredWidths);
+  var colWidths = distributeByEvenShareRatio(desiredWidths, editorContainerWidth);
+  return _objectSpread(_objectSpread({}, preferredMeasurement), {}, {
+    colWidths: colWidths,
+    tableWidth: sumWidths(colWidths)
+  });
+};

package/dist/esm/tablePlugin.js

@@ -143,6 +143,7 @@ var tablePlugin = function tablePlugin(_ref) {
         insertRowButtonIndex: tablePluginState.insertRowButtonIndex,
         tableWrapperTarget: tablePluginState.tableWrapperTarget,
         isCellMenuOpenByKeyboard: tablePluginState.isCellMenuOpenByKeyboard,
+        activeTableMenu: tablePluginState.activeTableMenu,
         stickyHeader: stickyHeader,
         dragMenuDirection: dragAndDropState === null || dragAndDropState === void 0 ? void 0 : dragAndDropState.dragMenuDirection,
         dragMenuIndex: dragAndDropState === null || dragAndDropState === void 0 ? void 0 : dragAndDropState.dragMenuIndex,

package/dist/esm/ui/ContentComponent.js

@@ -90,6 +90,7 @@ var ContentComponentInternal = function ContentComponentInternal(_ref) {
     return null;
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, targetCellPosition && (tableRef || isCellMenuOpenByKeyboard) && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/React.createElement(FloatingContextualButton, {
+    api: api,
     isNumberColumnEnabled: tableNode && tableNode.attrs.isNumberColumnEnabled,
     editorView: editorView,
     tableNode: tableNode,
@@ -125,7 +126,6 @@ var ContentComponentInternal = function ContentComponentInternal(_ref) {
     editorView: editorView,
     mountPoint: popupsMountPoint,
     boundariesElement: popupsBoundariesElement,
-    targetCellPosition: targetCellPosition,
     isOpen: Boolean(isContextualMenuOpen) && !isResizing,
     pluginConfig: pluginConfig,
     editorAnalyticsAPI: editorAnalyticsAPI,

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

@@ -8,6 +8,7 @@ import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
 import { ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { focusToContextMenuTrigger } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { Popup } from '@atlaskit/editor-common/ui';
@@ -17,7 +18,7 @@ import { akEditorSmallZIndex } from '@atlaskit/editor-shared-styles';
 import ExpandIcon from '@atlaskit/icon/core/chevron-down';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { toggleContextualMenu } from '../../pm-plugins/commands';
+import { toggleActiveTableMenu, toggleContextualMenu } from '../../pm-plugins/commands';
 import { isNativeStickySupported } from '../../pm-plugins/utils/sticky-header';
 import { TableCssClassName as ClassName } from '../../types';
 
@@ -33,7 +34,8 @@ var anchorStyles = css({
   zIndex: CONTEXTUAL_MENU_BUTTON_Z_INDEX
 });
 var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
-  var editorView = props.editorView,
+  var api = props.api,
+    editorView = props.editorView,
     isContextualMenuOpen = props.isContextualMenuOpen,
     mountPoint = props.mountPoint,
     scrollableElement = props.scrollableElement,
@@ -42,12 +44,22 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
     targetCellPosition = props.targetCellPosition,
     isCellMenuOpenByKeyboard = props.isCellMenuOpenByKeyboard,
     formatMessage = props.intl.formatMessage; //  : Props & WrappedComponentProps
-
+  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 isCellMenuOpen = expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ? (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'cell' : isContextualMenuOpen;
   var handleClick = function handleClick() {
     var state = editorView.state,
       dispatch = editorView.dispatch;
     if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
-      toggleContextualMenu()(state, dispatch);
+      toggleActiveTableMenu({
+        type: 'cell',
+        openedBy: 'mouse'
+      })(state, dispatch);
       return;
     }
 
@@ -63,13 +75,20 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
   var domAtPos = editorView.domAtPos.bind(editorView);
   var targetCellRef = findDomRefAtPos(targetCellPosition, domAtPos);
   useEffect(function () {
-    if (isCellMenuOpenByKeyboard && !isContextualMenuOpen) {
+    if (isCellMenuOpenByKeyboard && !isCellMenuOpen) {
       var state = editorView.state,
         dispatch = editorView.dispatch;
       // open the menu when the keyboard shortcut is pressed
+      if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+        toggleActiveTableMenu({
+          type: 'cell',
+          openedBy: 'keyboard'
+        })(state, dispatch);
+        return;
+      }
       toggleContextualMenu()(state, dispatch);
     }
-  }, [isCellMenuOpenByKeyboard, isContextualMenuOpen, editorView]);
+  }, [isCellMenuOpenByKeyboard, isCellMenuOpen, editorView]);
   if (!targetCellRef || !(targetCellRef instanceof HTMLElement)) {
     return null;
   }
@@ -79,12 +98,12 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     tableFloatingCellButtonStyles(),
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    isContextualMenuOpen && tableFloatingCellButtonSelectedStyles()]
+    isCellMenuOpen && tableFloatingCellButtonSelectedStyles()]
   }, jsx(ToolbarButton
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
   , {
     className: ClassName.CONTEXTUAL_MENU_BUTTON,
-    selected: isContextualMenuOpen,
+    selected: isCellMenuOpen,
     title: labelCellOptions,
     keymap: focusToContextMenuTrigger,
     onClick: handleClick,
@@ -94,7 +113,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
       size: "small"
     }),
     "aria-label": labelCellOptions,
-    "aria-expanded": isContextualMenuOpen
+    "aria-expanded": isCellMenuOpen
   }));
   var parentSticky = targetCellRef.parentElement && targetCellRef.parentElement.className.indexOf('sticky') > -1;
   var parentStickyNative = targetCellRef.parentElement && (fg('platform_editor_table_sticky_header_patch_4') ? tableWrapper === null || tableWrapper === void 0 ? void 0 : tableWrapper.classList.contains(ClassName.TABLE_NODE_WRAPPER_NO_OVERFLOW) : targetCellRef.parentElement.classList.contains(ClassName.NATIVE_STICKY));
@@ -149,7 +168,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
       targetCellPosition: targetCellPosition,
       targetCellRef: targetCellRef,
       mountTo: tableWrapper,
-      isContextualMenuOpen: isContextualMenuOpen
+      isContextualMenuOpen: isCellMenuOpen
     }, button);
   }
   return jsx(Popup, {

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

@@ -1,96 +1,81 @@
-import React, { useCallback, useEffect, useRef } from 'react';
-import { bind } from 'bind-event-listener';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import React, { useCallback, useContext, useRef } from 'react';
+import { Popup } from '@atlaskit/editor-common/ui';
+import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { UserIntentPopupWrapper } from '@atlaskit/editor-common/user-intent';
-import { setFocusToCellMenu, toggleContextualMenu } from '../../pm-plugins/commands';
+import { closeActiveTableMenu, setFocusToCellMenu } from '../../pm-plugins/commands';
+import { getPluginState } from '../../pm-plugins/plugin-factory';
 import { TableCssClassName as ClassName } from '../../types';
+import { tablePopupMenuFitHeight } from '../consts';
 import { CELL_MENU } from '../TableMenu/cell/keys';
+import { TABLE_MENU_WIDTH } from '../TableMenu/shared/consts';
 import { TableMenu } from '../TableMenu/shared/TableMenu';
+var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
+var NESTED_DROPDOWN_SELECTOR = '[data-toolbar-nested-dropdown-menu]';
+var CELL_MENU_TRIGGER_SELECTOR = ".".concat(ClassName.CONTEXTUAL_MENU_BUTTON);
 export var CellMenuPopup = function CellMenuPopup(_ref) {
   var api = _ref.api,
+    boundariesElement = _ref.boundariesElement,
     editorView = _ref.editorView,
-    isCellMenuOpenByKeyboard = _ref.isCellMenuOpenByKeyboard,
-    isOpen = _ref.isOpen,
-    targetCellRef = _ref.targetCellRef;
-  var tableMenuRef = useRef(null);
-  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['userIntent'], function (states) {
-      var _states$userIntentSta;
-      return {
-        currentUserIntent: (_states$userIntentSta = states.userIntentState) === null || _states$userIntentSta === void 0 ? void 0 : _states$userIntentSta.currentUserIntent
-      };
-    }),
-    currentUserIntent = _useSharedPluginState.currentUserIntent;
+    mountPoint = _ref.mountPoint,
+    scrollableElement = _ref.scrollableElement,
+    targetCellRef = _ref.targetCellRef,
+    zIndex = _ref.zIndex;
+  var popupContentRef = useRef(null);
+  var setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
+  var handlePopupRef = useCallback(function (el) {
+    popupContentRef.current = el;
+    setOutsideClickTargetRef === null || setOutsideClickTargetRef === void 0 || setOutsideClickTargetRef(el);
+  }, [setOutsideClickTargetRef]);
   var closeCellMenu = useCallback(function () {
-    var state = editorView.state,
-      dispatch = editorView.dispatch,
-      dom = editorView.dom;
-    toggleContextualMenu()(state, dispatch);
+    var _getPluginState = getPluginState(editorView.state),
+      isCellMenuOpenByKeyboard = _getPluginState.isCellMenuOpenByKeyboard;
+    closeActiveTableMenu()(editorView.state, editorView.dispatch);
     if (isCellMenuOpenByKeyboard) {
-      setFocusToCellMenu(false)(state, dispatch);
-      dom.focus();
+      setFocusToCellMenu(false)(editorView.state, editorView.dispatch);
     }
-  }, [editorView, isCellMenuOpenByKeyboard]);
-  useEffect(function () {
-    if (!isOpen || currentUserIntent !== 'tableDragMenuPopupOpen') {
-      return;
+  }, [editorView]);
+  var isEventInsideCellMenu = useCallback(function (event) {
+    var _popupContentRef$curr;
+    var target = event.target;
+    if (!(target instanceof Node)) {
+      return false;
     }
-    closeCellMenu();
-  }, [closeCellMenu, currentUserIntent, isOpen]);
-  useEffect(function () {
-    if (!isOpen) {
-      return;
+    if ((_popupContentRef$curr = popupContentRef.current) !== null && _popupContentRef$curr !== void 0 && _popupContentRef$curr.contains(target)) {
+      return true;
     }
-    if (!(targetCellRef instanceof HTMLElement)) {
+    return target instanceof Element && Boolean(target.closest(NESTED_DROPDOWN_SELECTOR) || target.closest(CELL_MENU_TRIGGER_SELECTOR));
+  }, []);
+  var handleCellMenuClickOutside = useCallback(function (event) {
+    if (isEventInsideCellMenu(event)) {
       return;
     }
-    var ownerDocument = targetCellRef.ownerDocument;
-    var handlePointerDown = function handlePointerDown(event) {
-      var _tableMenuRef$current;
-      var target = event.target;
-      if (!(target instanceof Node)) {
-        return;
-      }
-      if ((_tableMenuRef$current = tableMenuRef.current) !== null && _tableMenuRef$current !== void 0 && _tableMenuRef$current.contains(target)) {
-        return;
-      }
-      var cellMenuButton = ownerDocument.querySelector(".".concat(ClassName.CONTEXTUAL_MENU_BUTTON));
-      if (cellMenuButton !== null && cellMenuButton !== void 0 && cellMenuButton.contains(target)) {
-        return;
-      }
-      closeCellMenu();
-    };
-    var handleKeyDown = function handleKeyDown(event) {
-      if (event.key === 'Escape') {
-        closeCellMenu();
-      }
-    };
-    var unbindPointerDown = bind(ownerDocument, {
-      type: 'pointerdown',
-      listener: handlePointerDown,
-      options: {
-        capture: true
-      }
-    });
-    var unbindKeyDown = bind(ownerDocument, {
-      type: 'keydown',
-      listener: handleKeyDown,
-      options: {
-        capture: true
-      }
-    });
-    return function () {
-      unbindPointerDown();
-      unbindKeyDown();
-    };
-  }, [closeCellMenu, isOpen, targetCellRef]);
-  return /*#__PURE__*/React.createElement(UserIntentPopupWrapper, {
+    closeCellMenu();
+  }, [closeCellMenu, isEventInsideCellMenu]);
+  return /*#__PURE__*/React.createElement(PopupWithListeners, {
+    alignX: "right",
+    alignY: "top",
+    target: targetCellRef,
+    mountTo: mountPoint,
+    boundariesElement: boundariesElement,
+    scrollableElement: scrollableElement,
+    fitHeight: tablePopupMenuFitHeight,
+    fitWidth: TABLE_MENU_WIDTH,
+    zIndex: zIndex,
+    forcePlacement: true
+    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
+    ,
+    offset: [-7, 0],
+    stick: true,
+    handleClickOutside: handleCellMenuClickOutside,
+    handleEscapeKeydown: closeCellMenu
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: handlePopupRef
+  }, /*#__PURE__*/React.createElement(UserIntentPopupWrapper, {
     api: api,
     userIntent: "tableContextualMenuPopupOpen"
-  }, /*#__PURE__*/React.createElement("div", {
-    ref: tableMenuRef
   }, /*#__PURE__*/React.createElement(TableMenu, {
     api: api,
     editorView: editorView,
     surface: CELL_MENU
-  })));
+  }))));
 };

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

@@ -4,6 +4,7 @@
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFloatingDialogZIndex, akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
@@ -11,7 +12,6 @@ import { findCellRectClosestToPos, getSelectionRect, isSelectionType } from '@at
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getPluginState } from '../../pm-plugins/plugin-factory';
 import { contextualMenuDropdownWidthDnD, contextualMenuTriggerSize, tablePopupMenuFitHeight } from '../consts';
-import { TABLE_MENU_WIDTH } from '../TableMenu/shared/consts';
 import { CellMenuPopup } from './CellMenuPopup';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
@@ -31,6 +31,14 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
     isCommentEditor = _ref.isCommentEditor,
     api = _ref.api,
     isDragMenuOpen = _ref.isDragMenuOpen;
+  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 isCellMenuOpen = expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ? (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'cell' : isOpen;
   if (!editorView) {
     return null;
   }
@@ -38,7 +46,7 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
   // TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
   var _getPluginState = getPluginState(editorView.state),
     targetCellPosition = _getPluginState.targetCellPosition;
-  if (!isOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
+  if (!isCellMenuOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
     return null;
   }
   var selection = editorView.state.selection;
@@ -55,6 +63,20 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
     return null;
   }
   var parentSticky = targetCellRef.parentElement && targetCellRef.parentElement.className.indexOf('sticky') > -1;
+  if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+    return jsx(CellMenuPopup, {
+      api: api,
+      boundariesElement: boundariesElement,
+      editorView: editorView,
+      mountPoint: mountPoint,
+      scrollableElement: scrollableElement
+      // Ignored via go/ees005
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      ,
+      targetCellRef: targetCellRef,
+      zIndex: parentSticky ? akEditorFloatingDialogZIndex : akEditorFloatingOverlapPanelZIndex
+    });
+  }
   return jsx(Popup, {
     alignX: "right",
     alignY: "top"
@@ -66,7 +88,7 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
     fitHeight: tablePopupMenuFitHeight,
-    fitWidth: expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ? TABLE_MENU_WIDTH : contextualMenuDropdownWidthDnD
+    fitWidth: contextualMenuDropdownWidthDnD
     // 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.
     ,
@@ -76,15 +98,7 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
     ,
     offset: [-7, 0],
     stick: true
-  }, expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ? jsx(CellMenuPopup, {
-    api: api,
-    editorView: editorView,
-    isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard,
-    isOpen: isOpen,
-    targetCellRef: targetCellRef
-  }) :
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-  jsx("div", {
+  }, jsx("div", {
     css: tablePopupStyles()
   }, jsx(ContextualMenu, {
     editorView: editorView

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

@@ -1,4 +1,5 @@
 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';
@@ -34,11 +35,23 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     api = _ref.api,
     isCommentEditor = _ref.isCommentEditor,
     tableWrapper = _ref.tableWrapper;
-  if (!isOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
+  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) {
     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 = direction === 'row' ? document.querySelector('#drag-handle-button-row') : document.querySelector('#drag-handle-button-column');
+  var targetHandleRef = dragMenuDirection === 'row' ? document.querySelector('#drag-handle-button-row') : document.querySelector('#drag-handle-button-column');
   if (!targetHandleRef || !(editorView.state.selection instanceof CellSelection)) {
     return null;
   }
@@ -47,8 +60,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: direction === 'row' ? 'right' : undefined,
-    alignY: direction === 'row' ? 'start' : undefined
+    alignX: dragMenuDirection === 'row' ? 'right' : undefined,
+    alignY: dragMenuDirection === 'row' ? 'start' : undefined
     // Ignored via go/ees005
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
     ,
@@ -72,13 +85,13 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
   }, /*#__PURE__*/React.createElement(TableMenu, {
     api: api,
     editorView: editorView,
-    surface: direction === 'row' ? ROW_MENU : COLUMN_MENU
+    surface: dragMenuDirection === 'row' ? ROW_MENU : COLUMN_MENU
   })) : /*#__PURE__*/React.createElement(DragMenu, {
     editorView: editorView,
-    isOpen: isOpen,
+    isOpen: isDragMenuOpen,
     tableNode: tableNode,
-    direction: direction,
-    index: index,
+    direction: dragMenuDirection,
+    index: dragMenuIndex,
     target: targetHandleRef || undefined,
     targetCellPosition: targetCellPosition,
     getEditorContainerWidth: getEditorContainerWidth,

package/dist/esm/ui/TableFloatingColumnControls/ColumnControls/index.js

@@ -8,6 +8,7 @@ import { CellSelection } from '@atlaskit/editor-tables';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { clearHoverSelection, hoverCell, hoverColumns, selectColumn, selectColumns } from '../../../pm-plugins/commands';
+import { toggleActiveTableMenuWithAnalytics } from '../../../pm-plugins/commands/commands-with-analytics';
 import { toggleDragMenuWithAnalytics } from '../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getRowsParams } from '../../../pm-plugins/utils/row-controls';
 import { getSelectedColumnIndexes } from '../../../pm-plugins/utils/selection';
@@ -24,7 +25,7 @@ var getSelectedColumns = function getSelectedColumns(selection) {
   return [];
 };
 export var ColumnControls = function ColumnControls(_ref) {
-  var _colWidths$map$join, _api$analytics2;
+  var _colWidths$map$join, _api$analytics3;
   var editorView = _ref.editorView,
     tableActive = _ref.tableActive,
     tableRef = _ref.tableRef,
@@ -117,14 +118,21 @@ export var ColumnControls = function ColumnControls(_ref) {
     }
   }, [editorView, tableActive]);
   var toggleDragMenuHandler = useCallback(function (trigger, event) {
-    var _api$analytics;
+    var _api$analytics2;
     var state = editorView.state,
       dispatch = editorView.dispatch;
     if (event !== null && event !== void 0 && event.shiftKey) {
       return;
     }
-    toggleDragMenuWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(undefined, 'column', colIndex, trigger)(state, dispatch);
-  }, [editorView, colIndex, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions]);
+    if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+      if (colIndex !== undefined) {
+        var _api$analytics;
+        toggleActiveTableMenuWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)('column', colIndex, trigger)(state, dispatch);
+      }
+      return;
+    }
+    toggleDragMenuWithAnalytics(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(undefined, 'column', colIndex, trigger)(state, dispatch);
+  }, [editorView, colIndex, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions]);
   var colIndexes = useMemo(function () {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/dist/esm/ui/TableFloatingControls/RowControls/DragControls.js

@@ -8,6 +8,7 @@ import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { clearHoverSelection } from '../../../pm-plugins/commands';
+import { toggleActiveTableMenuWithAnalytics } from '../../../pm-plugins/commands/commands-with-analytics';
 import { toggleDragMenuWithAnalytics } from '../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState as getTablePluginState } from '../../../pm-plugins/plugin-factory';
 import { getRowHeights, getRowsParams } from '../../../pm-plugins/utils/row-controls';
@@ -27,7 +28,7 @@ var getSelectedRows = function getSelectedRows(selection) {
   return [];
 };
 export var DragControls = function DragControls(_ref) {
-  var _tableNode$attrs$loca, _tableNode$attrs, _api$analytics2;
+  var _tableNode$attrs$loca, _tableNode$attrs, _api$analytics3;
   var tableRef = _ref.tableRef,
     tableNode = _ref.tableNode,
     tableWidth = _ref.tableWidth,
@@ -80,12 +81,20 @@ export var DragControls = function DragControls(_ref) {
     });
   }, [editorView]);
   var toggleDragMenuHandler = useCallback(function (trigger, event) {
-    var _api$analytics;
+    var _api$analytics2;
     if (event !== null && event !== void 0 && event.shiftKey) {
       return;
     }
-    toggleDragMenuWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(undefined, 'row', hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.rowIndex, trigger)(editorView.state, editorView.dispatch);
-  }, [editorView, hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.rowIndex, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions]);
+    var rowIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.rowIndex;
+    if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+      if (rowIndex !== undefined) {
+        var _api$analytics;
+        toggleActiveTableMenuWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)('row', rowIndex, trigger)(editorView.state, editorView.dispatch);
+      }
+      return;
+    }
+    toggleDragMenuWithAnalytics(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(undefined, 'row', rowIndex, trigger)(editorView.state, editorView.dispatch);
+  }, [editorView, hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.rowIndex, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions]);
   var rowIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.rowIndex;
   var handleMouseOut = useCallback(function () {
     if (tableActive) {