@atlaskit/editor-plugin-table 7.11.3 → 7.11.4

package/dist/esm/pm-plugins/drag-and-drop/plugin.js

@@ -3,6 +3,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getCellsInRow, getSelectedCellInfo } from '@atlaskit/editor-tables/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
@@ -156,7 +157,11 @@ var destroyFn = function destroyFn(editorView, editorAnalyticsAPI) {
             var _getTablePluginState4 = getTablePluginState(editorView.state),
               _getTablePluginState5 = _getTablePluginState4.isTableScalingEnabled,
               isTableScalingEnabled = _getTablePluginState5 === void 0 ? false : _getTablePluginState5;
-            insertColgroupFromNode(tableRef, tableNode, isTableScalingEnabled);
+            var isTableScalingEnabledOnCurrentTable = isTableScalingEnabled;
+            if (isTableScalingEnabled && getBooleanFF('platform.editor.table.preserve-widths-with-lock-button')) {
+              isTableScalingEnabledOnCurrentTable = tableNode.attrs.displayMode !== 'fixed';
+            }
+            insertColgroupFromNode(tableRef, tableNode, isTableScalingEnabledOnCurrentTable);
           }
         }
         editorView.focus();

package/dist/esm/pm-plugins/table-resizing/event-handlers.js

@@ -12,19 +12,16 @@ import { META_KEYS } from '../table-analytics';
 import { evenColumns, setDragging, stopResizing } from './commands';
 import { getPluginState } from './plugin-factory';
 import { currentColWidth, getResizeState, getTableMaxWidth, pointsAtCell, resizeColumn, updateControls } from './utils';
