@atlaskit/editor-plugin-table 27.0.0 → 27.0.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-table
 
+## 27.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 27.0.1
+
+### Patch Changes
+
+- [`945f7cef17713`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/945f7cef17713) -
+  Fix table menu selection and shortcut behavior behind
+  `platform_editor_table_menu_updates_patch_4`.
+- Updated dependencies
+
 ## 27.0.0
 
 ### Patch Changes

package/dist/cjs/pm-plugins/decorations/utils/column-controls.js

@@ -8,8 +8,6 @@ var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _types = require("../../../types");
 var _decoration = require("../../utils/decoration");
 var _composeDecorations = require("./compose-decorations");
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 var isColumnSelected = function isColumnSelected(tr) {
   return tr.selection instanceof _cellSelection.CellSelection && tr.selection.isColSelection();
 };

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

@@ -11,6 +11,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _utils3 = require("@atlaskit/editor-tables/utils");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _defaultTableSelection = require("./default-table-selection");
 var _pluginKey = require("./table-resizing/plugin-key");
@@ -18,7 +19,6 @@ var _collapse = require("./utils/collapse");
 var _nodes = require("./utils/nodes");
 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) { (0, _defineProperty2.default)(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; } // #region Imports
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
 var nextTableSorting = function nextTableSorting(tr, table) {
   var tableSortStep = tr.steps.find(function (step) {
     return step instanceof _customSteps.TableSortStep;
@@ -43,6 +43,7 @@ var updateTargetCellPosition = function updateTargetCellPosition(_ref2) {
   return function (pluginState) {
     var tableNode = table && table.node;
     if ((0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true)) {
+      var _pluginState$activeTa, _pluginState$activeTa2;
       var _targetCellPosition;
       if (tableNode) {
         var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
@@ -53,14 +54,16 @@ var updateTargetCellPosition = function updateTargetCellPosition(_ref2) {
       }
       var hasTargetCellChanged = pluginState.targetCellPosition !== _targetCellPosition;
       var hasActiveTableMenu = pluginState.activeTableMenu != null && pluginState.activeTableMenu.type !== 'none';
-      var shouldCloseMenu = hasActiveTableMenu && tr.selectionSet && (!tableNode || hasTargetCellChanged || !(tr.selection instanceof _cellSelection.CellSelection));
+      var isActiveDragMenu = ((_pluginState$activeTa = pluginState.activeTableMenu) === null || _pluginState$activeTa === void 0 ? void 0 : _pluginState$activeTa.type) === 'row' || ((_pluginState$activeTa2 = pluginState.activeTableMenu) === null || _pluginState$activeTa2 === void 0 ? void 0 : _pluginState$activeTa2.type) === 'column';
+      var shouldPreserveActiveDragMenu = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_4') && isActiveDragMenu && tr.selection instanceof _cellSelection.CellSelection;
+      var shouldCloseMenu = hasActiveTableMenu && tr.selectionSet && (!tableNode || !(tr.selection instanceof _cellSelection.CellSelection) || hasTargetCellChanged && !shouldPreserveActiveDragMenu);
       if (!hasTargetCellChanged && !shouldCloseMenu) {
         return pluginState;
       }
 
-      // The updated table menu is anchored to a table selection. When selection moves
-      // to another cell, leaves the table, or changes from a CellSelection to a text cursor,
-      // close the active menu so render state cannot point at a stale anchor.
+      // Cell menus are anchored to a specific cell and close when that target changes. Row and
+      // column menus are anchored to the selected-range drag handle, so keep them open while a
+      // CellSelection expands and let the handle re-render at the updated range.
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         targetCellPosition: _targetCellPosition,
         activeTableMenu: shouldCloseMenu ? {

package/dist/cjs/pm-plugins/table-resizing/plugin-factory.js

@@ -10,8 +10,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _pluginKey = require("./plugin-key");
 var _reducer = _interopRequireDefault(require("./reducer"));
 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) { (0, _defineProperty2.default)(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; } // @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-// eslint-disable-next-line import/order
+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) { (0, _defineProperty2.default)(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; } // eslint-disable-next-line import/order
 // eslint-disable-next-line import/order
 
 // eslint-disable-next-line import/order

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

@@ -7,8 +7,6 @@ exports.isTableCollapsible = exports.collapseSelectedTable = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils = require("@atlaskit/editor-tables/utils");
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 var bail = function bail() {
   return {
     tableIsCollapsible: false

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

@@ -17,8 +17,6 @@ var _types = require("../../types");
 var _ColumnResizeWidget = require("../../ui/ColumnResizeWidget");
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 var filterDecorationByKey = function filterDecorationByKey(key, decorationSet) {
   return decorationSet.find(undefined, undefined, function (spec) {
     return spec.key.indexOf(key) > -1;

package/dist/cjs/ui/DragHandle/index.js

@@ -16,6 +16,7 @@ var _browser = require("@atlaskit/editor-common/browser");
 var _messages = require("@atlaskit/editor-common/messages");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _editorTables = require("@atlaskit/editor-tables");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -191,6 +192,22 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
       return tr;
     });
   }, [api]);
+  var keepActiveDragMenuOrHideToolbar = (0, _react.useCallback)(function () {
+    var _api$table2, _api$core2;
+    if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_4') || !api) {
+      return;
+    }
+    var activeTableMenu = (_api$table2 = api.table) === null || _api$table2 === void 0 || (_api$table2 = _api$table2.sharedState.currentState()) === null || _api$table2 === void 0 ? void 0 : _api$table2.activeTableMenu;
+    var isActiveTableMenuOpen = (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'row' || (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'column';
+    (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref6) {
+      var _api$userIntent2;
+      var tr = _ref6.tr;
+      (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || _api$userIntent2.commands.setCurrentUserIntent(isActiveTableMenuOpen ? 'tableDragMenuPopupOpen' : 'dragHandleSelected')({
+        tr: tr
+      });
+      return tr;
+    });
+  }, [api]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("button", {
     type: "button"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -258,6 +275,10 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
       // return focus to editor so copying table selections whilst still works, i cannot call e.preventDefault in a mousemove event as this stops dragstart events from firing
       // -> this is bad for a11y but is the current standard new copy/paste keyboard shortcuts should be introduced instead
       editorView.focus();
+      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_4') && e.shiftKey) {
+        keepActiveDragMenuOrHideToolbar();
+        return;
+      }
       if ((0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true)) {
         toggleDragMenu && toggleDragMenu('mouse', e, indexes[0]);
       } else {

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

@@ -11,7 +11,9 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _utils = require("@atlaskit/editor-tables/utils");
 var _toolbarKeyboardNavigationProvider = require("@atlaskit/editor-toolbar/toolbar-keyboard-navigation-provider");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _commands = require("../../pm-plugins/commands");
 var _types = require("../../types");
 var _consts = require("../consts");
@@ -128,7 +130,7 @@ var FloatingTableMenu = function FloatingTableMenu(_ref) {
     }
     api === null || api === void 0 || api.core.actions.execute((0, _commands.closeActiveTableMenu)(api));
   }, [api]);
-  if (!isDragMenuOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
+  if (!isDragMenuOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_4') && (0, _utils.isTableSelected)(editorView.state.selection)) {
     return null;
   }
   var inStickyMode = (stickyHeaders === null || stickyHeaders === void 0 ? void 0 : stickyHeaders.sticky) || (tableWrapper === null || tableWrapper === void 0 ? void 0 : tableWrapper.classList.contains(_types.TableCssClassName.TABLE_NODE_WRAPPER_NO_OVERFLOW));

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

@@ -12,9 +12,11 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
 var _selection = require("../../../../pm-plugins/utils/selection");
+var _keys = require("../../cell/keys");
 var _selection2 = require("../../shared/selection");
 var _TableMenuContext = require("../../shared/TableMenuContext");
 var DeleteColumnItem = exports.DeleteColumnItem = function DeleteColumnItem(_ref) {
@@ -24,6 +26,7 @@ var DeleteColumnItem = exports.DeleteColumnItem = function DeleteColumnItem(_ref
   var _ref2 = tableMenuContext !== null && tableMenuContext !== void 0 ? tableMenuContext : {},
     editorView = _ref2.editorView;
   var selectedColumnCount = (_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1;
+  var shouldShowShortcut = !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_4') || (tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.surface.key) !== _keys.CELL_MENU.key;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api !== null && api !== void 0 ? api : undefined, ['table'], function (states) {
@@ -78,9 +81,9 @@ var DeleteColumnItem = exports.DeleteColumnItem = function DeleteColumnItem(_ref
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: shouldShowShortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = (0, _keymaps.tooltip)(_keymaps.deleteColumn)) !== null && _tooltip !== void 0 ? _tooltip : ''
-    })
+    }) : undefined
   }, formatMessage(_messages.tableMessages.removeColumns, {
     0: selectedColumnCount
   }));

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

@@ -12,9 +12,11 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
 var _selection = require("../../../../pm-plugins/utils/selection");
+var _keys = require("../../cell/keys");
 var _selection2 = require("../../shared/selection");
 var _TableMenuContext = require("../../shared/TableMenuContext");
 var DeleteRowItem = exports.DeleteRowItem = function DeleteRowItem(props) {
@@ -31,6 +33,7 @@ var DeleteRowItem = exports.DeleteRowItem = function DeleteRowItem(props) {
     }),
     isHeaderRowRequired = _useSharedPluginState.isHeaderRowRequired;
   var selectedRowCount = (_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedRowCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1;
+  var shouldShowShortcut = !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_4') || (tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.surface.key) !== _keys.CELL_MENU.key;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var handleMouseEnter = function handleMouseEnter() {
@@ -73,9 +76,9 @@ var DeleteRowItem = exports.DeleteRowItem = function DeleteRowItem(props) {
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: shouldShowShortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = (0, _keymaps.tooltip)(_keymaps.deleteRow)) !== null && _tooltip !== void 0 ? _tooltip : ''
-    })
+    }) : undefined
   }, formatMessage(_messages.tableMessages.removeRows, {
     0: selectedRowCount
   }));

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

@@ -47,6 +47,7 @@ var TableMenu = exports.TableMenu = /*#__PURE__*/(0, _react.memo)(function (_ref
     var selectionRect = (0, _utils.getSelectionRect)(editorView.state.selection);
     var cellOps = {
       editorView: editorView,
+      surface: surface,
       canMergeCells: (0, _merge.canMergeCellSelection)(editorView.state.selection),
       canSplitCell: (0, _splitCell.canSplitCellSelection)(editorView.state.selection),
       hasMergedCellsInTable: tableMap.hasMergedCells()
@@ -66,7 +67,7 @@ var TableMenu = exports.TableMenu = /*#__PURE__*/(0, _react.memo)(function (_ref
       isLastColumn: selectionRect.right === tableMap.width,
       selectedColumnCount: selectionRect.right - selectionRect.left
     });
-  }, [editorView, tableNode, selection]);
+  }, [editorView, tableNode, selection, surface]);
   if (components.length === 0) {
     return null;
   }

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

@@ -11,9 +11,11 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
 var _pluginFactory = require("../../../../pm-plugins/plugin-factory");
+var _keys = require("../../cell/keys");
 var _TableMenuContext = require("../TableMenuContext");
 var ClearCellsItem = exports.ClearCellsItem = function ClearCellsItem(_ref) {
   var _tableMenuContext$sel, _tableMenuContext$sel2, _tooltip;
@@ -24,6 +26,7 @@ var ClearCellsItem = exports.ClearCellsItem = function ClearCellsItem(_ref) {
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var selectedCellCount = Math.max((_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1, (_tableMenuContext$sel2 = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedRowCount) !== null && _tableMenuContext$sel2 !== void 0 ? _tableMenuContext$sel2 : 1);
+  var shouldShowShortcut = !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_4') || (tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.surface.key) !== _keys.CELL_MENU.key || selectedCellCount > 1;
   var handleClick = function handleClick() {
     var _api$analytics;
     if (!editorView) {
@@ -42,9 +45,9 @@ var ClearCellsItem = exports.ClearCellsItem = function ClearCellsItem(_ref) {
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: shouldShowShortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = (0, _keymaps.tooltip)(_keymaps.backspace)) !== null && _tooltip !== void 0 ? _tooltip : ''
-    })
+    }) : undefined
   }, formatMessage(_messages.tableMessages.clearCells, {
     0: selectedCellCount
   }));

package/dist/es2019/pm-plugins/decorations/utils/column-controls.js

@@ -1,5 +1,3 @@
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableDecorations } from '../../../types';
 import { createColumnSelectedDecoration, findColumnControlSelectedDecoration, findControlsHoverDecoration, updateDecorations } from '../../utils/decoration';

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

@@ -1,12 +1,10 @@
 // #region Imports
 import { TableSortStep } from '@atlaskit/custom-steps';
 import { isTextInput } from '@atlaskit/editor-common/utils';
-
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findTable } from '@atlaskit/editor-tables/utils';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { defaultTableSelection } from './default-table-selection';
 import { pluginKey as tableResizingPluginKey } from './table-resizing/plugin-key';
@@ -33,6 +31,7 @@ const updateTargetCellPosition = ({
 }) => pluginState => {
   const tableNode = table && table.node;
   if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+    var _pluginState$activeTa, _pluginState$activeTa2;
     let targetCellPosition;
     if (tableNode) {
       const {
@@ -44,14 +43,16 @@ const updateTargetCellPosition = ({
     }
     const hasTargetCellChanged = pluginState.targetCellPosition !== targetCellPosition;
     const hasActiveTableMenu = pluginState.activeTableMenu != null && pluginState.activeTableMenu.type !== 'none';
-    const shouldCloseMenu = hasActiveTableMenu && tr.selectionSet && (!tableNode || hasTargetCellChanged || !(tr.selection instanceof CellSelection));
+    const isActiveDragMenu = ((_pluginState$activeTa = pluginState.activeTableMenu) === null || _pluginState$activeTa === void 0 ? void 0 : _pluginState$activeTa.type) === 'row' || ((_pluginState$activeTa2 = pluginState.activeTableMenu) === null || _pluginState$activeTa2 === void 0 ? void 0 : _pluginState$activeTa2.type) === 'column';
+    const shouldPreserveActiveDragMenu = isExperimentEnabled('platform_editor_table_menu_updates_patch_4') && isActiveDragMenu && tr.selection instanceof CellSelection;
+    const shouldCloseMenu = hasActiveTableMenu && tr.selectionSet && (!tableNode || !(tr.selection instanceof CellSelection) || hasTargetCellChanged && !shouldPreserveActiveDragMenu);
     if (!hasTargetCellChanged && !shouldCloseMenu) {
       return pluginState;
     }
 
-    // The updated table menu is anchored to a table selection. When selection moves
-    // to another cell, leaves the table, or changes from a CellSelection to a text cursor,
-    // close the active menu so render state cannot point at a stale anchor.
+    // Cell menus are anchored to a specific cell and close when that target changes. Row and
+    // column menus are anchored to the selected-range drag handle, so keep them open while a
+    // CellSelection expands and let the handle re-render at the updated range.
     return {
       ...pluginState,
       targetCellPosition,

package/dist/es2019/pm-plugins/table-resizing/plugin-factory.js

@@ -1,4 +1,3 @@
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
 import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { pluginKey } from './plugin-key';
 // eslint-disable-next-line import/order

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

@@ -1,6 +1,4 @@
 import { NodeRange } from '@atlaskit/editor-prosemirror/model';
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
 import { findTable } from '@atlaskit/editor-tables/utils';
 const bail = () => ({

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

@@ -3,9 +3,6 @@ import { RawIntlProvider } from 'react-intl';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid/v4';
 import { nonNullable } from '@atlaskit/editor-common/utils';
-
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getCellsInRow, getSelectionRect } from '@atlaskit/editor-tables/utils';

package/dist/es2019/ui/DragHandle/index.js

@@ -8,6 +8,7 @@ import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findTable, TableMap } from '@atlaskit/editor-tables';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -180,6 +181,23 @@ const DragHandleComponent = ({
       return tr;
     });
   }, [api]);
+  const keepActiveDragMenuOrHideToolbar = useCallback(() => {
+    var _api$table2, _api$table2$sharedSta, _api$core2;
+    if (!isExperimentEnabled('platform_editor_table_menu_updates_patch_4') || !api) {
+      return;
+    }
+    const activeTableMenu = (_api$table2 = api.table) === null || _api$table2 === void 0 ? void 0 : (_api$table2$sharedSta = _api$table2.sharedState.currentState()) === null || _api$table2$sharedSta === void 0 ? void 0 : _api$table2$sharedSta.activeTableMenu;
+    const isActiveTableMenuOpen = (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'row' || (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'column';
+    (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
+      tr
+    }) => {
+      var _api$userIntent2;
+      (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.commands.setCurrentUserIntent(isActiveTableMenuOpen ? 'tableDragMenuPopupOpen' : 'dragHandleSelected')({
+        tr
+      });
+      return tr;
+    });
+  }, [api]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("button", {
     type: "button"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -251,6 +269,10 @@ const DragHandleComponent = ({
       // return focus to editor so copying table selections whilst still works, i cannot call e.preventDefault in a mousemove event as this stops dragstart events from firing
       // -> this is bad for a11y but is the current standard new copy/paste keyboard shortcuts should be introduced instead
       editorView.focus();
+      if (isExperimentEnabled('platform_editor_table_menu_updates_patch_4') && e.shiftKey) {
+        keepActiveDragMenuOrHideToolbar();
+        return;
+      }
       if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
         toggleDragMenu && toggleDragMenu('mouse', e, indexes[0]);
       } else {

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

@@ -4,7 +4,9 @@ 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 { isTableSelected } from '@atlaskit/editor-tables/utils';
 import { ToolbarKeyboardNavigationProvider } from '@atlaskit/editor-toolbar/toolbar-keyboard-navigation-provider';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { closeActiveTableMenu } from '../../pm-plugins/commands';
 import { TableCssClassName as ClassName } from '../../types';
 import { dragTableInsertColumnButtonSize, tablePopupMenuFitHeight } from '../consts';
@@ -118,7 +120,7 @@ const FloatingTableMenu = ({
     }
     api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
   }, [api]);
-  if (!isDragMenuOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
+  if (!isDragMenuOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition || isExperimentEnabled('platform_editor_table_menu_updates_patch_4') && isTableSelected(editorView.state.selection)) {
     return null;
   }
   const 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));

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

@@ -5,9 +5,11 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { deleteColumn, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { DeleteIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { clearHoverSelection, closeActiveTableMenu, hoverColumns } from '../../../../pm-plugins/commands';
 import { deleteColumnsWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
 import { getSelectedColumnIndexes } from '../../../../pm-plugins/utils/selection';
+import { CELL_MENU } from '../../cell/keys';
 import { getMenuSelectionRect } from '../../shared/selection';
 import { useTableMenuContext } from '../../shared/TableMenuContext';
 export const DeleteColumnItem = ({
@@ -19,6 +21,7 @@ export const DeleteColumnItem = ({
     editorView
   } = tableMenuContext !== null && tableMenuContext !== void 0 ? tableMenuContext : {};
   const selectedColumnCount = (_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1;
+  const shouldShowShortcut = !isExperimentEnabled('platform_editor_table_menu_updates_patch_4') || (tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.surface.key) !== CELL_MENU.key;
   const {
     formatMessage
   } = useIntl();
@@ -75,9 +78,9 @@ export const DeleteColumnItem = ({
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+    elemAfter: shouldShowShortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(deleteColumn)) !== null && _tooltip !== void 0 ? _tooltip : ''
-    })
+    }) : undefined
   }, formatMessage(messages.removeColumns, {
     0: selectedColumnCount
   }));

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

@@ -5,9 +5,11 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { deleteRow, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { DeleteIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { clearHoverSelection, closeActiveTableMenu, hoverRows } from '../../../../pm-plugins/commands';
 import { deleteRowsWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
 import { getSelectedRowIndexes } from '../../../../pm-plugins/utils/selection';
+import { CELL_MENU } from '../../cell/keys';
 import { getMenuSelectionRect } from '../../shared/selection';
 import { useTableMenuContext } from '../../shared/TableMenuContext';
 export const DeleteRowItem = props => {
@@ -28,6 +30,7 @@ export const DeleteRowItem = props => {
     };
   });
   const selectedRowCount = (_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedRowCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1;
+  const shouldShowShortcut = !isExperimentEnabled('platform_editor_table_menu_updates_patch_4') || (tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.surface.key) !== CELL_MENU.key;
   const {
     formatMessage
   } = useIntl();
@@ -71,9 +74,9 @@ export const DeleteRowItem = props => {
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+    elemAfter: shouldShowShortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(deleteRow)) !== null && _tooltip !== void 0 ? _tooltip : ''
-    })
+    }) : undefined
   }, formatMessage(messages.removeRows, {
     0: selectedRowCount
   }));

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

@@ -37,6 +37,7 @@ export const TableMenu = /*#__PURE__*/memo(({
     const selectionRect = getSelectionRect(editorView.state.selection);
     const cellOps = {
       editorView,
+      surface,
       canMergeCells: canMergeCellSelection(editorView.state.selection),
       canSplitCell: canSplitCellSelection(editorView.state.selection),
       hasMergedCellsInTable: tableMap.hasMergedCells()
@@ -57,7 +58,7 @@ export const TableMenu = /*#__PURE__*/memo(({
       isLastColumn: selectionRect.right === tableMap.width,
       selectedColumnCount: selectionRect.right - selectionRect.left
     };
-  }, [editorView, tableNode, selection]);
+  }, [editorView, tableNode, selection, surface]);
   if (components.length === 0) {
     return null;
   }

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

@@ -4,9 +4,11 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { backspace, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { CrossIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { emptyMultipleCellsWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
 import { getPluginState } from '../../../../pm-plugins/plugin-factory';
+import { CELL_MENU } from '../../cell/keys';
 import { useTableMenuContext } from '../TableMenuContext';
 export const ClearCellsItem = ({
   api
@@ -20,6 +22,7 @@ export const ClearCellsItem = ({
     formatMessage
   } = useIntl();
   const selectedCellCount = Math.max((_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1, (_tableMenuContext$sel2 = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedRowCount) !== null && _tableMenuContext$sel2 !== void 0 ? _tableMenuContext$sel2 : 1);
+  const shouldShowShortcut = !isExperimentEnabled('platform_editor_table_menu_updates_patch_4') || (tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.surface.key) !== CELL_MENU.key || selectedCellCount > 1;
   const handleClick = () => {
     var _api$analytics;
     if (!editorView) {
@@ -39,9 +42,9 @@ export const ClearCellsItem = ({
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+    elemAfter: shouldShowShortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(backspace)) !== null && _tooltip !== void 0 ? _tooltip : ''
-    })
+    }) : undefined
   }, formatMessage(messages.clearCells, {
     0: selectedCellCount
   }));

package/dist/esm/pm-plugins/decorations/utils/column-controls.js

@@ -1,5 +1,3 @@
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableDecorations } from '../../../types';
 import { createColumnSelectedDecoration, findColumnControlSelectedDecoration, findControlsHoverDecoration, updateDecorations } from '../../utils/decoration';

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

@@ -4,12 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 // #region Imports
 import { TableSortStep } from '@atlaskit/custom-steps';
 import { isTextInput } from '@atlaskit/editor-common/utils';
-
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findTable } from '@atlaskit/editor-tables/utils';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { defaultTableSelection } from './default-table-selection';
 import { pluginKey as tableResizingPluginKey } from './table-resizing/plugin-key';
@@ -39,6 +37,7 @@ var updateTargetCellPosition = function updateTargetCellPosition(_ref2) {
   return function (pluginState) {
     var tableNode = table && table.node;
     if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+      var _pluginState$activeTa, _pluginState$activeTa2;
       var _targetCellPosition;
       if (tableNode) {
         var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
@@ -49,14 +48,16 @@ var updateTargetCellPosition = function updateTargetCellPosition(_ref2) {
       }
       var hasTargetCellChanged = pluginState.targetCellPosition !== _targetCellPosition;
       var hasActiveTableMenu = pluginState.activeTableMenu != null && pluginState.activeTableMenu.type !== 'none';
-      var shouldCloseMenu = hasActiveTableMenu && tr.selectionSet && (!tableNode || hasTargetCellChanged || !(tr.selection instanceof CellSelection));
+      var isActiveDragMenu = ((_pluginState$activeTa = pluginState.activeTableMenu) === null || _pluginState$activeTa === void 0 ? void 0 : _pluginState$activeTa.type) === 'row' || ((_pluginState$activeTa2 = pluginState.activeTableMenu) === null || _pluginState$activeTa2 === void 0 ? void 0 : _pluginState$activeTa2.type) === 'column';
+      var shouldPreserveActiveDragMenu = isExperimentEnabled('platform_editor_table_menu_updates_patch_4') && isActiveDragMenu && tr.selection instanceof CellSelection;
+      var shouldCloseMenu = hasActiveTableMenu && tr.selectionSet && (!tableNode || !(tr.selection instanceof CellSelection) || hasTargetCellChanged && !shouldPreserveActiveDragMenu);
       if (!hasTargetCellChanged && !shouldCloseMenu) {
         return pluginState;
       }
 
-      // The updated table menu is anchored to a table selection. When selection moves
-      // to another cell, leaves the table, or changes from a CellSelection to a text cursor,
-      // close the active menu so render state cannot point at a stale anchor.
+      // Cell menus are anchored to a specific cell and close when that target changes. Row and
+      // column menus are anchored to the selected-range drag handle, so keep them open while a
+      // CellSelection expands and let the handle re-render at the updated range.
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         targetCellPosition: _targetCellPosition,
         activeTableMenu: shouldCloseMenu ? {

package/dist/esm/pm-plugins/table-resizing/plugin-factory.js

@@ -1,7 +1,6 @@
 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; }
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
 import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { pluginKey } from './plugin-key';
 // eslint-disable-next-line import/order

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

@@ -1,6 +1,4 @@
 import { NodeRange } from '@atlaskit/editor-prosemirror/model';
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
 import { findTable } from '@atlaskit/editor-tables/utils';
 var bail = function bail() {

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

@@ -4,9 +4,6 @@ import { RawIntlProvider } from 'react-intl';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid/v4';
 import { nonNullable } from '@atlaskit/editor-common/utils';
-
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getCellsInRow, getSelectionRect } from '@atlaskit/editor-tables/utils';

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

@@ -10,6 +10,7 @@ import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findTable, TableMap } from '@atlaskit/editor-tables';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -182,6 +183,22 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
       return tr;
     });
   }, [api]);
+  var keepActiveDragMenuOrHideToolbar = useCallback(function () {
+    var _api$table2, _api$core2;
+    if (!isExperimentEnabled('platform_editor_table_menu_updates_patch_4') || !api) {
+      return;
+    }
+    var activeTableMenu = (_api$table2 = api.table) === null || _api$table2 === void 0 || (_api$table2 = _api$table2.sharedState.currentState()) === null || _api$table2 === void 0 ? void 0 : _api$table2.activeTableMenu;
+    var isActiveTableMenuOpen = (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'row' || (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'column';
+    (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref6) {
+      var _api$userIntent2;
+      var tr = _ref6.tr;
+      (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || _api$userIntent2.commands.setCurrentUserIntent(isActiveTableMenuOpen ? 'tableDragMenuPopupOpen' : 'dragHandleSelected')({
+        tr: tr
+      });
+      return tr;
+    });
+  }, [api]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("button", {
     type: "button"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -249,6 +266,10 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
       // return focus to editor so copying table selections whilst still works, i cannot call e.preventDefault in a mousemove event as this stops dragstart events from firing
       // -> this is bad for a11y but is the current standard new copy/paste keyboard shortcuts should be introduced instead
       editorView.focus();
+      if (isExperimentEnabled('platform_editor_table_menu_updates_patch_4') && e.shiftKey) {
+        keepActiveDragMenuOrHideToolbar();
+        return;
+      }
       if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
         toggleDragMenu && toggleDragMenu('mouse', e, indexes[0]);
       } else {

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

@@ -4,7 +4,9 @@ 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 { isTableSelected } from '@atlaskit/editor-tables/utils';
 import { ToolbarKeyboardNavigationProvider } from '@atlaskit/editor-toolbar/toolbar-keyboard-navigation-provider';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { closeActiveTableMenu } from '../../pm-plugins/commands';
 import { TableCssClassName as ClassName } from '../../types';
 import { dragTableInsertColumnButtonSize, tablePopupMenuFitHeight } from '../consts';
@@ -120,7 +122,7 @@ var FloatingTableMenu = function FloatingTableMenu(_ref) {
     }
     api === null || api === void 0 || api.core.actions.execute(closeActiveTableMenu(api));
   }, [api]);
-  if (!isDragMenuOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
+  if (!isDragMenuOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition || isExperimentEnabled('platform_editor_table_menu_updates_patch_4') && isTableSelected(editorView.state.selection)) {
     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));

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

@@ -5,9 +5,11 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { deleteColumn, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { DeleteIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { clearHoverSelection, closeActiveTableMenu, hoverColumns } from '../../../../pm-plugins/commands';
 import { deleteColumnsWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
 import { getSelectedColumnIndexes } from '../../../../pm-plugins/utils/selection';
+import { CELL_MENU } from '../../cell/keys';
 import { getMenuSelectionRect } from '../../shared/selection';
 import { useTableMenuContext } from '../../shared/TableMenuContext';
 export var DeleteColumnItem = function DeleteColumnItem(_ref) {
@@ -17,6 +19,7 @@ export var DeleteColumnItem = function DeleteColumnItem(_ref) {
   var _ref2 = tableMenuContext !== null && tableMenuContext !== void 0 ? tableMenuContext : {},
     editorView = _ref2.editorView;
   var selectedColumnCount = (_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1;
+  var shouldShowShortcut = !isExperimentEnabled('platform_editor_table_menu_updates_patch_4') || (tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.surface.key) !== CELL_MENU.key;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var _useSharedPluginState = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], function (states) {
@@ -71,9 +74,9 @@ export var DeleteColumnItem = function DeleteColumnItem(_ref) {
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+    elemAfter: shouldShowShortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(deleteColumn)) !== null && _tooltip !== void 0 ? _tooltip : ''
-    })
+    }) : undefined
   }, formatMessage(messages.removeColumns, {
     0: selectedColumnCount
   }));

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

@@ -5,9 +5,11 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { deleteRow, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { DeleteIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { clearHoverSelection, closeActiveTableMenu, hoverRows } from '../../../../pm-plugins/commands';
 import { deleteRowsWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
 import { getSelectedRowIndexes } from '../../../../pm-plugins/utils/selection';
+import { CELL_MENU } from '../../cell/keys';
 import { getMenuSelectionRect } from '../../shared/selection';
 import { useTableMenuContext } from '../../shared/TableMenuContext';
 export var DeleteRowItem = function DeleteRowItem(props) {
@@ -24,6 +26,7 @@ export var DeleteRowItem = function DeleteRowItem(props) {
     }),
     isHeaderRowRequired = _useSharedPluginState.isHeaderRowRequired;
   var selectedRowCount = (_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedRowCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1;
+  var shouldShowShortcut = !isExperimentEnabled('platform_editor_table_menu_updates_patch_4') || (tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.surface.key) !== CELL_MENU.key;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var handleMouseEnter = function handleMouseEnter() {
@@ -66,9 +69,9 @@ export var DeleteRowItem = function DeleteRowItem(props) {
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+    elemAfter: shouldShowShortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(deleteRow)) !== null && _tooltip !== void 0 ? _tooltip : ''
-    })
+    }) : undefined
   }, formatMessage(messages.removeRows, {
     0: selectedRowCount
   }));

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

@@ -38,6 +38,7 @@ export var TableMenu = /*#__PURE__*/memo(function (_ref) {
     var selectionRect = getSelectionRect(editorView.state.selection);
     var cellOps = {
       editorView: editorView,
+      surface: surface,
       canMergeCells: canMergeCellSelection(editorView.state.selection),
       canSplitCell: canSplitCellSelection(editorView.state.selection),
       hasMergedCellsInTable: tableMap.hasMergedCells()
@@ -57,7 +58,7 @@ export var TableMenu = /*#__PURE__*/memo(function (_ref) {
       isLastColumn: selectionRect.right === tableMap.width,
       selectedColumnCount: selectionRect.right - selectionRect.left
     });
-  }, [editorView, tableNode, selection]);
+  }, [editorView, tableNode, selection, surface]);
   if (components.length === 0) {
     return null;
   }

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

@@ -4,9 +4,11 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { backspace, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { CrossIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { emptyMultipleCellsWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
 import { getPluginState } from '../../../../pm-plugins/plugin-factory';
+import { CELL_MENU } from '../../cell/keys';
 import { useTableMenuContext } from '../TableMenuContext';
 export var ClearCellsItem = function ClearCellsItem(_ref) {
   var _tableMenuContext$sel, _tableMenuContext$sel2, _tooltip;
@@ -17,6 +19,7 @@ export var ClearCellsItem = function ClearCellsItem(_ref) {
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var selectedCellCount = Math.max((_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1, (_tableMenuContext$sel2 = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedRowCount) !== null && _tableMenuContext$sel2 !== void 0 ? _tableMenuContext$sel2 : 1);
+  var shouldShowShortcut = !isExperimentEnabled('platform_editor_table_menu_updates_patch_4') || (tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.surface.key) !== CELL_MENU.key || selectedCellCount > 1;
   var handleClick = function handleClick() {
     var _api$analytics;
     if (!editorView) {
@@ -35,9 +38,9 @@ export var ClearCellsItem = function ClearCellsItem(_ref) {
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+    elemAfter: shouldShowShortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(backspace)) !== null && _tooltip !== void 0 ? _tooltip : ''
-    })
+    }) : undefined
   }, formatMessage(messages.clearCells, {
     0: selectedCellCount
   }));

package/dist/types/ui/TableMenu/shared/TableMenuContext.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { MenuType } from '@atlaskit/editor-ui-control-model';
 export type TableMenuContextValue = {
     canMergeCells?: boolean;
     canMoveColumnLeft?: boolean;
@@ -15,6 +16,7 @@ export type TableMenuContextValue = {
     isLastRow?: boolean;
     selectedColumnCount?: number;
     selectedRowCount?: number;
+    surface: MenuType;
 };
 export declare const TableMenuProvider: React.Provider<TableMenuContextValue | undefined>;
 export declare const useTableMenuContext: () => TableMenuContextValue | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "27.0.0",
+	"version": "27.0.2",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -20,7 +20,7 @@
 		"singleton": true
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^56.7.0",
+		"@atlaskit/adf-schema": "^57.0.0",
 		"@atlaskit/button": "^25.0.0",
 		"@atlaskit/custom-steps": "^1.0.0",
 		"@atlaskit/editor-palette": "^3.4.0",
@@ -29,7 +29,7 @@
 		"@atlaskit/editor-plugin-batch-attribute-updates": "^15.0.0",
 		"@atlaskit/editor-plugin-content-insertion": "^15.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^17.0.0",
-		"@atlaskit/editor-plugin-extension": "18.0.0",
+		"@atlaskit/editor-plugin-extension": "18.0.1",
 		"@atlaskit/editor-plugin-guideline": "^15.0.0",
 		"@atlaskit/editor-plugin-interaction": "^26.0.0",
 		"@atlaskit/editor-plugin-limited-mode": "^12.0.0",
@@ -68,7 +68,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^119.0.0",
+		"@atlaskit/editor-common": "^119.4.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"