@atlaskit/editor-plugin-table 29.1.5 → 29.1.7

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-table
 
+## 29.1.7
+
+### Patch Changes
+
+- [`f4930ad3105bb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f4930ad3105bb) -
+  Fix column menu targeting for tables with merged final rows behind
+  `platform_editor_table_menu_updates_patch_5`.
+- [`37382f7ca3e93`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/37382f7ca3e93) -
+  Clean up feature gate `platform_editor_max_width_default_width`
+- Updated dependencies
+
+## 29.1.6
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 29.1.5
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableContainer.js

@@ -15,7 +15,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _resizer = require("@atlaskit/editor-common/styles/resizer");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _commandsWithAnalytics = require("../pm-plugins/commands/commands-with-analytics");
@@ -163,7 +162,7 @@ var ResizableTableContainer = exports.ResizableTableContainer = /*#__PURE__*/_re
   var mode = editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode;
 
   // If the editor is in max width mode and the table has no width, use the max width value rather than the default table value
-  var tableWidth = isMaxWidthModeEnabled && !node.attrs.width && (0, _fg.fg)('platform_editor_max_width_default_width') ? _consts.TABLE_MAX_WIDTH : (0, _nodeWidth.getTableContainerWidth)(node);
+  var tableWidth = isMaxWidthModeEnabled && !node.attrs.width ? _consts.TABLE_MAX_WIDTH : (0, _nodeWidth.getTableContainerWidth)(node);
   var updateContainerHeight = (0, _react.useCallback)(function (height) {
     var _containerRef$current;
     // current StickyHeader State is not stable to be fetch.
@@ -225,7 +224,7 @@ var ResizableTableContainer = exports.ResizableTableContainer = /*#__PURE__*/_re
       // issues when viwport width is less than full/max width Editor's width. To detect avoid them
       // we need to use lineLength to defined responsiveWidth instead of containerWidth
       // (which does not get updated when Mac setting changes) in Full-width/Max-width editor.
-      if (isFullWidthModeEnabled || isMaxWidthModeEnabled && (0, _fg.fg)('platform_editor_max_width_default_width')) {
+      if (isFullWidthModeEnabled || isMaxWidthModeEnabled) {
         // When: Show scroll bars -> containerWidth = akEditorGutterPadding * 2 + lineLength;
         // When: Always -> containerWidth = akEditorGutterPadding * 2 + lineLength + scrollbarWidth;
         // scrollbarWidth can vary. Values can be 14, 15, 16 and up to 20px;

package/dist/cjs/pm-plugins/commands/misc.js

@@ -14,6 +14,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils2 = require("@atlaskit/editor-tables/utils");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _types = require("../../types");
 var _plugin = require("../decorations/plugin");
 var _columnResizing = require("../decorations/utils/column-resizing");
@@ -26,6 +27,23 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 var DARK_MODE_CELL_COLOR = '#1f1f21';
 var DARK_MODE_HEADER_COLOR = '#303134';
+var selectColumnWithMergedEdgeRows = function selectColumnWithMergedEdgeRows(tr, column, expand) {
+  var _getCellsInColumn;
+  var transformedTr = (0, _utils2.selectColumn)(column, expand)(tr);
+  if (expand) {
+    return transformedTr;
+  }
+  var selectableCells = (_getCellsInColumn = (0, _utils2.getCellsInColumn)(column)(tr.selection)) === null || _getCellsInColumn === void 0 ? void 0 : _getCellsInColumn.filter(function (_ref) {
+    var node = _ref.node;
+    return node.attrs.colspan === 1;
+  });
+  var firstCell = selectableCells === null || selectableCells === void 0 ? void 0 : selectableCells[0];
+  var lastCell = selectableCells === null || selectableCells === void 0 ? void 0 : selectableCells[selectableCells.length - 1];
+  if (!firstCell || !lastCell) {
+    return transformedTr;
+  }
+  return transformedTr.setSelection(new _cellSelection.CellSelection(transformedTr.doc.resolve(lastCell.pos), transformedTr.doc.resolve(firstCell.pos)));
+};
 var setEditorFocus = exports.setEditorFocus = function setEditorFocus(editorHasFocus) {
   return (0, _pluginFactory.createCommand)({
     type: 'SET_EDITOR_FOCUS',
@@ -270,8 +288,8 @@ var convertFirstRowToHeader = exports.convertFirstRowToHeader = function convert
   };
 };
 var moveCursorBackward = exports.moveCursorBackward = function moveCursorBackward(state, dispatch) {
-  var _ref = state.selection,
-    $cursor = _ref.$cursor;
+  var _ref2 = state.selection,
+    $cursor = _ref2.$cursor;
   // if cursor is in the middle of a text node, do nothing
   if (!$cursor || $cursor.parentOffset > 0) {
     return false;
@@ -370,8 +388,8 @@ var setMultipleCellAttrs = exports.setMultipleCellAttrs = function setMultipleCe
  * EditorCommand variant of `setMultipleCellAttrs`.
  */
 var setMultipleCellAttrsEditorCommand = exports.setMultipleCellAttrsEditorCommand = function setMultipleCellAttrsEditorCommand(attrs, targetCellPosition) {
-  return function (_ref2) {
-    var tr = _ref2.tr;
+  return function (_ref3) {
+    var tr = _ref3.tr;
     var cursorPos;
     if ((0, _utils2.isSelectionType)(tr.selection, 'cell')) {
       // Ignored via go/ees005
@@ -404,7 +422,13 @@ var selectColumn = exports.selectColumn = function selectColumn(column, expand)
     if (!cells || !cells.length || typeof cells[0].pos !== 'number') {
       return false;
     }
-    var decorations = (0, _decoration.createColumnSelectedDecoration)((0, _utils2.selectColumn)(column, expand)(state.tr));
+    var selectionTransaction;
+    if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_5')) {
+      selectionTransaction = selectColumnWithMergedEdgeRows(state.tr, column, expand);
+    } else {
+      selectionTransaction = (0, _utils2.selectColumn)(column, expand)(state.tr);
+    }
+    var decorations = (0, _decoration.createColumnSelectedDecoration)(selectionTransaction);
     var decorationSet = (0, _updatePluginStateDecorations.updatePluginStateDecorations)(state, decorations, _types.TableDecorations.COLUMN_SELECTED);
     var targetCellPosition = cells[0].pos;
     return {
@@ -415,7 +439,13 @@ var selectColumn = exports.selectColumn = function selectColumn(column, expand)
       }
     };
   }, function (tr) {
-    return (0, _utils2.selectColumn)(column, expand)(tr).setMeta('addToHistory', false).setMeta('selectedColumnViaKeyboard', triggeredByKeyboard);
+    var selectionTransaction;
+    if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_5')) {
+      selectionTransaction = selectColumnWithMergedEdgeRows(tr, column, expand);
+    } else {
+      selectionTransaction = (0, _utils2.selectColumn)(column, expand)(tr);
+    }
+    return selectionTransaction.setMeta('addToHistory', false).setMeta('selectedColumnViaKeyboard', triggeredByKeyboard);
   });
 };
 var selectColumns = exports.selectColumns = function selectColumns(columnIndexes) {
@@ -648,8 +678,8 @@ var updateWidthToWidest = exports.updateWidthToWidest = function updateWidthToWi
   });
 };
 var setTableAlignment = exports.setTableAlignment = function setTableAlignment(newAlignment, isCommentEditor) {
-  return function (_ref3) {
-    var tr = _ref3.tr;
+  return function (_ref4) {
+    var tr = _ref4.tr;
     var tableObject = (0, _utils2.findTable)(tr.selection);
     if (!tableObject) {
       return null;
@@ -671,8 +701,8 @@ var setTableAlignment = exports.setTableAlignment = function setTableAlignment(n
   };
 };
 var setTableAlignmentWithTableContentWithPos = exports.setTableAlignmentWithTableContentWithPos = function setTableAlignmentWithTableContentWithPos(newAlignment, tableNodeWithPos) {
-  return function (_ref4) {
-    var tr = _ref4.tr;
+  return function (_ref5) {
+    var tr = _ref5.tr;
     var table = tableNodeWithPos.node;
     var nextTableAttrs = _objectSpread(_objectSpread({}, table.attrs), {}, {
       layout: newAlignment

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

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isRowSelectionWithMergedFirstColumn = exports.isFullRowOrColumnSelected = exports.isColumnSelectionWithMergedFirstRow = exports.getSelectedRowIndexes = exports.getSelectedColumnIndexes = void 0;
+exports.isRowSelectionWithMergedFirstColumn = exports.isFullRowOrColumnSelected = exports.isColumnSelectionWithMergedLastRow = exports.isColumnSelectionWithMergedFirstRow = exports.getSelectedRowIndexes = exports.getSelectedColumnIndexes = void 0;
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var getSelectedColumnIndexes = exports.getSelectedColumnIndexes = function getSelectedColumnIndexes(selectionRect) {
   var columnIndexes = [];
   for (var i = selectionRect.left; i < selectionRect.right; i++) {
@@ -51,6 +52,35 @@ var isColumnSelectionWithMergedFirstRow = exports.isColumnSelectionWithMergedFir
   return true;
 };
 
+/**
+ * Treats a column as fully selected when its last-row area is covered by a horizontal merge and
+ * the explicit `CellSelection` ends above that merged cell. Using that merged cell as an endpoint
+ * would expand the selection to the full width of the cell.
+ */
+var isColumnSelectionWithMergedLastRow = exports.isColumnSelectionWithMergedLastRow = function isColumnSelectionWithMergedLastRow(selection) {
+  var rect = (0, _utils.getSelectionRect)(selection);
+  if (!rect) {
+    return false;
+  }
+  var table = (0, _utils.findTableClosestToPos)(selection.$anchorCell);
+  if (!table) {
+    return false;
+  }
+  var map = _tableMap.TableMap.get(table.node);
+  if (rect.top !== 0 || rect.bottom === map.height) {
+    return false;
+  }
+  for (var col = rect.left; col < rect.right; col++) {
+    var bottomCellRect = map.findCell(map.map[(map.height - 1) * map.width + col]);
+    var isHorizontallyMerged = bottomCellRect.right - bottomCellRect.left > 1;
+    var bridgesGapBelowSelection = bottomCellRect.top <= rect.bottom;
+    if (!isHorizontallyMerged || !bridgesGapBelowSelection) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * Treats a row as fully selected when its first-column area is covered by a vertical merge and the
  * explicit `CellSelection` starts to the right of that merged cell. `CellSelection.isRowSelection()`
@@ -89,5 +119,10 @@ var isFullRowOrColumnSelected = exports.isFullRowOrColumnSelected = function isF
   if (!(selection instanceof _cellSelection.CellSelection)) {
     return false;
   }
-  return selection.isRowSelection() || selection.isColSelection() || isRowSelectionWithMergedFirstColumn(selection) || isColumnSelectionWithMergedFirstRow(selection);
+  var isExistingFullRowOrColumnSelection = selection.isRowSelection() || selection.isColSelection() || isRowSelectionWithMergedFirstColumn(selection) || isColumnSelectionWithMergedFirstRow(selection);
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_5')) {
+    return isExistingFullRowOrColumnSelection || isColumnSelectionWithMergedLastRow(selection);
+  } else {
+    return isExistingFullRowOrColumnSelection;
+  }
 };

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

@@ -12,6 +12,7 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _editorTables = require("@atlaskit/editor-tables");
 var _utils = 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 _commands = require("../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../pm-plugins/drag-and-drop/commands-with-analytics");
@@ -28,9 +29,13 @@ var getSelectedColumns = function getSelectedColumns(selection) {
     return [];
   }
   if ((0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true)) {
-    // New behaviour: also treat a column selection that sits below a merged first-row cell as a
-    // full column selection.
-    if (!selection.isColSelection() && !(0, _selection.isColumnSelectionWithMergedFirstRow)(selection)) {
+    var isColumnSelection;
+    if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_5')) {
+      isColumnSelection = selection.isColSelection() || (0, _selection.isColumnSelectionWithMergedFirstRow)(selection) || (0, _selection.isColumnSelectionWithMergedLastRow)(selection);
+    } else {
+      isColumnSelection = selection.isColSelection() || (0, _selection.isColumnSelectionWithMergedFirstRow)(selection);
+    }
+    if (!isColumnSelection) {
       return [];
     }
     var rect = (0, _utils.getSelectionRect)(selection);
@@ -65,12 +70,14 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
     getScrollOffset = _ref.getScrollOffset,
     api = _ref.api;
   var columnControlsRef = (0, _react.useRef)(null);
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['selection'], function (states) {
-      var _states$selectionStat;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['selection', 'table'], function (states) {
+      var _states$tableState, _states$selectionStat;
       return {
+        activeTableMenu: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.activeTableMenu,
         selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
       };
     }),
+    activeTableMenu = _useSharedPluginState.activeTableMenu,
     selection = _useSharedPluginState.selection;
   var widths = (_colWidths$map$join = colWidths === null || colWidths === void 0 ? void 0 : colWidths.map(function (width) {
     return (
@@ -83,6 +90,12 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
   var columnParams = (0, _rowControls.getRowsParams)(colWidths !== null && colWidths !== void 0 ? colWidths : []);
   var colIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.colIndex;
   var selectedColIndexes = getSelectedColumns(selection || editorView.state.selection);
+  var renderedSelectedColIndexes;
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_menu_updates_patch_5')) {
+    renderedSelectedColIndexes = (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'column' ? [activeTableMenu.index] : selectedColIndexes;
+  } else {
+    renderedSelectedColIndexes = selectedColIndexes;
+  }
   var firstRow = tableRef.querySelector('tr');
   var hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
   var rowControlStickyTop = 45;
@@ -227,7 +240,7 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
         position: 'relative',
         pointerEvents: isPlaceholder ? 'none' : undefined
       },
-      "data-testid": "table-floating-column-".concat(isHover ? colIndex : isPlaceholder ? appearance : selectedColIndexes[0], "-drag-handle")
+      "data-testid": "table-floating-column-".concat(isHover ? colIndex : isPlaceholder ? appearance : renderedSelectedColIndexes[0], "-drag-handle")
     }, /*#__PURE__*/_react.default.createElement(_DragHandle.DragHandle, {
       api: api,
       isDragMenuTarget: !isHover,
@@ -250,8 +263,8 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
   };
   var columnHandles = function columnHandles() {
     var handles = [];
-    var isColumnSelected = selectedColIndexes.length > 0;
-    var isEntireTableSelected = (colWidths || []).length > selectedColIndexes.length;
+    var isColumnSelected = renderedSelectedColIndexes.length > 0;
+    var isEntireTableSelected = (colWidths || []).length > renderedSelectedColIndexes.length;
     if (!tableActive) {
       return null;
     }
@@ -261,8 +274,8 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
     // so it can be focused via keyboard shortcuts
     handles.push(generateHandleByType('selected', selectedAppearance,
     // always position placeholder in first column to avoid overflow issues
-    selectedAppearance === 'placeholder' ? '1 / span 1' : "".concat(selectedColIndexes[0] + 1, " / span ").concat(selectedColIndexes.length), selectedColIndexes));
-    if (hoveredCell && isTableHovered && colIndex !== undefined && !selectedColIndexes.includes(colIndex)) {
+    selectedAppearance === 'placeholder' ? '1 / span 1' : "".concat(renderedSelectedColIndexes[0] + 1, " / span ").concat(renderedSelectedColIndexes.length), renderedSelectedColIndexes));
+    if (hoveredCell && isTableHovered && colIndex !== undefined && !renderedSelectedColIndexes.includes(colIndex)) {
       handles.push(
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

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

@@ -1,4 +1,4 @@
-/* SortDecreasingItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* SortDecreasingItem.tsx generated by @compiled/babel-plugin v3.0.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

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

@@ -1,4 +1,4 @@
-/* SortIncreasingItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* SortIncreasingItem.tsx generated by @compiled/babel-plugin v3.0.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

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

@@ -1,4 +1,4 @@
-/* BackgroundColorItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* BackgroundColorItem.tsx generated by @compiled/babel-plugin v3.0.1 */
 "use strict";
 
 var _typeof = require("@babel/runtime/helpers/typeof");

package/dist/es2019/nodeviews/TableContainer.js

@@ -6,7 +6,6 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { resizerHoverZoneClassName, resizerItemClassName } from '@atlaskit/editor-common/styles/resizer';
 import { akEditorDefaultLayoutWidth, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout, akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../pm-plugins/commands/commands-with-analytics';
@@ -156,7 +155,7 @@ export const ResizableTableContainer = /*#__PURE__*/React.memo(({
   const mode = editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode;
 
   // If the editor is in max width mode and the table has no width, use the max width value rather than the default table value
-  const tableWidth = isMaxWidthModeEnabled && !node.attrs.width && fg('platform_editor_max_width_default_width') ? TABLE_MAX_WIDTH : getTableContainerWidth(node);
+  const tableWidth = isMaxWidthModeEnabled && !node.attrs.width ? TABLE_MAX_WIDTH : getTableContainerWidth(node);
   const updateContainerHeight = useCallback(height => {
     var _containerRef$current;
     // current StickyHeader State is not stable to be fetch.
@@ -221,7 +220,7 @@ export const ResizableTableContainer = /*#__PURE__*/React.memo(({
     // issues when viwport width is less than full/max width Editor's width. To detect avoid them
     // we need to use lineLength to defined responsiveWidth instead of containerWidth
     // (which does not get updated when Mac setting changes) in Full-width/Max-width editor.
-    if (isFullWidthModeEnabled || isMaxWidthModeEnabled && fg('platform_editor_max_width_default_width')) {
+    if (isFullWidthModeEnabled || isMaxWidthModeEnabled) {
       // When: Show scroll bars -> containerWidth = akEditorGutterPadding * 2 + lineLength;
       // When: Always -> containerWidth = akEditorGutterPadding * 2 + lineLength + scrollbarWidth;
       // scrollbarWidth can vary. Values can be 14, 15, 16 and up to 20px;

package/dist/es2019/pm-plugins/commands/misc.js

@@ -5,6 +5,7 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellClosestToPos, findTable, getCellsInColumn, getCellsInRow, getSelectionRect, isSelectionType, isTableSelected, removeTable, selectColumns as selectColumnsTransform, selectColumn as selectColumnTransform, selectionCell, selectRows as selectRowsTransform, selectRow as selectRowTransform, setCellAttrs } from '@atlaskit/editor-tables/utils';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { TableCssClassName as ClassName, TableDecorations } from '../../types';
 import { getDecorations } from '../decorations/plugin';
 import { buildColumnResizingDecorations, clearColumnResizingDecorations } from '../decorations/utils/column-resizing';
@@ -15,6 +16,22 @@ import { checkIfHeaderColumnEnabled, checkIfHeaderRowEnabled, checkIfNumberColum
 import { updatePluginStateDecorations } from '../utils/update-plugin-state-decorations';
 const DARK_MODE_CELL_COLOR = '#1f1f21';
 const DARK_MODE_HEADER_COLOR = '#303134';
+const selectColumnWithMergedEdgeRows = (tr, column, expand) => {
+  var _getCellsInColumn;
+  const transformedTr = selectColumnTransform(column, expand)(tr);
+  if (expand) {
+    return transformedTr;
+  }
+  const selectableCells = (_getCellsInColumn = getCellsInColumn(column)(tr.selection)) === null || _getCellsInColumn === void 0 ? void 0 : _getCellsInColumn.filter(({
+    node
+  }) => node.attrs.colspan === 1);
+  const firstCell = selectableCells === null || selectableCells === void 0 ? void 0 : selectableCells[0];
+  const lastCell = selectableCells === null || selectableCells === void 0 ? void 0 : selectableCells[selectableCells.length - 1];
+  if (!firstCell || !lastCell) {
+    return transformedTr;
+  }
+  return transformedTr.setSelection(new CellSelection(transformedTr.doc.resolve(lastCell.pos), transformedTr.doc.resolve(firstCell.pos)));
+};
 export const setEditorFocus = editorHasFocus => createCommand({
   type: 'SET_EDITOR_FOCUS',
   data: {
@@ -411,7 +428,13 @@ export const selectColumn = (column, expand, triggeredByKeyboard = false) => cre
   if (!cells || !cells.length || typeof cells[0].pos !== 'number') {
     return false;
   }
-  const decorations = createColumnSelectedDecoration(selectColumnTransform(column, expand)(state.tr));
+  let selectionTransaction;
+  if (isExperimentEnabled('platform_editor_table_menu_updates_patch_5')) {
+    selectionTransaction = selectColumnWithMergedEdgeRows(state.tr, column, expand);
+  } else {
+    selectionTransaction = selectColumnTransform(column, expand)(state.tr);
+  }
+  const decorations = createColumnSelectedDecoration(selectionTransaction);
   const decorationSet = updatePluginStateDecorations(state, decorations, TableDecorations.COLUMN_SELECTED);
   const targetCellPosition = cells[0].pos;
   return {
@@ -421,7 +444,15 @@ export const selectColumn = (column, expand, triggeredByKeyboard = false) => cre
       decorationSet
     }
   };
-}, tr => selectColumnTransform(column, expand)(tr).setMeta('addToHistory', false).setMeta('selectedColumnViaKeyboard', triggeredByKeyboard));
+}, tr => {
+  let selectionTransaction;
+  if (isExperimentEnabled('platform_editor_table_menu_updates_patch_5')) {
+    selectionTransaction = selectColumnWithMergedEdgeRows(tr, column, expand);
+  } else {
+    selectionTransaction = selectColumnTransform(column, expand)(tr);
+  }
+  return selectionTransaction.setMeta('addToHistory', false).setMeta('selectedColumnViaKeyboard', triggeredByKeyboard);
+});
 export const selectColumns = columnIndexes => createCommand(state => {
   if (!columnIndexes) {
     return false;

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

@@ -1,6 +1,7 @@
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTableClosestToPos, getSelectionRect } from '@atlaskit/editor-tables/utils';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 export const getSelectedColumnIndexes = selectionRect => {
   const columnIndexes = [];
   for (let i = selectionRect.left; i < selectionRect.right; i++) {
@@ -45,6 +46,35 @@ export const isColumnSelectionWithMergedFirstRow = selection => {
   return true;
 };
 
+/**
+ * Treats a column as fully selected when its last-row area is covered by a horizontal merge and
+ * the explicit `CellSelection` ends above that merged cell. Using that merged cell as an endpoint
+ * would expand the selection to the full width of the cell.
+ */
+export const isColumnSelectionWithMergedLastRow = selection => {
+  const rect = getSelectionRect(selection);
+  if (!rect) {
+    return false;
+  }
+  const table = findTableClosestToPos(selection.$anchorCell);
+  if (!table) {
+    return false;
+  }
+  const map = TableMap.get(table.node);
+  if (rect.top !== 0 || rect.bottom === map.height) {
+    return false;
+  }
+  for (let col = rect.left; col < rect.right; col++) {
+    const bottomCellRect = map.findCell(map.map[(map.height - 1) * map.width + col]);
+    const isHorizontallyMerged = bottomCellRect.right - bottomCellRect.left > 1;
+    const bridgesGapBelowSelection = bottomCellRect.top <= rect.bottom;
+    if (!isHorizontallyMerged || !bridgesGapBelowSelection) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * Treats a row as fully selected when its first-column area is covered by a vertical merge and the
  * explicit `CellSelection` starts to the right of that merged cell. `CellSelection.isRowSelection()`
@@ -83,5 +113,10 @@ export const isFullRowOrColumnSelected = selection => {
   if (!(selection instanceof CellSelection)) {
     return false;
   }
-  return selection.isRowSelection() || selection.isColSelection() || isRowSelectionWithMergedFirstColumn(selection) || isColumnSelectionWithMergedFirstRow(selection);
+  const isExistingFullRowOrColumnSelection = selection.isRowSelection() || selection.isColSelection() || isRowSelectionWithMergedFirstColumn(selection) || isColumnSelectionWithMergedFirstRow(selection);
+  if (isExperimentEnabled('platform_editor_table_menu_updates_patch_5')) {
+    return isExistingFullRowOrColumnSelection || isColumnSelectionWithMergedLastRow(selection);
+  } else {
+    return isExistingFullRowOrColumnSelection;
+  }
 };

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

@@ -7,12 +7,13 @@ 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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { clearHoverSelection, 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, isColumnSelectionWithMergedFirstRow } from '../../../pm-plugins/utils/selection';
+import { getSelectedColumnIndexes, isColumnSelectionWithMergedFirstRow, isColumnSelectionWithMergedLastRow } from '../../../pm-plugins/utils/selection';
 import { TableCssClassName as ClassName } from '../../../types';
 import { DragHandle } from '../../DragHandle';
 const getSelectedColumns = selection => {
@@ -20,9 +21,13 @@ const getSelectedColumns = selection => {
     return [];
   }
   if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
-    // New behaviour: also treat a column selection that sits below a merged first-row cell as a
-    // full column selection.
-    if (!selection.isColSelection() && !isColumnSelectionWithMergedFirstRow(selection)) {
+    let isColumnSelection;
+    if (isExperimentEnabled('platform_editor_table_menu_updates_patch_5')) {
+      isColumnSelection = selection.isColSelection() || isColumnSelectionWithMergedFirstRow(selection) || isColumnSelectionWithMergedLastRow(selection);
+    } else {
+      isColumnSelection = selection.isColSelection() || isColumnSelectionWithMergedFirstRow(selection);
+    }
+    if (!isColumnSelection) {
       return [];
     }
     const rect = getSelectionRect(selection);
@@ -59,10 +64,12 @@ export const ColumnControls = ({
   var _colWidths$map$join;
   const columnControlsRef = useRef(null);
   const {
+    activeTableMenu,
     selection
-  } = useSharedPluginStateWithSelector(api, ['selection'], states => {
-    var _states$selectionStat;
+  } = useSharedPluginStateWithSelector(api, ['selection', 'table'], states => {
+    var _states$tableState, _states$selectionStat;
     return {
+      activeTableMenu: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.activeTableMenu,
       selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
     };
   });
@@ -74,6 +81,12 @@ export const ColumnControls = ({
   const columnParams = getRowsParams(colWidths !== null && colWidths !== void 0 ? colWidths : []);
   const colIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.colIndex;
   const selectedColIndexes = getSelectedColumns(selection || editorView.state.selection);
+  let renderedSelectedColIndexes;
+  if (isExperimentEnabled('platform_editor_table_menu_updates_patch_5')) {
+    renderedSelectedColIndexes = (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'column' ? [activeTableMenu.index] : selectedColIndexes;
+  } else {
+    renderedSelectedColIndexes = selectedColIndexes;
+  }
   const firstRow = tableRef.querySelector('tr');
   const hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
   const rowControlStickyTop = 45;
@@ -226,7 +239,7 @@ export const ColumnControls = ({
         position: 'relative',
         pointerEvents: isPlaceholder ? 'none' : undefined
       },
-      "data-testid": `table-floating-column-${isHover ? colIndex : isPlaceholder ? appearance : selectedColIndexes[0]}-drag-handle`
+      "data-testid": `table-floating-column-${isHover ? colIndex : isPlaceholder ? appearance : renderedSelectedColIndexes[0]}-drag-handle`
     }, /*#__PURE__*/React.createElement(DragHandle, {
       api: api,
       isDragMenuTarget: !isHover,
@@ -249,8 +262,8 @@ export const ColumnControls = ({
   };
   const columnHandles = () => {
     const handles = [];
-    const isColumnSelected = selectedColIndexes.length > 0;
-    const isEntireTableSelected = (colWidths || []).length > selectedColIndexes.length;
+    const isColumnSelected = renderedSelectedColIndexes.length > 0;
+    const isEntireTableSelected = (colWidths || []).length > renderedSelectedColIndexes.length;
     if (!tableActive) {
       return null;
     }
@@ -260,8 +273,8 @@ export const ColumnControls = ({
     // so it can be focused via keyboard shortcuts
     handles.push(generateHandleByType('selected', selectedAppearance,
     // always position placeholder in first column to avoid overflow issues
-    selectedAppearance === 'placeholder' ? '1 / span 1' : `${selectedColIndexes[0] + 1} / span ${selectedColIndexes.length}`, selectedColIndexes));
-    if (hoveredCell && isTableHovered && colIndex !== undefined && !selectedColIndexes.includes(colIndex)) {
+    selectedAppearance === 'placeholder' ? '1 / span 1' : `${renderedSelectedColIndexes[0] + 1} / span ${renderedSelectedColIndexes.length}`, renderedSelectedColIndexes));
+    if (hoveredCell && isTableHovered && colIndex !== undefined && !renderedSelectedColIndexes.includes(colIndex)) {
       handles.push(
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

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

@@ -1,4 +1,4 @@
-/* SortDecreasingItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* SortDecreasingItem.tsx generated by @compiled/babel-plugin v3.0.1 */
 import _extends from "@babel/runtime/helpers/extends";
 import "./SortDecreasingItem.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";

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

@@ -1,4 +1,4 @@
-/* SortIncreasingItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* SortIncreasingItem.tsx generated by @compiled/babel-plugin v3.0.1 */
 import _extends from "@babel/runtime/helpers/extends";
 import "./SortIncreasingItem.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";

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

@@ -1,4 +1,4 @@
-/* BackgroundColorItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* BackgroundColorItem.tsx generated by @compiled/babel-plugin v3.0.1 */
 import "./BackgroundColorItem.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useMemo } from 'react';

package/dist/esm/nodeviews/TableContainer.js

@@ -7,7 +7,6 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { resizerHoverZoneClassName, resizerItemClassName } from '@atlaskit/editor-common/styles/resizer';
 import { akEditorDefaultLayoutWidth, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout, akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../pm-plugins/commands/commands-with-analytics';
@@ -154,7 +153,7 @@ export var ResizableTableContainer = /*#__PURE__*/React.memo(function (_ref4) {
   var mode = editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode;
 
   // If the editor is in max width mode and the table has no width, use the max width value rather than the default table value
-  var tableWidth = isMaxWidthModeEnabled && !node.attrs.width && fg('platform_editor_max_width_default_width') ? TABLE_MAX_WIDTH : getTableContainerWidth(node);
+  var tableWidth = isMaxWidthModeEnabled && !node.attrs.width ? TABLE_MAX_WIDTH : getTableContainerWidth(node);
   var updateContainerHeight = useCallback(function (height) {
     var _containerRef$current;
     // current StickyHeader State is not stable to be fetch.
@@ -216,7 +215,7 @@ export var ResizableTableContainer = /*#__PURE__*/React.memo(function (_ref4) {
       // issues when viwport width is less than full/max width Editor's width. To detect avoid them
       // we need to use lineLength to defined responsiveWidth instead of containerWidth
       // (which does not get updated when Mac setting changes) in Full-width/Max-width editor.
-      if (isFullWidthModeEnabled || isMaxWidthModeEnabled && fg('platform_editor_max_width_default_width')) {
+      if (isFullWidthModeEnabled || isMaxWidthModeEnabled) {
         // When: Show scroll bars -> containerWidth = akEditorGutterPadding * 2 + lineLength;
         // When: Always -> containerWidth = akEditorGutterPadding * 2 + lineLength + scrollbarWidth;
         // scrollbarWidth can vary. Values can be 14, 15, 16 and up to 20px;

package/dist/esm/pm-plugins/commands/misc.js

@@ -9,6 +9,7 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellClosestToPos, findTable, getCellsInColumn, getCellsInRow, getSelectionRect, isSelectionType, isTableSelected, removeTable, selectColumns as selectColumnsTransform, selectColumn as selectColumnTransform, selectionCell, selectRows as selectRowsTransform, selectRow as selectRowTransform, setCellAttrs } from '@atlaskit/editor-tables/utils';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { TableCssClassName as ClassName, TableDecorations } from '../../types';
 import { getDecorations } from '../decorations/plugin';
 import { buildColumnResizingDecorations, clearColumnResizingDecorations } from '../decorations/utils/column-resizing';
@@ -19,6 +20,23 @@ import { checkIfHeaderColumnEnabled, checkIfHeaderRowEnabled, checkIfNumberColum
 import { updatePluginStateDecorations } from '../utils/update-plugin-state-decorations';
 var DARK_MODE_CELL_COLOR = '#1f1f21';
 var DARK_MODE_HEADER_COLOR = '#303134';
+var selectColumnWithMergedEdgeRows = function selectColumnWithMergedEdgeRows(tr, column, expand) {
+  var _getCellsInColumn;
+  var transformedTr = selectColumnTransform(column, expand)(tr);
+  if (expand) {
+    return transformedTr;
+  }
+  var selectableCells = (_getCellsInColumn = getCellsInColumn(column)(tr.selection)) === null || _getCellsInColumn === void 0 ? void 0 : _getCellsInColumn.filter(function (_ref) {
+    var node = _ref.node;
+    return node.attrs.colspan === 1;
+  });
+  var firstCell = selectableCells === null || selectableCells === void 0 ? void 0 : selectableCells[0];
+  var lastCell = selectableCells === null || selectableCells === void 0 ? void 0 : selectableCells[selectableCells.length - 1];
+  if (!firstCell || !lastCell) {
+    return transformedTr;
+  }
+  return transformedTr.setSelection(new CellSelection(transformedTr.doc.resolve(lastCell.pos), transformedTr.doc.resolve(firstCell.pos)));
+};
 export var setEditorFocus = function setEditorFocus(editorHasFocus) {
   return createCommand({
     type: 'SET_EDITOR_FOCUS',
@@ -263,8 +281,8 @@ export var convertFirstRowToHeader = function convertFirstRowToHeader(schema) {
   };
 };
 export var moveCursorBackward = function moveCursorBackward(state, dispatch) {
-  var _ref = state.selection,
-    $cursor = _ref.$cursor;
+  var _ref2 = state.selection,
+    $cursor = _ref2.$cursor;
   // if cursor is in the middle of a text node, do nothing
   if (!$cursor || $cursor.parentOffset > 0) {
     return false;
@@ -363,8 +381,8 @@ export var setMultipleCellAttrs = function setMultipleCellAttrs(attrs, editorVie
  * EditorCommand variant of `setMultipleCellAttrs`.
  */
 export var setMultipleCellAttrsEditorCommand = function setMultipleCellAttrsEditorCommand(attrs, targetCellPosition) {
-  return function (_ref2) {
-    var tr = _ref2.tr;
+  return function (_ref3) {
+    var tr = _ref3.tr;
     var cursorPos;
     if (isSelectionType(tr.selection, 'cell')) {
       // Ignored via go/ees005
@@ -397,7 +415,13 @@ export var selectColumn = function selectColumn(column, expand) {
     if (!cells || !cells.length || typeof cells[0].pos !== 'number') {
       return false;
     }
-    var decorations = createColumnSelectedDecoration(selectColumnTransform(column, expand)(state.tr));
+    var selectionTransaction;
+    if (isExperimentEnabled('platform_editor_table_menu_updates_patch_5')) {
+      selectionTransaction = selectColumnWithMergedEdgeRows(state.tr, column, expand);
+    } else {
+      selectionTransaction = selectColumnTransform(column, expand)(state.tr);
+    }
+    var decorations = createColumnSelectedDecoration(selectionTransaction);
     var decorationSet = updatePluginStateDecorations(state, decorations, TableDecorations.COLUMN_SELECTED);
     var targetCellPosition = cells[0].pos;
     return {
@@ -408,7 +432,13 @@ export var selectColumn = function selectColumn(column, expand) {
       }
     };
   }, function (tr) {
-    return selectColumnTransform(column, expand)(tr).setMeta('addToHistory', false).setMeta('selectedColumnViaKeyboard', triggeredByKeyboard);
+    var selectionTransaction;
+    if (isExperimentEnabled('platform_editor_table_menu_updates_patch_5')) {
+      selectionTransaction = selectColumnWithMergedEdgeRows(tr, column, expand);
+    } else {
+      selectionTransaction = selectColumnTransform(column, expand)(tr);
+    }
+    return selectionTransaction.setMeta('addToHistory', false).setMeta('selectedColumnViaKeyboard', triggeredByKeyboard);
   });
 };
 export var selectColumns = function selectColumns(columnIndexes) {
@@ -641,8 +671,8 @@ export var updateWidthToWidest = function updateWidthToWidest(widthToWidest) {
   });
 };
 export var setTableAlignment = function setTableAlignment(newAlignment, isCommentEditor) {
-  return function (_ref3) {
-    var tr = _ref3.tr;
+  return function (_ref4) {
+    var tr = _ref4.tr;
     var tableObject = findTable(tr.selection);
     if (!tableObject) {
       return null;
@@ -664,8 +694,8 @@ export var setTableAlignment = function setTableAlignment(newAlignment, isCommen
   };
 };
 export var setTableAlignmentWithTableContentWithPos = function setTableAlignmentWithTableContentWithPos(newAlignment, tableNodeWithPos) {
-  return function (_ref4) {
-    var tr = _ref4.tr;
+  return function (_ref5) {
+    var tr = _ref5.tr;
     var table = tableNodeWithPos.node;
     var nextTableAttrs = _objectSpread(_objectSpread({}, table.attrs), {}, {
       layout: newAlignment

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

@@ -1,6 +1,7 @@
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTableClosestToPos, getSelectionRect } from '@atlaskit/editor-tables/utils';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 export var getSelectedColumnIndexes = function getSelectedColumnIndexes(selectionRect) {
   var columnIndexes = [];
   for (var i = selectionRect.left; i < selectionRect.right; i++) {
@@ -45,6 +46,35 @@ export var isColumnSelectionWithMergedFirstRow = function isColumnSelectionWithM
   return true;
 };
 
+/**
+ * Treats a column as fully selected when its last-row area is covered by a horizontal merge and
+ * the explicit `CellSelection` ends above that merged cell. Using that merged cell as an endpoint
+ * would expand the selection to the full width of the cell.
+ */
+export var isColumnSelectionWithMergedLastRow = function isColumnSelectionWithMergedLastRow(selection) {
+  var rect = getSelectionRect(selection);
+  if (!rect) {
+    return false;
+  }
+  var table = findTableClosestToPos(selection.$anchorCell);
+  if (!table) {
+    return false;
+  }
+  var map = TableMap.get(table.node);
+  if (rect.top !== 0 || rect.bottom === map.height) {
+    return false;
+  }
+  for (var col = rect.left; col < rect.right; col++) {
+    var bottomCellRect = map.findCell(map.map[(map.height - 1) * map.width + col]);
+    var isHorizontallyMerged = bottomCellRect.right - bottomCellRect.left > 1;
+    var bridgesGapBelowSelection = bottomCellRect.top <= rect.bottom;
+    if (!isHorizontallyMerged || !bridgesGapBelowSelection) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * Treats a row as fully selected when its first-column area is covered by a vertical merge and the
  * explicit `CellSelection` starts to the right of that merged cell. `CellSelection.isRowSelection()`
@@ -83,5 +113,10 @@ export var isFullRowOrColumnSelected = function isFullRowOrColumnSelected(select
   if (!(selection instanceof CellSelection)) {
     return false;
   }
-  return selection.isRowSelection() || selection.isColSelection() || isRowSelectionWithMergedFirstColumn(selection) || isColumnSelectionWithMergedFirstRow(selection);
+  var isExistingFullRowOrColumnSelection = selection.isRowSelection() || selection.isColSelection() || isRowSelectionWithMergedFirstColumn(selection) || isColumnSelectionWithMergedFirstRow(selection);
+  if (isExperimentEnabled('platform_editor_table_menu_updates_patch_5')) {
+    return isExistingFullRowOrColumnSelection || isColumnSelectionWithMergedLastRow(selection);
+  } else {
+    return isExistingFullRowOrColumnSelection;
+  }
 };

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

@@ -7,12 +7,13 @@ 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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { clearHoverSelection, 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, isColumnSelectionWithMergedFirstRow } from '../../../pm-plugins/utils/selection';
+import { getSelectedColumnIndexes, isColumnSelectionWithMergedFirstRow, isColumnSelectionWithMergedLastRow } from '../../../pm-plugins/utils/selection';
 import { TableCssClassName as ClassName } from '../../../types';
 import { DragHandle } from '../../DragHandle';
 var getSelectedColumns = function getSelectedColumns(selection) {
@@ -20,9 +21,13 @@ var getSelectedColumns = function getSelectedColumns(selection) {
     return [];
   }
   if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
-    // New behaviour: also treat a column selection that sits below a merged first-row cell as a
-    // full column selection.
-    if (!selection.isColSelection() && !isColumnSelectionWithMergedFirstRow(selection)) {
+    var isColumnSelection;
+    if (isExperimentEnabled('platform_editor_table_menu_updates_patch_5')) {
+      isColumnSelection = selection.isColSelection() || isColumnSelectionWithMergedFirstRow(selection) || isColumnSelectionWithMergedLastRow(selection);
+    } else {
+      isColumnSelection = selection.isColSelection() || isColumnSelectionWithMergedFirstRow(selection);
+    }
+    if (!isColumnSelection) {
       return [];
     }
     var rect = getSelectionRect(selection);
@@ -57,12 +62,14 @@ export var ColumnControls = function ColumnControls(_ref) {
     getScrollOffset = _ref.getScrollOffset,
     api = _ref.api;
   var columnControlsRef = useRef(null);
-  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['selection'], function (states) {
-      var _states$selectionStat;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['selection', 'table'], function (states) {
+      var _states$tableState, _states$selectionStat;
       return {
+        activeTableMenu: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.activeTableMenu,
         selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
       };
     }),
+    activeTableMenu = _useSharedPluginState.activeTableMenu,
     selection = _useSharedPluginState.selection;
   var widths = (_colWidths$map$join = colWidths === null || colWidths === void 0 ? void 0 : colWidths.map(function (width) {
     return (
@@ -75,6 +82,12 @@ export var ColumnControls = function ColumnControls(_ref) {
   var columnParams = getRowsParams(colWidths !== null && colWidths !== void 0 ? colWidths : []);
   var colIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.colIndex;
   var selectedColIndexes = getSelectedColumns(selection || editorView.state.selection);
+  var renderedSelectedColIndexes;
+  if (isExperimentEnabled('platform_editor_table_menu_updates_patch_5')) {
+    renderedSelectedColIndexes = (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'column' ? [activeTableMenu.index] : selectedColIndexes;
+  } else {
+    renderedSelectedColIndexes = selectedColIndexes;
+  }
   var firstRow = tableRef.querySelector('tr');
   var hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
   var rowControlStickyTop = 45;
@@ -219,7 +232,7 @@ export var ColumnControls = function ColumnControls(_ref) {
         position: 'relative',
         pointerEvents: isPlaceholder ? 'none' : undefined
       },
-      "data-testid": "table-floating-column-".concat(isHover ? colIndex : isPlaceholder ? appearance : selectedColIndexes[0], "-drag-handle")
+      "data-testid": "table-floating-column-".concat(isHover ? colIndex : isPlaceholder ? appearance : renderedSelectedColIndexes[0], "-drag-handle")
     }, /*#__PURE__*/React.createElement(DragHandle, {
       api: api,
       isDragMenuTarget: !isHover,
@@ -242,8 +255,8 @@ export var ColumnControls = function ColumnControls(_ref) {
   };
   var columnHandles = function columnHandles() {
     var handles = [];
-    var isColumnSelected = selectedColIndexes.length > 0;
-    var isEntireTableSelected = (colWidths || []).length > selectedColIndexes.length;
+    var isColumnSelected = renderedSelectedColIndexes.length > 0;
+    var isEntireTableSelected = (colWidths || []).length > renderedSelectedColIndexes.length;
     if (!tableActive) {
       return null;
     }
@@ -253,8 +266,8 @@ export var ColumnControls = function ColumnControls(_ref) {
     // so it can be focused via keyboard shortcuts
     handles.push(generateHandleByType('selected', selectedAppearance,
     // always position placeholder in first column to avoid overflow issues
-    selectedAppearance === 'placeholder' ? '1 / span 1' : "".concat(selectedColIndexes[0] + 1, " / span ").concat(selectedColIndexes.length), selectedColIndexes));
-    if (hoveredCell && isTableHovered && colIndex !== undefined && !selectedColIndexes.includes(colIndex)) {
+    selectedAppearance === 'placeholder' ? '1 / span 1' : "".concat(renderedSelectedColIndexes[0] + 1, " / span ").concat(renderedSelectedColIndexes.length), renderedSelectedColIndexes));
+    if (hoveredCell && isTableHovered && colIndex !== undefined && !renderedSelectedColIndexes.includes(colIndex)) {
       handles.push(
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

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

@@ -1,4 +1,4 @@
-/* SortDecreasingItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* SortDecreasingItem.tsx generated by @compiled/babel-plugin v3.0.1 */
 import _extends from "@babel/runtime/helpers/extends";
 import "./SortDecreasingItem.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";

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

@@ -1,4 +1,4 @@
-/* SortIncreasingItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* SortIncreasingItem.tsx generated by @compiled/babel-plugin v3.0.1 */
 import _extends from "@babel/runtime/helpers/extends";
 import "./SortIncreasingItem.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";

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

@@ -1,4 +1,4 @@
-/* BackgroundColorItem.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* BackgroundColorItem.tsx generated by @compiled/babel-plugin v3.0.1 */
 import "./BackgroundColorItem.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useMemo } from 'react';

package/dist/types/pm-plugins/utils/selection.d.ts

@@ -9,6 +9,12 @@ export declare const getSelectedRowIndexes: (selectionRect: Rect) => number[];
  * returns `false` in this case because the selection does not include the merged first-row cell.
  */
 export declare const isColumnSelectionWithMergedFirstRow: (selection: CellSelection) => boolean;
+/**
+ * Treats a column as fully selected when its last-row area is covered by a horizontal merge and
+ * the explicit `CellSelection` ends above that merged cell. Using that merged cell as an endpoint
+ * would expand the selection to the full width of the cell.
+ */
+export declare const isColumnSelectionWithMergedLastRow: (selection: CellSelection) => boolean;
 /**
  * Treats a row as fully selected when its first-column area is covered by a vertical merge and the
  * explicit `CellSelection` starts to the right of that merged cell. `CellSelection.isRowSelection()`

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "29.1.5",
+	"version": "29.1.7",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
 		"@atlaskit/editor-plugin-batch-attribute-updates": "^17.0.0",
 		"@atlaskit/editor-plugin-content-insertion": "^17.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^19.0.0",
-		"@atlaskit/editor-plugin-extension": "20.0.5",
+		"@atlaskit/editor-plugin-extension": "20.0.7",
 		"@atlaskit/editor-plugin-guideline": "^17.0.0",
 		"@atlaskit/editor-plugin-interaction": "^28.0.0",
 		"@atlaskit/editor-plugin-limited-mode": "^14.1.0",
@@ -53,7 +53,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^3.2.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^184.0.0",
+		"@atlaskit/tmp-editor-statsig": "^185.0.0",
 		"@atlaskit/toggle": "^17.3.0",
 		"@atlaskit/tokens": "^16.11.0",
 		"@atlaskit/tooltip": "^24.3.0",
@@ -68,7 +68,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^121.2.0",
+		"@atlaskit/editor-common": "^121.3.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"
@@ -92,9 +92,6 @@
 		"platform_editor_table_height_analytics": {
 			"type": "boolean"
 		},
-		"platform_editor_max_width_default_width": {
-			"type": "boolean"
-		},
 		"platform_editor_ai_table_ai_streaming_pos_fix": {
 			"type": "boolean"
 		},