-export var handleMouseDown = function handleMouseDown(view, event, localResizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, editorAnalyticsAPI) {
+export var handleMouseDown = function handleMouseDown(view, event, localResizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, isTableScalingEnabled, editorAnalyticsAPI) {
   var state = view.state,
     dispatch = view.dispatch;
   var editorDisabled = !view.editable;
   var domAtPos = view.domAtPos.bind(view);
-  var _getTablePluginState = getTablePluginState(state),
-    _getTablePluginState$ = _getTablePluginState.isTableScalingEnabled,
-    isTableScalingEnabled = _getTablePluginState$ === void 0 ? false : _getTablePluginState$;
   if (editorDisabled || localResizeHandlePos === null || !pointsAtCell(state.doc.resolve(localResizeHandlePos))) {
     return false;
   }
-  var _getTablePluginState2 = getTablePluginState(state),
-    isKeyboardResize = _getTablePluginState2.isKeyboardResize;
+  var _getTablePluginState = getTablePluginState(state),
+    isKeyboardResize = _getTablePluginState.isKeyboardResize;
   event.preventDefault();
   var tr = view.state.tr;
   tr.setMeta(META_KEYS.OVERFLOW_TRIGGER, {
@@ -50,6 +47,9 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
     getEditorContainerWidth: getEditorContainerWidth
   });
   var shouldScale = tableDepth === 0 && isTableScalingEnabled;
+  if (isTableScalingEnabled && getBooleanFF('platform.editor.table.preserve-widths-with-lock-button')) {
+    shouldScale = shouldScale && originalTable.attrs.displayMode !== 'fixed';
+  }
   var resizeState = getResizeState({
     minWidth: tableCellMinWidth,
     maxSize: maxSize,
@@ -86,8 +86,8 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
     var _getPluginState = getPluginState(state),
       dragging = _getPluginState.dragging,
       resizeHandlePos = _getPluginState.resizeHandlePos;
-    var _getTablePluginState3 = getTablePluginState(state),
-      isTableHovered = _getTablePluginState3.isTableHovered;
+    var _getTablePluginState2 = getTablePluginState(state),
+      isTableHovered = _getTablePluginState2.isTableHovered;
     if (resizeHandlePos === null) {
       return stopResizing()(state, dispatch);
     }
@@ -132,6 +132,9 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
         // only selected (or selected - 1) columns should be distributed
         var resizingSelectedColumns = selectedColumns.indexOf(colIndex) > -1 || selectedColumns.indexOf(colIndex + 1) > -1;
         var _shouldScale = tableDepth === 0 && isTableScalingEnabled;
+        if (isTableScalingEnabled && getBooleanFF('platform.editor.table.preserve-widths-with-lock-button')) {
+          _shouldScale = _shouldScale && originalTable.attrs.displayMode !== 'fixed';
+        }
         var newResizeState = resizeColumn(resizeState, colIndex, clientX - startX, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, _shouldScale);
         var resizedDelta = clientX - startX;
         tr = updateColumnWidths(newResizeState, table, start)(tr);
@@ -191,8 +194,8 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
     var _getPluginState2 = getPluginState(state),
       dragging = _getPluginState2.dragging,
       resizeHandlePos = _getPluginState2.resizeHandlePos;
-    var _getTablePluginState4 = getTablePluginState(state),
-      isTableHovered = _getTablePluginState4.isTableHovered;
+    var _getTablePluginState3 = getTablePluginState(state),
+      isTableHovered = _getTablePluginState3.isTableHovered;
     if (!which || !dragging || resizeHandlePos === null || !pointsAtCell(state.doc.resolve(resizeHandlePos)) || !isTableHovered && getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
       return finish(event);
     }
@@ -203,6 +206,9 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
     var map = TableMap.get(table);
     var colIndex = map.colCount($cell.pos - $cell.start(-1)) + $cell.nodeAfter.attrs.colspan - 1;
     var shouldScale = tableDepth === 0 && isTableScalingEnabled;
+    if (isTableScalingEnabled && getBooleanFF('platform.editor.table.preserve-widths-with-lock-button')) {
+      shouldScale = shouldScale && originalTable.attrs.displayMode !== 'fixed';
+    }
     resizeColumn(resizeState, colIndex, clientX - dragging.startX, dom, table, undefined, shouldScale);
     updateControls()(state);
   }

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

@@ -9,7 +9,7 @@ import { handleMouseDown } from './event-handlers';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
 import { getResizeCellPos } from './utils';
-export function createPlugin(dispatch, _ref, getEditorContainerWidth, getEditorFeatureFlags, editorAnalyticsAPI) {
+export function createPlugin(dispatch, _ref, getEditorContainerWidth, getEditorFeatureFlags, editorAnalyticsAPI, isTableScalingEnabled) {
   var _ref$lastColumnResiza = _ref.lastColumnResizable,
     lastColumnResizable = _ref$lastColumnResiza === void 0 ? true : _ref$lastColumnResiza;
   return new SafePlugin({
@@ -49,7 +49,7 @@ export function createPlugin(dispatch, _ref, getEditorContainerWidth, getEditorF
             }
           }
           if (resizeHandlePos !== null && (!dragging || isColumnKeyboardResizeStarted)) {
-            if (handleMouseDown(view, event, resizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, editorAnalyticsAPI)) {
+            if (handleMouseDown(view, event, resizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, isTableScalingEnabled || false, editorAnalyticsAPI)) {
               var _state = view.state,
                 _dispatch = view.dispatch;
               return setResizeHandlePos(resizeHandlePos)(_state, _dispatch);

package/dist/esm/pm-plugins/table-resizing/utils/resize-state.js

@@ -326,14 +326,19 @@ export var getNewResizeStateFromSelectedColumns = function getNewResizeStateFrom
     layout: layout,
     getEditorContainerWidth: getEditorContainerWidth
   });
-  var resizeState = getResizeState({
+  var resizeState;
+  var isTableScalingEnabledOnCurrentTable = isTableScalingEnabled;
+  if (isTableScalingEnabled && getBooleanFF('platform.editor.table.preserve-widths-with-lock-button')) {
+    isTableScalingEnabledOnCurrentTable = table.node.attrs.displayMode !== 'fixed';
+  }
+  resizeState = getResizeState({
     minWidth: tableCellMinWidth,
     maxSize: maxSize,
     table: table.node,
     tableRef: tableRef,
     start: table.start,
     domAtPos: domAtPos,
-    isTableScalingEnabled: isTableScalingEnabled
+    isTableScalingEnabled: isTableScalingEnabledOnCurrentTable
   });
   var newResizeState = evenSelectedColumnsWidths(resizeState, rect);
   var widthsBefore = resizeState.widths;

package/dist/esm/pm-plugins/table-resizing/utils/scale-table.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { updateColumnWidths } from '../../../transforms';
 import { getTableWidth } from '../../../utils';
 import { getLayoutSize } from '../utils/misc';
@@ -14,7 +15,7 @@ import { syncStickyRowToTable } from './dom';
 // Base function to trigger the actual scale on a table node.
 // Will only resize/scale if a table has been previously resized.
 export var scale = function scale(tableRef, options, domAtPos) {
-  var isTableScalingEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var isTableScalingEnabledOnCurrentTable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var node = options.node,
     containerWidth = options.containerWidth,
     previousContainerWidth = options.previousContainerWidth,
@@ -50,12 +51,12 @@ export var scale = function scale(tableRef, options, domAtPos) {
     tableRef: tableRef,
     start: start,
     domAtPos: domAtPos,
-    isTableScalingEnabled: isTableScalingEnabled
+    isTableScalingEnabled: isTableScalingEnabledOnCurrentTable
   });
   return scaleTableTo(resizeState, newWidth);
 };
 export var scaleWithParent = function scaleWithParent(tableRef, parentWidth, table, start, domAtPos) {
-  var isTableScalingEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var isTableScalingEnabledOnCurrentTable = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var resizeState = getResizeState({
     minWidth: tableCellMinWidth,
     maxSize: parentWidth,
@@ -63,7 +64,7 @@ export var scaleWithParent = function scaleWithParent(tableRef, parentWidth, tab
     tableRef: tableRef,
     start: start,
     domAtPos: domAtPos,
-    isTableScalingEnabled: isTableScalingEnabled
+    isTableScalingEnabled: isTableScalingEnabledOnCurrentTable
   });
   if (table.attrs.isNumberColumnEnabled) {
     parentWidth -= akEditorTableNumberColumnWidth;
@@ -107,14 +108,18 @@ export var previewScaleTable = function previewScaleTable(tableRef, options, dom
     var width = isNumberColumnEnabled ? parentWidth - akEditorTableNumberColumnWidth : parentWidth;
     tableRef.style.width = "".concat(width, "px");
   }
-
+  var isTableScalingEnabledOnCurrentTable = isTableScalingEnabled;
+  if (isTableScalingEnabled && getBooleanFF('platform.editor.table.preserve-widths-with-lock-button')) {
+    isTableScalingEnabledOnCurrentTable = isTableScalingEnabled && node.attrs.displayMode !== 'fixed';
+  }
   // If the table hasn't been resize, the colgroup 48px width values will gracefully scale down.
   // If we are scaling the table down with isTableScalingEnabled, the colgroup widths may be scaled to a value that is not 48px.
-  if (!hasTableBeenResized(node) && !isTableScalingEnabled) {
+  if (!hasTableBeenResized(node) && !isTableScalingEnabledOnCurrentTable) {
     syncStickyRowToTable(tableRef);
     return;
   }
-  var resizeState = parentWidth ? scaleWithParent(tableRef, parentWidth, node, start, domAtPos, false) : scale(tableRef, options, domAtPos, false);
+  var resizeState = parentWidth ? scaleWithParent(tableRef, parentWidth, node, start, domAtPos, false) // Here last value is isTableScalingEnabled = false
+  : scale(tableRef, options, domAtPos, false);
   if (resizeState) {
     updateColgroup(resizeState, tableRef, node, false);
   }
@@ -122,7 +127,7 @@ export var previewScaleTable = function previewScaleTable(tableRef, options, dom
 
 // Scale the table to meet new requirements (col, layout change etc)
 export var scaleTable = function scaleTable(tableRef, options, domAtPos) {
-  var isTableScalingEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var isTableScalingEnabledOnCurrentTable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   return function (tr) {
     if (!tableRef) {
       return tr;
@@ -135,7 +140,7 @@ export var scaleTable = function scaleTable(tableRef, options, domAtPos) {
     if (hasTableBeenResized(node) === false) {
       // If its not a re-sized table, we still want to re-create cols
       // To force reflow of columns upon delete.
-      if (!isTableScalingEnabled) {
+      if (!isTableScalingEnabledOnCurrentTable) {
         insertColgroupFromNode(tableRef, node);
       }
       tr.setMeta('scrollIntoView', false);
@@ -143,9 +148,9 @@ export var scaleTable = function scaleTable(tableRef, options, domAtPos) {
     }
     var resizeState;
     if (parentWidth) {
-      resizeState = scaleWithParent(tableRef, parentWidth, node, start, domAtPos, isTableScalingEnabled);
+      resizeState = scaleWithParent(tableRef, parentWidth, node, start, domAtPos, isTableScalingEnabledOnCurrentTable);
     } else {
-      resizeState = scale(tableRef, options, domAtPos, isTableScalingEnabled);
+      resizeState = scale(tableRef, options, domAtPos, isTableScalingEnabledOnCurrentTable);
     }
     if (resizeState) {
       tr = updateColumnWidths(resizeState, node, start)(tr);

package/dist/esm/pm-plugins/table-width.js

@@ -16,10 +16,9 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorWideLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { getPluginState } from './plugin-factory';
 import { TABLE_MAX_WIDTH } from './table-resizing/utils';
 export var pluginKey = new PluginKey('tableWidthPlugin');
-var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent, fullWidthEnabled) {
+var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent, fullWidthEnabled, isTableScalingEnabled) {
   return new SafePlugin({
     key: pluginKey,
     state: {
@@ -86,9 +85,6 @@ var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent, fullW
       var referentialityTr = transactions.find(function (tr) {
         return tr.getMeta('referentialityTableInserted');
       });
-      var _getPluginState = getPluginState(newState),
-        _getPluginState$isTab = _getPluginState.isTableScalingEnabled,
-        isTableScalingEnabled = _getPluginState$isTab === void 0 ? false : _getPluginState$isTab;
       var shouldPatchTable = fullWidthEnabled && isTableScalingEnabled;
       if (!isReplaceDocumentOperation && (!shouldPatchTable || !referentialityTr)) {
         return null;

package/dist/esm/pm-plugins/view-mode-sort/utils.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { SortOrder } from '@atlaskit/editor-common/types';
+import { convertProsemirrorTableNodeToArrayOfRows, createCompareNodes } from '@atlaskit/editor-common/utils';
 import { IS_DISABLED_CLASS_NAME, SORT_INDEX_DATA_ATTRIBUTE, SORTING_ICON_CLASS_NAME } from './consts';
 export var unsort = function unsort(oldOrder, tableElement) {
   var rows = tableElement.querySelectorAll('tr');
@@ -12,44 +13,60 @@ export var unsort = function unsort(oldOrder, tableElement) {
     tbody === null || tbody === void 0 || tbody.appendChild(rows[item.index + 1]);
   });
 };
+export var getSortOrderFromTable = function getSortOrderFromTable(tableNode, sortIndex, direction) {
+  var tableArray = convertProsemirrorTableNodeToArrayOfRows(tableNode);
+  tableArray.shift(); // remove header row
 
-// TODO - reuse sort logic from the Renderer and support switching between ASC, DESC and NO_ORDER
-export var getSortOrderFromTable = function getSortOrderFromTable(tableElement, sortIndex, direction) {
-  var sortOrder = direction === SortOrder.DESC ? -1 : 1;
-  var strings = [];
-  tableElement.querySelectorAll('tr:not([data-header-row="true"])').forEach(function (tr) {
-    var _tr$querySelectorAll$;
-    strings.push(((_tr$querySelectorAll$ = tr.querySelectorAll('td')[sortIndex]) === null || _tr$querySelectorAll$ === void 0 ? void 0 : _tr$querySelectorAll$.textContent) || '');
+  // Keep track of the origin row index
+  var tableArrayWithIndex = tableArray.map(function (node, index) {
+    return {
+      node: node,
+      originalIndex: index
+    };
   });
-  var order = Array.from(strings.keys()).sort(function (a, b) {
-    var string = strings[a] || '';
-    return string.localeCompare(strings[b] || '') * sortOrder;
-  }).map(function (value, index) {
+  var compareNodesInOrder = createCompareNodes({
+    // TODO - add inline card support
+    getInlineCardTextFromStore: function getInlineCardTextFromStore() {
+      return null;
+    }
+  }, direction);
+  var order = tableArrayWithIndex.sort(function (a, b) {
+    return compareNodesInOrder(a.node[sortIndex], b.node[sortIndex]);
+  }).map(function (tableRow, index) {
     return {
-      value: value,
+      value: tableRow.originalIndex,
       index: index
     };
   });
-  // TODO - improve this. right now this is a workaround to ensure the first tr is always first in the order
-  return [{
+  return [
+  // Ensures the first tr is always first in the order
+  {
     value: -1,
     index: -1
   }].concat(_toConsumableArray(order));
 };
 export var toggleSort = function toggleSort(view, event, pluginState) {
-  var _target$closest;
+  var _target$closest, _tableNode$type;
   var target = event.target;
+  if (!(target instanceof HTMLElement)) {
+    return;
+  }
   var widget = target.closest(".".concat(SORTING_ICON_CLASS_NAME));
   if (widget !== null && widget !== void 0 && widget.classList.contains(IS_DISABLED_CLASS_NAME) || !widget) {
     return;
   }
-  var datasetortIndex = target === null || target === void 0 || (_target$closest = target.closest('.ProseMirror-widget')) === null || _target$closest === void 0 ? void 0 : _target$closest.getAttribute(SORT_INDEX_DATA_ATTRIBUTE);
+  var dataSortIndex = target === null || target === void 0 || (_target$closest = target.closest('.ProseMirror-widget')) === null || _target$closest === void 0 ? void 0 : _target$closest.getAttribute(SORT_INDEX_DATA_ATTRIBUTE);
   var tr = view.state.tr;
   var tableElement = target.closest('table');
-  if (!tableElement || !datasetortIndex) {
+  if (!tableElement || !dataSortIndex) {
+    return;
+  }
+  var tablePos = view.posAtDOM(tableElement, 0);
+  var tableNode = view.state.doc.nodeAt(tablePos - 1);
+  var tableId = tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.localId;
+  if (!tableId || !tableNode || (tableNode === null || tableNode === void 0 || (_tableNode$type = tableNode.type) === null || _tableNode$type === void 0 ? void 0 : _tableNode$type.name) !== 'table') {
     return;
   }
-  var tableId = tableElement.getAttribute('data-table-local-id') || '';
   var _ref = (pluginState === null || pluginState === void 0 ? void 0 : pluginState[tableId]) || {},
     index = _ref.index,
     direction = _ref.direction,
@@ -59,7 +76,7 @@ export var toggleSort = function toggleSort(view, event, pluginState) {
   if (direction !== SortOrder.NO_ORDER && oldOrder !== undefined) {
     unsort(oldOrder, tableElement);
   }
-  var sortIndex = parseInt(datasetortIndex);
+  var sortIndex = parseInt(dataSortIndex);
   if (sortIndex === index) {
     switch (direction) {
       case SortOrder.NO_ORDER:
@@ -75,7 +92,7 @@ export var toggleSort = function toggleSort(view, event, pluginState) {
   } else {
     direction = SortOrder.ASC; // default direction when a new index is clicked
   }
-  var order = getSortOrderFromTable(tableElement, sortIndex, direction);
+  var order = getSortOrderFromTable(tableNode, sortIndex, direction);
   if (direction === SortOrder.NO_ORDER) {
     tr.setMeta('tableSortMeta', _defineProperty({}, tableId, {}));
   } else {

package/dist/esm/toolbar.js

@@ -313,12 +313,9 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
 
       // We don't want to show floating toolbar while resizing the table
       var isWidthResizing = tableWidthState === null || tableWidthState === void 0 ? void 0 : tableWidthState.resizing;
-      var isTableScalingEnabled = pluginState.isTableScalingEnabled,
-        widthToWidest = pluginState.widthToWidest;
+      var widthToWidest = pluginState.widthToWidest;
       var currentTableNodeLocalId = (_tableObject$node$att = tableObject === null || tableObject === void 0 || (_tableObject$node = tableObject.node) === null || _tableObject$node === void 0 || (_tableObject$node = _tableObject$node.attrs) === null || _tableObject$node === void 0 ? void 0 : _tableObject$node.localId) !== null && _tableObject$node$att !== void 0 ? _tableObject$node$att : '';
-      if (isTableScalingEnabled &&
-      // TODO ED-21670: check if need options.isTableScalingEnabled
-      isWidthResizing && widthToWidest && currentTableNodeLocalId && widthToWidest[currentTableNodeLocalId]) {
+      if (options !== null && options !== void 0 && options.isTableScalingEnabled && isWidthResizing && widthToWidest && currentTableNodeLocalId && widthToWidest[currentTableNodeLocalId]) {
         var _getEditorFeatureFlag = getEditorFeatureFlags(),
           stickyScrollbar = _getEditorFeatureFlag.stickyScrollbar;
         var nodeType = state.schema.nodes.table;
@@ -364,14 +361,10 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
       if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
         var _nodeType = state.schema.nodes.table;
         var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI);
-        var _getPluginState2 = getPluginState(state),
-          _getPluginState2$isTa = _getPluginState2.isTableScalingEnabled,
-          _isTableScalingEnabled = _getPluginState2$isTa === void 0 ? false : _getPluginState2$isTa; // TODO ED-21670: check if we need options.isTableScalingEnabled and not an acutual state of displayNode attr on the table
-
         var cellItems;
-        cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, getEditorView(), intl, getEditorContainerWidth, editorAnalyticsAPI, _isTableScalingEnabled);
+        cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, getEditorView(), intl, getEditorContainerWidth, editorAnalyticsAPI, options === null || options === void 0 ? void 0 : options.isTableScalingEnabled);
         var columnSettingsItems;
-        columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, getEditorView(), intl, getEditorContainerWidth, editorAnalyticsAPI, options, _isTableScalingEnabled) : [];
+        columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, getEditorView(), intl, getEditorContainerWidth, editorAnalyticsAPI, options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) : [];
         var colorPicker = getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView);
 
         // Check if we need to show confirm dialog for delete button
@@ -498,20 +491,19 @@ export var getDistributeConfig = function getDistributeConfig(getEditorContainer
 
 // this create the button group for distribute column and also fixed column width
 // fixed column button should be in this function call in the future
-var getColumnSettingItems = function getColumnSettingItems(editorState, editorView, _ref4, getEditorContainerWidth, editorAnalyticsAPI, options) {
+var getColumnSettingItems = function getColumnSettingItems(editorState, editorView, _ref4, getEditorContainerWidth, editorAnalyticsAPI) {
   var _newResizeStateWithAn2, _pluginState$pluginCo3;
   var formatMessage = _ref4.formatMessage;
-  var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+  var isTableScalingEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var pluginState = getPluginState(editorState);
   var selectionOrTableRect = getClosestSelectionOrTableRect(editorState);
   if (!selectionOrTableRect || !editorView) {
     return [];
   }
-  var newResizeStateWithAnalytics = getNewResizeStateFromSelectedColumns(selectionOrTableRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled // TODO ED-21670: Here should be actual state of tableNode's displayMode attr
-  );
+  var newResizeStateWithAnalytics = getNewResizeStateFromSelectedColumns(selectionOrTableRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled);
   var wouldChange = (_newResizeStateWithAn2 = newResizeStateWithAnalytics === null || newResizeStateWithAnalytics === void 0 ? void 0 : newResizeStateWithAnalytics.changed) !== null && _newResizeStateWithAn2 !== void 0 ? _newResizeStateWithAn2 : false;
   var items = [];
-  var isTableScalingLockBtnEnabled = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) && getBooleanFF('platform.editor.table.preserve-widths-with-lock-button');
+  var isTableScalingLockBtnEnabled = isTableScalingEnabled && getBooleanFF('platform.editor.table.preserve-widths-with-lock-button');
   if (isTableScalingLockBtnEnabled) {
     var _pluginState$tableNod;
     var areColumnWidthsLocked = (pluginState === null || pluginState === void 0 || (_pluginState$tableNod = pluginState.tableNode) === null || _pluginState$tableNod === void 0 ? void 0 : _pluginState$tableNod.attrs.displayMode) === 'fixed';
@@ -538,8 +530,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
       title: formatMessage(messages.distributeColumns),
       icon: DistributeColumnIcon,
       onClick: function onClick(state, dispatch, view) {
-        return getDistributeConfig(getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled // TODO ED-21670: Maybe here too we an actual state of tableNode's displayMode attr
-        )(state, dispatch, view);
+        return getDistributeConfig(getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled)(state, dispatch, view);
       },
       disabled: !wouldChange
     });
@@ -554,9 +545,9 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
 var getColorPicker = function getColorPicker(state, menu, _ref5, editorAnalyticsAPI, getEditorView) {
   var _node$attrs;
   var formatMessage = _ref5.formatMessage;
-  var _getPluginState3 = getPluginState(state),
-    targetCellPosition = _getPluginState3.targetCellPosition,
-    pluginConfig = _getPluginState3.pluginConfig;
+  var _getPluginState2 = getPluginState(state),
+    targetCellPosition = _getPluginState2.targetCellPosition,
+    pluginConfig = _getPluginState2.pluginConfig;
   if (!pluginConfig.allowBackgroundColor) {
     return [];
   }

package/dist/esm/transforms/column-width.js

@@ -113,6 +113,9 @@ export var rescaleColumns = function rescaleColumns() {
       };
       var tableDepth = view.state.doc.resolve(table.pos).depth;
       var shouldScale = isTableScalingEnabled && tableDepth === 0;
+      if (shouldScale && getBooleanFF('platform.editor.table.preserve-widths-with-lock-button')) {
+        shouldScale = newTable.attrs.displayMode !== 'fixed';
+      }
       if (shouldScale) {
         previousTableInfo = {
           width: getTableElementWidth(table.node),

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

@@ -2,7 +2,6 @@ import React from 'react';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorFloatingDialogZIndex, akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { getPluginState } from '../../pm-plugins/plugin-factory';
 import { dragMenuDropdownWidth, tablePopupMenuFitHeight } from '../consts';
 import DragMenu from './DragMenu';
 var FloatingDragMenu = function FloatingDragMenu(_ref) {
@@ -18,7 +17,8 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     getEditorContainerWidth = _ref.getEditorContainerWidth,
     editorAnalyticsAPI = _ref.editorAnalyticsAPI,
     stickyHeaders = _ref.stickyHeaders,
-    pluginConfig = _ref.pluginConfig;
+    pluginConfig = _ref.pluginConfig,
+    isTableScalingEnabled = _ref.isTableScalingEnabled;
   if (!isOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
     return null;
   }
@@ -28,9 +28,6 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
   if (!targetHandleRef || !(editorView.state.selection instanceof CellSelection)) {
     return null;
   }
-  var _getPluginState = getPluginState(editorView.state),
-    _getPluginState$isTab = _getPluginState.isTableScalingEnabled,
-    isTableScalingEnabled = _getPluginState$isTab === void 0 ? false : _getPluginState$isTab;
   return /*#__PURE__*/React.createElement(Popup, {
     alignX: direction === 'row' ? 'right' : undefined,
     alignY: direction === 'row' ? 'start' : undefined,