@atlaskit/editor-plugin-table 24.4.4 → 24.4.6

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-table
 
+## 24.4.6
+
+### Patch Changes
+
+- [`d86bd1324d82b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d86bd1324d82b) -
+  Fix table cell selection when moving a table with the keyboard shortcut behind the
+  `platform_editor_fix_table_move_shortcut` experiment.
+- Updated dependencies
+
+## 24.4.5
+
+### Patch Changes
+
+- [`22f3858872f99`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/22f3858872f99) -
+  Clean up experiment `platform_editor_table_toolbar_perf_fix`
+- Updated dependencies
+
 ## 24.4.4
 
 ### Patch Changes

package/dist/cjs/nodeviews/table.js

@@ -21,6 +21,7 @@ var _table = require("@atlaskit/editor-common/table");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -143,6 +144,10 @@ var TableView = exports.default = /*#__PURE__*/function (_ReactNodeView) {
 
       // Only proceed if we have both a node and table, and the table isn't already inside the node
       if (node && this.table && !node.contains(this.table)) {
+        // Patch to prevent selection collapsing when moving the table down with ctrl + shift + down
+        var selectionBeforeMove = this.view.state.selection;
+        var shouldPreserveCellSelection = (0, _expValEquals.expValEquals)('platform_editor_fix_table_move_shortcut', 'isEnabled', true) && selectionBeforeMove instanceof _cellSelection.CellSelection;
+
         // Store the current ignoreMutation handler so we can restore it later
         oldIgnoreMutation = this.ignoreMutation;
 
@@ -154,7 +159,7 @@ var TableView = exports.default = /*#__PURE__*/function (_ReactNodeView) {
           if (!isSelectionMutation) {
             mutationsIgnored = true;
           }
-          return !isSelectionMutation;
+          return !isSelectionMutation || shouldPreserveCellSelection && _this2.view.state.selection.eq(selectionBeforeMove);
         };
 
         // Store the current selection state if there is a visible selection

package/dist/cjs/ui/toolbar.js

@@ -236,42 +236,22 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
     });
   }
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo = pluginState.pluginConfig) !== null && _pluginState$pluginCo !== void 0 && _pluginState$pluginCo.allowDistributeColumns) {
-    var wouldChange = true; // Default to enabled - show the button.
-    var newResizeStateWithAnalytics;
-
-    // Performance optimization: Skip expensive getTableScalingPercent() DOM query when limited mode is enabled.
-    // This avoids layout reflows on every transaction. Instead, button stays enabled and calculates on-demand when clicked.
-    if (!isLimitedModeEnabled && !(0, _expValEquals.expValEquals)('platform_editor_table_toolbar_perf_fix', 'isEnabled', true)) {
-      var _newResizeStateWithAn, _newResizeStateWithAn2;
-      newResizeStateWithAnalytics = editorView ? (0, _resizeState.getNewResizeStateFromSelectedColumns)(initialSelectionRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor) : undefined;
-      wouldChange = (_newResizeStateWithAn = (_newResizeStateWithAn2 = newResizeStateWithAnalytics) === null || _newResizeStateWithAn2 === void 0 ? void 0 : _newResizeStateWithAn2.changed) !== null && _newResizeStateWithAn !== void 0 ? _newResizeStateWithAn : false;
-    }
     var distributeColumnWidths = function distributeColumnWidths(state, dispatch, view) {
-      // When optimization is enabled, calculate on-demand when clicked
-      if (isLimitedModeEnabled || (0, _expValEquals.expValEquals)('platform_editor_table_toolbar_perf_fix', 'isEnabled', true)) {
-        if (view) {
-          var resizeState = (0, _resizeState.getNewResizeStateFromSelectedColumns)(initialSelectionRect, state, view.domAtPos.bind(view), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
-          if (resizeState) {
-            (0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI, api)(_analytics.INPUT_METHOD.FLOATING_TB, resizeState)(state, dispatch);
-            return true;
-          }
-        }
-        return false;
-      } else {
-        // Original behavior: use pre-calculated state
-        if (newResizeStateWithAnalytics) {
-          (0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI, api)(_analytics.INPUT_METHOD.FLOATING_TB, newResizeStateWithAnalytics)(state, dispatch);
+      if (view) {
+        var resizeState = (0, _resizeState.getNewResizeStateFromSelectedColumns)(initialSelectionRect, state, view.domAtPos.bind(view), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
+        if (resizeState) {
+          (0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI, api)(_analytics.INPUT_METHOD.FLOATING_TB, resizeState)(state, dispatch);
           return true;
         }
-        return false;
       }
+      return false;
     };
     options.push({
       id: 'editor.table.distributeColumns',
       title: formatMessage(_messages.tableMessages.distributeColumns),
       onClick: distributeColumnWidths,
       selected: false,
-      disabled: !wouldChange
+      disabled: false
     });
   }
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo2 = pluginState.pluginConfig) !== null && _pluginState$pluginCo2 !== void 0 && _pluginState$pluginCo2.allowColumnSorting) {
@@ -437,24 +417,10 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
         var isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
         var areTableColumWidthsFixed = tableObject.node.attrs.displayMode === 'fixed';
         var editorView = getEditorView();
-        var getDomRef = (0, _expValEquals.expValEquals)('platform_editor_table_toolbar_perf_fix', 'isEnabled', true) ? function (editorView) {
+        var getDomRef = function getDomRef(editorView) {
           var domAtPos = editorView.domAtPos.bind(editorView);
           var parent = (0, _utils2.findParentDomRefOfType)(nodeType, domAtPos)(state.selection);
           return getMemoizedTableWrapperFromParent(parent);
-        } : function (editorView) {
-          var element;
-          var domAtPos = editorView.domAtPos.bind(editorView);
-          var parent = (0, _utils2.findParentDomRefOfType)(nodeType, domAtPos)(state.selection);
-          if (parent) {
-            var tableRef =
-            // Ignored via go/ees005
-            // eslint-disable-next-line @atlaskit/editor/no-as-casting
-            parent.querySelector('table') || undefined;
-            if (tableRef) {
-              element = (0, _utils.closestElement)(tableRef, ".".concat(_types.TableCssClassName.TABLE_NODE_WRAPPER)) || undefined;
-            }
-          }
-          return element;
         };
         var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
         var alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
@@ -665,24 +631,8 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
   var isLimitedModeEnabled = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
   var pluginState = (0, _pluginFactory2.getPluginState)(editorState);
   var items = [];
-  var wouldChange = true; // Default to enabled - show the button.
-  var newResizeStateWithAnalytics;
-  if ((0, _expValEquals.expValEquals)('platform_editor_table_toolbar_perf_fix', 'isEnabled', true)) {
-    if (!editorView) {
-      return [];
-    }
-  } else {
-    var selectionOrTableRect = getClosestSelectionOrTableRect(editorState);
-    if (!selectionOrTableRect || !editorView) {
-      return [];
-    }
-    // Performance optimization: Skip expensive getTableScalingPercent() DOM query when limited mode is enabled.
-    // This avoids layout reflows on every transaction. Instead, button stays enabled and calculates on-demand when clicked.
-    if (!isLimitedModeEnabled) {
-      var _newResizeStateWithAn3, _newResizeStateWithAn4;
-      newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionOrTableRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
-      wouldChange = (_newResizeStateWithAn3 = (_newResizeStateWithAn4 = newResizeStateWithAnalytics) === null || _newResizeStateWithAn4 === void 0 ? void 0 : _newResizeStateWithAn4.changed) !== null && _newResizeStateWithAn3 !== void 0 ? _newResizeStateWithAn3 : false;
-    }
+  if (!editorView) {
+    return [];
   }
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo3 = pluginState.pluginConfig) !== null && _pluginState$pluginCo3 !== void 0 && _pluginState$pluginCo3.allowDistributeColumns) {
     items.push({
@@ -698,7 +648,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
       onClick: function onClick(state, dispatch, view) {
         return getDistributeConfig(getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor)(state, dispatch, view);
       },
-      disabled: !wouldChange
+      disabled: false
     });
   }
   if (items.length !== 0 && !(0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
@@ -810,7 +760,7 @@ var getAlignmentOptionsConfig = function getAlignmentOptionsConfig(editorState,
       value = alignmentIcon.value,
       icon = alignmentIcon.icon;
     var currentLayout = tableObject.node.attrs.layout;
-    var shouldDisableLayoutOption = (0, _expValEquals.expValEquals)('platform_editor_table_toolbar_perf_fix', 'isEnabled', true) ? getMemoizedIsLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, editorView !== null, shouldUseIncreasedScalingPercent, isFullWidthEditor) : isLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor);
+    var shouldDisableLayoutOption = getMemoizedIsLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, editorView !== null, shouldUseIncreasedScalingPercent, isFullWidthEditor);
     return _objectSpread({
       id: id,
       type: 'button',
@@ -884,23 +834,4 @@ var getMemoizedIsLayoutOptionDisabled = (0, _memoizeOne.default)(isLayoutOptionD
     return val === nextRest[idx];
   });
   return nodeEqual && restEqual;
-});
-var isLayoutOptionDisabled = function isLayoutOptionDisabled(selectedNode, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor) {
-  var _getEditorContainerWi2 = getEditorContainerWidth(),
-    lineLength = _getEditorContainerWi2.lineLength;
-  var tableContainerWidth = (0, _nodeWidth.getTableContainerWidth)(selectedNode);
-
-  // table may be scaled, use the scale percent to calculate the table width
-  if (editorView) {
-    var tableWrapperWidth = tableContainerWidth;
-    var scalePercent = (0, _misc.getStaticTableScalingPercent)(selectedNode, tableWrapperWidth, shouldUseIncreasedScalingPercent);
-    tableContainerWidth = tableContainerWidth * scalePercent;
-  }
-
-  // If fixed-width editor, we disable 'left-alignment' when table width is 760px.
-  // tableContainerWidth +1 here because tableContainerWidth is 759 in fixed-width editor
-  if (selectedNode && !isFullWidthEditor && lineLength && tableContainerWidth + 1 >= lineLength) {
-    return true;
-  }
-  return false;
-};
+});

package/dist/es2019/nodeviews/table.js

@@ -7,6 +7,7 @@ import { isTableInContentMode } from '@atlaskit/editor-common/table';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -113,6 +114,10 @@ export default class TableView extends ReactNodeView {
 
     // Only proceed if we have both a node and table, and the table isn't already inside the node
     if (node && this.table && !node.contains(this.table)) {
+      // Patch to prevent selection collapsing when moving the table down with ctrl + shift + down
+      const selectionBeforeMove = this.view.state.selection;
+      const shouldPreserveCellSelection = expValEquals('platform_editor_fix_table_move_shortcut', 'isEnabled', true) && selectionBeforeMove instanceof CellSelection;
+
       // Store the current ignoreMutation handler so we can restore it later
       oldIgnoreMutation = this.ignoreMutation;
 
@@ -124,7 +129,7 @@ export default class TableView extends ReactNodeView {
         if (!isSelectionMutation) {
           mutationsIgnored = true;
         }
-        return !isSelectionMutation;
+        return !isSelectionMutation || shouldPreserveCellSelection && this.view.state.selection.eq(selectionBeforeMove);
       };
 
       // Store the current selection state if there is a visible selection

package/dist/es2019/ui/toolbar.js

@@ -218,42 +218,22 @@ export const getToolbarCellOptionsConfig = (editorState, editorView, initialSele
     });
   }
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo = pluginState.pluginConfig) !== null && _pluginState$pluginCo !== void 0 && _pluginState$pluginCo.allowDistributeColumns) {
-    let wouldChange = true; // Default to enabled - show the button.
-    let newResizeStateWithAnalytics;
-
-    // Performance optimization: Skip expensive getTableScalingPercent() DOM query when limited mode is enabled.
-    // This avoids layout reflows on every transaction. Instead, button stays enabled and calculates on-demand when clicked.
-    if (!isLimitedModeEnabled && !expValEquals('platform_editor_table_toolbar_perf_fix', 'isEnabled', true)) {
-      var _newResizeStateWithAn, _newResizeStateWithAn2;
-      newResizeStateWithAnalytics = editorView ? getNewResizeStateFromSelectedColumns(initialSelectionRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor) : undefined;
-      wouldChange = (_newResizeStateWithAn = (_newResizeStateWithAn2 = newResizeStateWithAnalytics) === null || _newResizeStateWithAn2 === void 0 ? void 0 : _newResizeStateWithAn2.changed) !== null && _newResizeStateWithAn !== void 0 ? _newResizeStateWithAn : false;
-    }
     const distributeColumnWidths = (state, dispatch, view) => {
-      // When optimization is enabled, calculate on-demand when clicked
-      if (isLimitedModeEnabled || expValEquals('platform_editor_table_toolbar_perf_fix', 'isEnabled', true)) {
-        if (view) {
-          const resizeState = getNewResizeStateFromSelectedColumns(initialSelectionRect, state, view.domAtPos.bind(view), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
-          if (resizeState) {
-            distributeColumnsWidthsWithAnalytics(editorAnalyticsAPI, api)(INPUT_METHOD.FLOATING_TB, resizeState)(state, dispatch);
-            return true;
-          }
-        }
-        return false;
-      } else {
-        // Original behavior: use pre-calculated state
-        if (newResizeStateWithAnalytics) {
-          distributeColumnsWidthsWithAnalytics(editorAnalyticsAPI, api)(INPUT_METHOD.FLOATING_TB, newResizeStateWithAnalytics)(state, dispatch);
+      if (view) {
+        const resizeState = getNewResizeStateFromSelectedColumns(initialSelectionRect, state, view.domAtPos.bind(view), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
+        if (resizeState) {
+          distributeColumnsWidthsWithAnalytics(editorAnalyticsAPI, api)(INPUT_METHOD.FLOATING_TB, resizeState)(state, dispatch);
           return true;
         }
-        return false;
       }
+      return false;
     };
     options.push({
       id: 'editor.table.distributeColumns',
       title: formatMessage(messages.distributeColumns),
       onClick: distributeColumnWidths,
       selected: false,
-      disabled: !wouldChange
+      disabled: false
     });
   }
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo2 = pluginState.pluginConfig) !== null && _pluginState$pluginCo2 !== void 0 && _pluginState$pluginCo2.allowColumnSorting) {
@@ -415,24 +395,10 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
     const isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
     const areTableColumWidthsFixed = tableObject.node.attrs.displayMode === 'fixed';
     const editorView = getEditorView();
-    const getDomRef = expValEquals('platform_editor_table_toolbar_perf_fix', 'isEnabled', true) ? editorView => {
+    const getDomRef = editorView => {
       const domAtPos = editorView.domAtPos.bind(editorView);
       const parent = findParentDomRefOfType(nodeType, domAtPos)(state.selection);
       return getMemoizedTableWrapperFromParent(parent);
-    } : editorView => {
-      let element;
-      const domAtPos = editorView.domAtPos.bind(editorView);
-      const parent = findParentDomRefOfType(nodeType, domAtPos)(state.selection);
-      if (parent) {
-        const tableRef =
-        // Ignored via go/ees005
-        // eslint-disable-next-line @atlaskit/editor/no-as-casting
-        parent.querySelector('table') || undefined;
-        if (tableRef) {
-          element = closestElement(tableRef, `.${TableCssClassName.TABLE_NODE_WRAPPER}`) || undefined;
-        }
-      }
-      return element;
     };
     const menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
     const alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
@@ -623,24 +589,8 @@ const getColumnSettingItems = (editorState, editorView, {
   var _pluginState$pluginCo3;
   const pluginState = getPluginState(editorState);
   const items = [];
-  let wouldChange = true; // Default to enabled - show the button.
-  let newResizeStateWithAnalytics;
-  if (expValEquals('platform_editor_table_toolbar_perf_fix', 'isEnabled', true)) {
-    if (!editorView) {
-      return [];
-    }
-  } else {
-    const selectionOrTableRect = getClosestSelectionOrTableRect(editorState);
-    if (!selectionOrTableRect || !editorView) {
-      return [];
-    }
-    // Performance optimization: Skip expensive getTableScalingPercent() DOM query when limited mode is enabled.
-    // This avoids layout reflows on every transaction. Instead, button stays enabled and calculates on-demand when clicked.
-    if (!isLimitedModeEnabled) {
-      var _newResizeStateWithAn3, _newResizeStateWithAn4;
-      newResizeStateWithAnalytics = getNewResizeStateFromSelectedColumns(selectionOrTableRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
-      wouldChange = (_newResizeStateWithAn3 = (_newResizeStateWithAn4 = newResizeStateWithAnalytics) === null || _newResizeStateWithAn4 === void 0 ? void 0 : _newResizeStateWithAn4.changed) !== null && _newResizeStateWithAn3 !== void 0 ? _newResizeStateWithAn3 : false;
-    }
+  if (!editorView) {
+    return [];
   }
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo3 = pluginState.pluginConfig) !== null && _pluginState$pluginCo3 !== void 0 && _pluginState$pluginCo3.allowDistributeColumns) {
     items.push({
@@ -652,7 +602,7 @@ const getColumnSettingItems = (editorState, editorView, {
         label: ''
       }),
       onClick: (state, dispatch, view) => getDistributeConfig(getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor)(state, dispatch, view),
-      disabled: !wouldChange
+      disabled: false
     });
   }
   if (items.length !== 0 && !areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
@@ -759,7 +709,7 @@ const getAlignmentOptionsConfig = (editorState, {
       icon
     } = alignmentIcon;
     const currentLayout = tableObject.node.attrs.layout;
-    const shouldDisableLayoutOption = expValEquals('platform_editor_table_toolbar_perf_fix', 'isEnabled', true) ? getMemoizedIsLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, editorView !== null, shouldUseIncreasedScalingPercent, isFullWidthEditor) : isLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor);
+    const shouldDisableLayoutOption = getMemoizedIsLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, editorView !== null, shouldUseIncreasedScalingPercent, isFullWidthEditor);
     return {
       id: id,
       type: 'button',
@@ -825,24 +775,4 @@ const getMemoizedIsLayoutOptionDisabled = memoizeOne(isLayoutOptionDisabledImpl,
   const nodeEqual = isEqual(prevNode.attrs, nextNode.attrs);
   const restEqual = prevRest.every((val, idx) => val === nextRest[idx]);
   return nodeEqual && restEqual;
-});
-const isLayoutOptionDisabled = (selectedNode, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor) => {
-  const {
-    lineLength
-  } = getEditorContainerWidth();
-  let tableContainerWidth = getTableContainerWidth(selectedNode);
-
-  // table may be scaled, use the scale percent to calculate the table width
-  if (editorView) {
-    const tableWrapperWidth = tableContainerWidth;
-    const scalePercent = getStaticTableScalingPercent(selectedNode, tableWrapperWidth, shouldUseIncreasedScalingPercent);
-    tableContainerWidth = tableContainerWidth * scalePercent;
-  }
-
-  // If fixed-width editor, we disable 'left-alignment' when table width is 760px.
-  // tableContainerWidth +1 here because tableContainerWidth is 759 in fixed-width editor
-  if (selectedNode && !isFullWidthEditor && lineLength && tableContainerWidth + 1 >= lineLength) {
-    return true;
-  }
-  return false;
-};
+});

package/dist/esm/nodeviews/table.js

@@ -17,6 +17,7 @@ import { isTableInContentMode } from '@atlaskit/editor-common/table';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -136,6 +137,10 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
 
       // Only proceed if we have both a node and table, and the table isn't already inside the node
       if (node && this.table && !node.contains(this.table)) {
+        // Patch to prevent selection collapsing when moving the table down with ctrl + shift + down
+        var selectionBeforeMove = this.view.state.selection;
+        var shouldPreserveCellSelection = expValEquals('platform_editor_fix_table_move_shortcut', 'isEnabled', true) && selectionBeforeMove instanceof CellSelection;
+
         // Store the current ignoreMutation handler so we can restore it later
         oldIgnoreMutation = this.ignoreMutation;
 
@@ -147,7 +152,7 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
           if (!isSelectionMutation) {
             mutationsIgnored = true;
           }
-          return !isSelectionMutation;
+          return !isSelectionMutation || shouldPreserveCellSelection && _this2.view.state.selection.eq(selectionBeforeMove);
         };
 
         // Store the current selection state if there is a visible selection

package/dist/esm/ui/toolbar.js

@@ -229,42 +229,22 @@ export var getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(ed
     });
   }
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo = pluginState.pluginConfig) !== null && _pluginState$pluginCo !== void 0 && _pluginState$pluginCo.allowDistributeColumns) {
-    var wouldChange = true; // Default to enabled - show the button.
-    var newResizeStateWithAnalytics;
-
-    // Performance optimization: Skip expensive getTableScalingPercent() DOM query when limited mode is enabled.
-    // This avoids layout reflows on every transaction. Instead, button stays enabled and calculates on-demand when clicked.
-    if (!isLimitedModeEnabled && !expValEquals('platform_editor_table_toolbar_perf_fix', 'isEnabled', true)) {
-      var _newResizeStateWithAn, _newResizeStateWithAn2;
-      newResizeStateWithAnalytics = editorView ? getNewResizeStateFromSelectedColumns(initialSelectionRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor) : undefined;
-      wouldChange = (_newResizeStateWithAn = (_newResizeStateWithAn2 = newResizeStateWithAnalytics) === null || _newResizeStateWithAn2 === void 0 ? void 0 : _newResizeStateWithAn2.changed) !== null && _newResizeStateWithAn !== void 0 ? _newResizeStateWithAn : false;
-    }
     var distributeColumnWidths = function distributeColumnWidths(state, dispatch, view) {
-      // When optimization is enabled, calculate on-demand when clicked
-      if (isLimitedModeEnabled || expValEquals('platform_editor_table_toolbar_perf_fix', 'isEnabled', true)) {
-        if (view) {
-          var resizeState = getNewResizeStateFromSelectedColumns(initialSelectionRect, state, view.domAtPos.bind(view), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
-          if (resizeState) {
-            distributeColumnsWidthsWithAnalytics(editorAnalyticsAPI, api)(INPUT_METHOD.FLOATING_TB, resizeState)(state, dispatch);
-            return true;
-          }
-        }
-        return false;
-      } else {
-        // Original behavior: use pre-calculated state
-        if (newResizeStateWithAnalytics) {
-          distributeColumnsWidthsWithAnalytics(editorAnalyticsAPI, api)(INPUT_METHOD.FLOATING_TB, newResizeStateWithAnalytics)(state, dispatch);
+      if (view) {
+        var resizeState = getNewResizeStateFromSelectedColumns(initialSelectionRect, state, view.domAtPos.bind(view), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
+        if (resizeState) {
+          distributeColumnsWidthsWithAnalytics(editorAnalyticsAPI, api)(INPUT_METHOD.FLOATING_TB, resizeState)(state, dispatch);
           return true;
         }
-        return false;
       }
+      return false;
     };
     options.push({
       id: 'editor.table.distributeColumns',
       title: formatMessage(messages.distributeColumns),
       onClick: distributeColumnWidths,
       selected: false,
-      disabled: !wouldChange
+      disabled: false
     });
   }
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo2 = pluginState.pluginConfig) !== null && _pluginState$pluginCo2 !== void 0 && _pluginState$pluginCo2.allowColumnSorting) {
@@ -430,24 +410,10 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
         var isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
         var areTableColumWidthsFixed = tableObject.node.attrs.displayMode === 'fixed';
         var editorView = getEditorView();
-        var getDomRef = expValEquals('platform_editor_table_toolbar_perf_fix', 'isEnabled', true) ? function (editorView) {
+        var getDomRef = function getDomRef(editorView) {
           var domAtPos = editorView.domAtPos.bind(editorView);
           var parent = findParentDomRefOfType(nodeType, domAtPos)(state.selection);
           return getMemoizedTableWrapperFromParent(parent);
-        } : function (editorView) {
-          var element;
-          var domAtPos = editorView.domAtPos.bind(editorView);
-          var parent = findParentDomRefOfType(nodeType, domAtPos)(state.selection);
-          if (parent) {
-            var tableRef =
-            // Ignored via go/ees005
-            // eslint-disable-next-line @atlaskit/editor/no-as-casting
-            parent.querySelector('table') || undefined;
-            if (tableRef) {
-              element = closestElement(tableRef, ".".concat(TableCssClassName.TABLE_NODE_WRAPPER)) || undefined;
-            }
-          }
-          return element;
         };
         var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
         var alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
@@ -658,24 +624,8 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
   var isLimitedModeEnabled = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
   var pluginState = getPluginState(editorState);
   var items = [];
-  var wouldChange = true; // Default to enabled - show the button.
-  var newResizeStateWithAnalytics;
-  if (expValEquals('platform_editor_table_toolbar_perf_fix', 'isEnabled', true)) {
-    if (!editorView) {
-      return [];
-    }
-  } else {
-    var selectionOrTableRect = getClosestSelectionOrTableRect(editorState);
-    if (!selectionOrTableRect || !editorView) {
-      return [];
-    }
-    // Performance optimization: Skip expensive getTableScalingPercent() DOM query when limited mode is enabled.
-    // This avoids layout reflows on every transaction. Instead, button stays enabled and calculates on-demand when clicked.
-    if (!isLimitedModeEnabled) {
-      var _newResizeStateWithAn3, _newResizeStateWithAn4;
-      newResizeStateWithAnalytics = getNewResizeStateFromSelectedColumns(selectionOrTableRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
-      wouldChange = (_newResizeStateWithAn3 = (_newResizeStateWithAn4 = newResizeStateWithAnalytics) === null || _newResizeStateWithAn4 === void 0 ? void 0 : _newResizeStateWithAn4.changed) !== null && _newResizeStateWithAn3 !== void 0 ? _newResizeStateWithAn3 : false;
-    }
+  if (!editorView) {
+    return [];
   }
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo3 = pluginState.pluginConfig) !== null && _pluginState$pluginCo3 !== void 0 && _pluginState$pluginCo3.allowDistributeColumns) {
     items.push({
@@ -691,7 +641,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
       onClick: function onClick(state, dispatch, view) {
         return getDistributeConfig(getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor)(state, dispatch, view);
       },
-      disabled: !wouldChange
+      disabled: false
     });
   }
   if (items.length !== 0 && !areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
@@ -803,7 +753,7 @@ var getAlignmentOptionsConfig = function getAlignmentOptionsConfig(editorState,
       value = alignmentIcon.value,
       icon = alignmentIcon.icon;
     var currentLayout = tableObject.node.attrs.layout;
-    var shouldDisableLayoutOption = expValEquals('platform_editor_table_toolbar_perf_fix', 'isEnabled', true) ? getMemoizedIsLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, editorView !== null, shouldUseIncreasedScalingPercent, isFullWidthEditor) : isLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor);
+    var shouldDisableLayoutOption = getMemoizedIsLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, editorView !== null, shouldUseIncreasedScalingPercent, isFullWidthEditor);
     return _objectSpread({
       id: id,
       type: 'button',
@@ -877,23 +827,4 @@ var getMemoizedIsLayoutOptionDisabled = memoizeOne(isLayoutOptionDisabledImpl, f
     return val === nextRest[idx];
   });
   return nodeEqual && restEqual;
-});
-var isLayoutOptionDisabled = function isLayoutOptionDisabled(selectedNode, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor) {
-  var _getEditorContainerWi2 = getEditorContainerWidth(),
-    lineLength = _getEditorContainerWi2.lineLength;
-  var tableContainerWidth = getTableContainerWidth(selectedNode);
-
-  // table may be scaled, use the scale percent to calculate the table width
-  if (editorView) {
-    var tableWrapperWidth = tableContainerWidth;
-    var scalePercent = getStaticTableScalingPercent(selectedNode, tableWrapperWidth, shouldUseIncreasedScalingPercent);
-    tableContainerWidth = tableContainerWidth * scalePercent;
-  }
-
-  // If fixed-width editor, we disable 'left-alignment' when table width is 760px.
-  // tableContainerWidth +1 here because tableContainerWidth is 759 in fixed-width editor
-  if (selectedNode && !isFullWidthEditor && lineLength && tableContainerWidth + 1 >= lineLength) {
-    return true;
-  }
-  return false;
-};
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "24.4.4",
+	"version": "24.4.6",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
 		"@atlaskit/editor-plugin-batch-attribute-updates": "^12.0.0",
 		"@atlaskit/editor-plugin-content-insertion": "^12.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^14.0.0",
-		"@atlaskit/editor-plugin-extension": "15.0.25",
+		"@atlaskit/editor-plugin-extension": "15.0.26",
 		"@atlaskit/editor-plugin-guideline": "^12.0.0",
 		"@atlaskit/editor-plugin-interaction": "^22.0.0",
 		"@atlaskit/editor-plugin-limited-mode": "^9.0.0",
@@ -52,7 +52,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^3.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^2.0.0",
 		"@atlaskit/primitives": "^20.6.0",
-		"@atlaskit/tmp-editor-statsig": "^124.6.0",
+		"@atlaskit/tmp-editor-statsig": "^125.1.0",
 		"@atlaskit/toggle": "^17.1.0",
 		"@atlaskit/tokens": "^15.8.0",
 		"@atlaskit/tooltip": "^23.1.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.28.0",
+		"@atlaskit/editor-common": "^116.30.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"