@atlaskit/editor-plugin-table 23.3.3 → 23.3.5

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

@@ -0,0 +1,167 @@
+import React, { useCallback, useContext, useMemo, useRef } from 'react';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { Popup } from '@atlaskit/editor-common/ui';
+import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
+import { akEditorFloatingDialogZIndex, akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { ToolbarKeyboardNavigationProvider } from '@atlaskit/editor-toolbar/toolbar-keyboard-navigation-provider';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { closeActiveTableMenu } from '../../pm-plugins/commands';
+import { TableCssClassName as ClassName } from '../../types';
+import { 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';
+var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
+
+// Defer drag-handle clicks to the drag handle's own toggle/select handlers — those own
+// the open/switch/close semantics for moving between rows/columns.
+var DRAG_HANDLE_CONTROLS_SELECTOR = ".".concat(ClassName.DRAG_ROW_CONTROLS, ", .").concat(ClassName.DRAG_COLUMN_CONTROLS);
+var NESTED_DROPDOWN_SELECTOR = '[data-toolbar-nested-dropdown-menu]';
+
+// Marks the menu subtree that ToolbarKeyboardNavigationProvider scopes its
+// keyboard handling to. The provider only reacts to events whose target sits
+// inside this selector.
+var TABLE_MENU_NAV_SELECTOR = '[data-table-drag-menu-nav="true"]';
+var TABLE_MENU_OFFSET = dragTableInsertColumnButtonSize + 4;
+var POPUP_OFFSET = [TABLE_MENU_OFFSET, 0];
+
+/**
+ * Row and column menu for table.
+ */
+var FloatingTableMenu = function FloatingTableMenu(_ref) {
+  var api = _ref.api,
+    boundariesElement = _ref.boundariesElement,
+    editorView = _ref.editorView,
+    mountPoint = _ref.mountPoint,
+    scrollableElement = _ref.scrollableElement,
+    stickyHeaders = _ref.stickyHeaders,
+    tableWrapper = _ref.tableWrapper,
+    targetCellPosition = _ref.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 isDragMenuOpen = (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'row' || (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'column';
+  var dragMenuDirection = isDragMenuOpen ? activeTableMenu.type : undefined;
+  var isOpenedByKeyboard = isDragMenuOpen && activeTableMenu.openedBy === 'keyboard';
+  var popupContentRef = useRef(null);
+  var setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
+  var navWrapperRef = useRef(null);
+  var handlePopupRef = useCallback(function (el) {
+    popupContentRef.current = el;
+    setOutsideClickTargetRef === null || setOutsideClickTargetRef === void 0 || setOutsideClickTargetRef(el);
+  }, [setOutsideClickTargetRef]);
+  var dismiss = useCallback(function () {
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
+  }, [api]);
+  var returnFocusToDragHandle = useCallback(function () {
+    // Match legacy DragMenu's closeMenu('handle') behaviour.
+    var handleId = dragMenuDirection === 'row' ? '#drag-handle-button-row' : '#drag-handle-button-column';
+    var handle = document.querySelector(handleId);
+    handle === null || handle === void 0 || handle.focus();
+  }, [dragMenuDirection]);
+  var focusFirstMenuItem = useCallback(function () {
+    var root = navWrapperRef.current;
+    if (!root) {
+      return;
+    }
+    var firstItem = root.querySelector('[role="menuitem"]:not([disabled]), [role="menuitemcheckbox"]:not([disabled]), [role="menuitemradio"]:not([disabled]), button:not([disabled])');
+    firstItem === null || firstItem === void 0 || firstItem.focus();
+  }, []);
+
+  // Focus the first menu item when the menu opens via keyboard (Enter/Space on
+  // the drag handle). Mouse-opened menus leave focus where the user clicked.
+  var setNavWrapperRef = useCallback(function (el) {
+    navWrapperRef.current = el;
+    if (el && isOpenedByKeyboard) {
+      // rAF allows the popup to finish positioning before focusing.
+      requestAnimationFrame(function () {
+        focusFirstMenuItem();
+      });
+    }
+  }, [focusFirstMenuItem, isOpenedByKeyboard]);
+  var handleKeyboardFocus = useCallback(function (_event) {
+    focusFirstMenuItem();
+  }, [focusFirstMenuItem]);
+  var handleEscape = useCallback(function (event) {
+    event.preventDefault();
+    event.stopPropagation();
+    dismiss();
+    returnFocusToDragHandle();
+  }, [dismiss, returnFocusToDragHandle]);
+
+  // Memoize the editor DOM reference so the provider doesn't re-bind listeners
+  // on every render (the provider depends on `dom` in its effect's deps).
+  var editorDom = useMemo(function () {
+    return editorView.dom instanceof HTMLElement ? editorView.dom : undefined;
+  }, [editorView.dom]);
+
+  // The drag menu is opened by interacting with the drag handle directly, not
+  // by a global page-level shortcut.
+  var isShortcutToFocusToolbar = useCallback(function () {
+    return false;
+  }, []);
+  var handleClickOutside = useCallback(function (event) {
+    var _popupContentRef$curr;
+    var target = event.target;
+    // Ignore clicks handled by this popup, drag handles, or nested portalled
+    // dropdowns so those controls can manage their own open/close behavior.
+    if (target instanceof Node && (_popupContentRef$curr = popupContentRef.current) !== null && _popupContentRef$curr !== void 0 && _popupContentRef$curr.contains(target) || target instanceof Element && (target.closest(DRAG_HANDLE_CONTROLS_SELECTOR) || target.closest(NESTED_DROPDOWN_SELECTOR))) {
+      return;
+    }
+    dismiss();
+  }, [dismiss]);
+  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 = dragMenuDirection === 'row' ? document.querySelector('#drag-handle-button-row') : document.querySelector('#drag-handle-button-column');
+  if (!targetHandleRef || !(editorView.state.selection instanceof CellSelection)) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(PopupWithListeners, {
+    alignX: dragMenuDirection === 'row' ? 'right' : undefined,
+    alignY: dragMenuDirection === 'row' ? 'start' : undefined
+    // Ignored via go/ees005
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
+    ,
+    target: targetHandleRef,
+    mountTo: mountPoint,
+    boundariesElement: boundariesElement,
+    scrollableElement: scrollableElement,
+    fitWidth: TABLE_MENU_WIDTH,
+    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.
+    // In sticky mode, we want to show the menu above the sticky header
+    ,
+    zIndex: inStickyMode ? akEditorFloatingDialogZIndex : akEditorFloatingOverlapPanelZIndex,
+    forcePlacement: true,
+    preventOverflow: dragMenuDirection === 'row',
+    offset: POPUP_OFFSET,
+    stick: true,
+    handleClickOutside: handleClickOutside
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: handlePopupRef
+  }, /*#__PURE__*/React.createElement(ToolbarKeyboardNavigationProvider, {
+    childComponentSelector: TABLE_MENU_NAV_SELECTOR,
+    dom: editorDom,
+    isShortcutToFocusToolbar: isShortcutToFocusToolbar,
+    handleFocus: handleKeyboardFocus,
+    handleEscape: handleEscape
+  }, /*#__PURE__*/React.createElement("div", {
+    "data-table-drag-menu-nav": "true",
+    ref: setNavWrapperRef
+  }, /*#__PURE__*/React.createElement(TableMenu, {
+    api: api,
+    editorView: editorView,
+    surface: dragMenuDirection === 'row' ? ROW_MENU : COLUMN_MENU
+  })))));
+};
+FloatingTableMenu.displayName = 'FloatingTableMenu';
+export default FloatingTableMenu;

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

@@ -1,15 +1,16 @@
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
 
 import React, { useCallback, useMemo, useRef } from 'react';
+import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 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 { clearHoverSelection, closeActiveTableMenu, hoverCell, hoverColumns, selectColumn, selectColumns, toggleActiveTableMenu } from '../../../pm-plugins/commands';
 import { toggleDragMenuWithAnalytics } from '../../../pm-plugins/drag-and-drop/commands-with-analytics';
+import { getPluginState as getTablePluginState } from '../../../pm-plugins/plugin-factory';
 import { getRowsParams } from '../../../pm-plugins/utils/row-controls';
 import { getSelectedColumnIndexes } from '../../../pm-plugins/utils/selection';
 import { TableCssClassName as ClassName } from '../../../types';
@@ -25,7 +26,7 @@ var getSelectedColumns = function getSelectedColumns(selection) {
   return [];
 };
 export var ColumnControls = function ColumnControls(_ref) {
-  var _colWidths$map$join, _api$analytics3;
+  var _colWidths$map$join;
   var editorView = _ref.editorView,
     tableActive = _ref.tableActive,
     tableRef = _ref.tableRef,
@@ -122,17 +123,48 @@ export var ColumnControls = function ColumnControls(_ref) {
     var state = editorView.state,
       dispatch = editorView.dispatch;
     if (event !== null && event !== void 0 && event.shiftKey) {
+      // Shift-click extends the selection rather than toggling the menu, but the
+      // open drag menu would otherwise stay anchored to a stale column. Close it here
+      // for the updated menu (legacy menu closes via outside-click on its dropdown).
+      if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+        api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
+      }
       return;
     }
     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);
+      if (colIndex !== undefined && api) {
+        var _getTablePluginState = getTablePluginState(state),
+          currentActiveTableMenu = _getTablePluginState.activeTableMenu;
+        var isSameActiveMenu = (currentActiveTableMenu === null || currentActiveTableMenu === void 0 ? void 0 : currentActiveTableMenu.type) === 'column' && currentActiveTableMenu.index === colIndex;
+        api.core.actions.execute(function (_ref2) {
+          var tr = _ref2.tr;
+          if (!isSameActiveMenu) {
+            var _api$analytics;
+            (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({
+              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: 'column'
+              }
+            })(tr);
+          }
+          toggleActiveTableMenu({
+            type: 'column',
+            index: colIndex,
+            openedBy: trigger
+          }, currentActiveTableMenu, api)({
+            tr: tr
+          });
+          return tr;
+        });
       }
       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]);
+  }, [editorView, colIndex, api]);
   var colIndexes = useMemo(function () {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -239,9 +271,9 @@ export var ColumnControls = function ColumnControls(_ref) {
       overflowX: stickyTop ? 'hidden' : 'visible',
       pointerEvents: isDragging ? 'none' : undefined
     }
-  }, columnParams.map(function (_ref2, index) {
-    var startIndex = _ref2.startIndex,
-      endIndex = _ref2.endIndex;
+  }, columnParams.map(function (_ref3, index) {
+    var startIndex = _ref3.startIndex,
+      endIndex = _ref3.endIndex;
     return /*#__PURE__*/React.createElement("div", {
       style: {
         gridColumn: "".concat(startIndex + 1, " / span 1")

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

@@ -2,13 +2,13 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
 
 import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
+import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { CellSelection } from '@atlaskit/editor-tables';
 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 { clearHoverSelection, closeActiveTableMenu, toggleActiveTableMenu } from '../../../pm-plugins/commands';
 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';
@@ -28,7 +28,7 @@ var getSelectedRows = function getSelectedRows(selection) {
   return [];
 };
 export var DragControls = function DragControls(_ref) {
-  var _tableNode$attrs$loca, _tableNode$attrs, _api$analytics3;
+  var _tableNode$attrs$loca, _tableNode$attrs;
   var tableRef = _ref.tableRef,
     tableNode = _ref.tableNode,
     tableWidth = _ref.tableWidth,
@@ -83,18 +83,49 @@ export var DragControls = function DragControls(_ref) {
   var toggleDragMenuHandler = useCallback(function (trigger, event) {
     var _api$analytics2;
     if (event !== null && event !== void 0 && event.shiftKey) {
+      // Shift-click extends the selection rather than toggling the menu, but the
+      // open drag menu would otherwise stay anchored to a stale row. Close it here
+      // for the updated menu (legacy menu closes via outside-click on its dropdown).
+      if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+        api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
+      }
       return;
     }
     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);
+      if (rowIndex !== undefined && api) {
+        var _getTablePluginState2 = getTablePluginState(editorView.state),
+          currentActiveTableMenu = _getTablePluginState2.activeTableMenu;
+        var isSameActiveMenu = (currentActiveTableMenu === null || currentActiveTableMenu === void 0 ? void 0 : currentActiveTableMenu.type) === 'row' && currentActiveTableMenu.index === rowIndex;
+        api.core.actions.execute(function (_ref4) {
+          var tr = _ref4.tr;
+          if (!isSameActiveMenu) {
+            var _api$analytics;
+            (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({
+              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: 'row'
+              }
+            })(tr);
+          }
+          toggleActiveTableMenu({
+            type: 'row',
+            index: rowIndex,
+            openedBy: trigger
+          }, currentActiveTableMenu, api)({
+            tr: tr
+          });
+          return tr;
+        });
       }
       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]);
+  }, [editorView, hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.rowIndex, api]);
   var rowIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.rowIndex;
   var handleMouseOut = useCallback(function () {
     if (tableActive) {
@@ -225,9 +256,9 @@ export var DragControls = function DragControls(_ref) {
     },
     onMouseMove: handleMouseMove,
     contentEditable: false
-  }, rowsParams.map(function (_ref4, index) {
-    var startIndex = _ref4.startIndex,
-      endIndex = _ref4.endIndex;
+  }, rowsParams.map(function (_ref5, index) {
+    var startIndex = _ref5.startIndex,
+      endIndex = _ref5.endIndex;
     return (
       /*#__PURE__*/
       // Ignored via go/ees005
@@ -278,21 +309,21 @@ export var DragControls = function DragControls(_ref) {
     );
   }), rowHandles());
 };
-export var DragControlsWithSelection = function DragControlsWithSelection(_ref5) {
-  var editorView = _ref5.editorView,
-    tableRef = _ref5.tableRef,
-    tableNode = _ref5.tableNode,
-    tableWidth = _ref5.tableWidth,
-    tableActive = _ref5.tableActive,
-    hoveredCell = _ref5.hoveredCell,
-    isInDanger = _ref5.isInDanger,
-    isTableHovered = _ref5.isTableHovered,
-    isResizing = _ref5.isResizing,
-    hoverRows = _ref5.hoverRows,
-    selectRow = _ref5.selectRow,
-    selectRows = _ref5.selectRows,
-    updateCellHoverLocation = _ref5.updateCellHoverLocation,
-    api = _ref5.api;
+export var DragControlsWithSelection = function DragControlsWithSelection(_ref6) {
+  var editorView = _ref6.editorView,
+    tableRef = _ref6.tableRef,
+    tableNode = _ref6.tableNode,
+    tableWidth = _ref6.tableWidth,
+    tableActive = _ref6.tableActive,
+    hoveredCell = _ref6.hoveredCell,
+    isInDanger = _ref6.isInDanger,
+    isTableHovered = _ref6.isTableHovered,
+    isResizing = _ref6.isResizing,
+    hoverRows = _ref6.hoverRows,
+    selectRow = _ref6.selectRow,
+    selectRows = _ref6.selectRows,
+    updateCellHoverLocation = _ref6.updateCellHoverLocation,
+    api = _ref6.api;
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['selection'], function (states) {
       var _states$selectionStat;
       return {

package/dist/esm/ui/TableMenu/cell/items/MergeCellsItem.js

@@ -26,7 +26,7 @@ export var MergeCellsItem = function MergeCellsItem(_ref) {
       return;
     }
     mergeCellsWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.CONTEXT_MENU)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   if (!shouldShowMergeCells(tableMenuContext)) {

package/dist/esm/ui/TableMenu/cell/items/SplitCellItem.js

@@ -26,7 +26,7 @@ export var SplitCellItem = function SplitCellItem(_ref) {
       return;
     }
     splitCellWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.CONTEXT_MENU)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   if (!shouldShowSplitCell(tableMenuContext)) {

package/dist/esm/ui/TableMenu/cell/items/VerticalAlignDropdownItem.js

@@ -31,7 +31,7 @@ export var VerticalAlignDropdownItem = function VerticalAlignDropdownItem(_ref)
       }, targetCellPosition)({
         tr: tr
       });
-      closeActiveTableMenu()({
+      closeActiveTableMenu(api)({
         tr: tr
       });
       return tr;

package/dist/esm/ui/TableMenu/column/items/AddColumnLeftItem.js

@@ -39,7 +39,7 @@ export var AddColumnLeftItem = function AddColumnLeftItem(_ref) {
     }
     var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (isTableFixedColumnWidthsOptionEnabled || isCommentEditor);
     insertColumnWithAnalytics(api, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.TABLE_CONTEXT_MENU, index)(editorView.state, editorView.dispatch, editorView);
-    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

package/dist/esm/ui/TableMenu/column/items/AddColumnRightItem.js

@@ -39,7 +39,7 @@ export var AddColumnRightItem = function AddColumnRightItem(_ref) {
     }
     var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (isTableFixedColumnWidthsOptionEnabled || isCommentEditor);
     insertColumnWithAnalytics(api, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.TABLE_CONTEXT_MENU, index)(editorView.state, editorView.dispatch, editorView);
-    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

package/dist/esm/ui/TableMenu/column/items/DeleteColumnItem.js

@@ -57,7 +57,7 @@ export var DeleteColumnItem = function DeleteColumnItem(_ref) {
     }
     var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (isTableFixedColumnWidthsOptionEnabled || isCommentEditor);
     deleteColumnsWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect)(editorView.state, editorView.dispatch, editorView);
-    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

package/dist/esm/ui/TableMenu/column/items/DistributeColumnsItem.js

@@ -48,7 +48,7 @@ export var DistributeColumnsItem = function DistributeColumnsItem(_ref) {
       return;
     }
     distributeColumnsWidthsWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api)(INPUT_METHOD.TABLE_CONTEXT_MENU, newResizeState)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   if (!shouldShowDistributeColumns(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount)) {

package/dist/esm/ui/TableMenu/column/items/MoveColumnLeftItem.js

@@ -42,7 +42,7 @@ export var MoveColumnLeftItem = function MoveColumnLeftItem(props) {
       return;
     }
     moveSourceWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api === null || api === 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_COLUMN, getSelectedColumnIndexes(selectionRect), selectionRect.left - 1)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   if (!tableNode || !shouldShowMoveColumnLeft(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstColumn)) {

package/dist/esm/ui/TableMenu/column/items/MoveColumnRightItem.js

@@ -41,7 +41,7 @@ export var MoveColumnRightItem = function MoveColumnRightItem(props) {
       return;
     }
     moveSourceWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api === null || api === 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_COLUMN, getSelectedColumnIndexes(selectionRect), selectionRect.right)(editorView.state, editorView.dispatch);
-    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   if (!tableNode || !shouldShowMoveColumnRight(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isLastColumn)) {

package/dist/esm/ui/TableMenu/column/items/SortDecreasingItem.js

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

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

@@ -26,7 +26,7 @@ export var SortIncreasingItem = function SortIncreasingItem(_ref) {
       return;
     }
     sortColumnWithAnalytics(api === null || api === 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 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

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

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

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

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

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

@@ -52,7 +52,7 @@ export var DeleteRowItem = function DeleteRowItem(props) {
       return;
     }
     deleteRowsWithAnalytics(api === null || api === 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 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

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

@@ -41,7 +41,7 @@ export var MoveRowDownItem = function MoveRowDownItem(props) {
       return;
     }
     moveSourceWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api === null || api === 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 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   if (!tableNode || !shouldShowMoveRowDown(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isLastRow)) {

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

@@ -41,7 +41,7 @@ export var MoveRowUpItem = function MoveRowUpItem(props) {
       return;
     }
     moveSourceWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api === null || api === 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 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   if (!tableNode || !shouldShowMoveRowUp(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstRow)) {

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

@@ -28,17 +28,17 @@ export var TableMenu = /*#__PURE__*/memo(function (_ref) {
     tableNode = _useSharedPluginState.tableNode,
     selection = _useSharedPluginState.selection;
   var tableMenuContext = useMemo(function () {
-    if (!selection || !tableNode) {
-      return {
-        editorView: 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;
     }
     var tableMap = TableMap.get(tableNode);
-    var selectionRect = getSelectionRect(selection);
+    var selectionRect = getSelectionRect(editorView.state.selection);
     var cellOps = {
       editorView: 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 var TableMenu = /*#__PURE__*/memo(function (_ref) {
       isLastColumn: selectionRect.right === tableMap.width,
       selectedColumnCount: selectionRect.right - selectionRect.left
     });
-  }, [editorView, selection, tableNode]);
+  }, [editorView, tableNode, selection]);
   if (components.length === 0) {
     return null;
   }

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

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

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

@@ -42,7 +42,7 @@ export var BackgroundColorItem = function BackgroundColorItem(_ref) {
       return;
     }
     setColorWithAnalytics(api === null || api === 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 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   }, [api, editorView]);
   // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage

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

@@ -25,7 +25,7 @@ export var ClearCellsItem = function ClearCellsItem(_ref) {
     var _getPluginState = getPluginState(editorView.state),
       targetCellPosition = _getPluginState.targetCellPosition;
     emptyMultipleCellsWithAnalytics(api === null || api === 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 || api.core.actions.execute(closeActiveTableMenu());
+    api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

package/dist/types/pm-plugins/commands/active-table-menu.d.ts

@@ -1,6 +1,6 @@
 import type { EditorCommand } from '@atlaskit/editor-common/types';
-import type { ActiveTableMenu } from '../../types';
-export declare const closeActiveTableMenu: () => EditorCommand;
+import type { ActiveTableMenu, PluginInjectionAPI } from '../../types';
+export declare const closeActiveTableMenu: (api?: PluginInjectionAPI | null) => EditorCommand;
 export declare const toggleActiveTableMenu: (activeTableMenu: Exclude<ActiveTableMenu, {
     type: "none";
-}>, currentActiveTableMenu: ActiveTableMenu | undefined) => EditorCommand;
+}>, currentActiveTableMenu: ActiveTableMenu | undefined, api?: PluginInjectionAPI | null) => EditorCommand;