@atlaskit/editor-plugin-table 7.16.18 → 7.16.19

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

@@ -88,8 +88,11 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
         });
       }
       if (tr) {
+        var _getEditorFeatureFlag = getEditorFeatureFlags(),
+          _getEditorFeatureFlag2 = _getEditorFeatureFlag.tableWithFixedColumnWidthsOption,
+          tableWithFixedColumnWidthsOption = _getEditorFeatureFlag2 === void 0 ? false : _getEditorFeatureFlag2;
         // "fixTables" removes empty rows as we don't allow that in schema
-        var updatedTr = (0, _eventHandlers.handleCut)(tr, oldState, newState, editorAnalyticsAPI, editorViewRef || undefined, isTableScalingEnabled, shouldUseIncreasedScalingPercent);
+        var updatedTr = (0, _eventHandlers.handleCut)(tr, oldState, newState, editorAnalyticsAPI, editorViewRef || undefined, isTableScalingEnabled, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent);
         return (0, _transforms2.fixTables)(updatedTr) || updatedTr;
       }
       if (transactions.find(function (tr) {

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

@@ -53,8 +53,11 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
     getEditorContainerWidth: getEditorContainerWidth
   });
   var shouldScale = tableDepth === 0 && isTableScalingEnabled;
-  var isTableScalingEnabledWithLockButton = isTableScalingEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button');
-  if (isTableScalingEnabledWithLockButton) {
+  var _getEditorFeatureFlag = getEditorFeatureFlags(),
+    _getEditorFeatureFlag2 = _getEditorFeatureFlag.tableWithFixedColumnWidthsOption,
+    tableWithFixedColumnWidthsOption = _getEditorFeatureFlag2 === void 0 ? false : _getEditorFeatureFlag2;
+  var isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && tableWithFixedColumnWidthsOption;
+  if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
     shouldScale = shouldScale && originalTable.attrs.displayMode !== 'fixed';
   }
   var resizeState = (0, _utils3.getResizeState)({
@@ -65,7 +68,7 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
     start: start,
     domAtPos: domAtPos,
     isTableScalingEnabled: shouldScale,
-    shouldUseIncreasedScalingPercent: isTableScalingEnabledWithLockButton && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent')
+    shouldUseIncreasedScalingPercent: isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent')
   });
   if ((0, _commands.evenColumns)({
     resizeState: resizeState,
@@ -140,8 +143,7 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
         // 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;
-        var _isTableScalingEnabledWithLockButton = isTableScalingEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button');
-        if (_isTableScalingEnabledWithLockButton) {
+        if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
           _shouldScale = _shouldScale && originalTable.attrs.displayMode !== 'fixed';
         }
         var resizedDelta = clientX - startX;
@@ -150,7 +152,7 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
           tr = (0, _transforms.updateColumnWidths)(newResizeState, table, start)(tr);
           tr.setNodeAttribute(start - 1, 'width', newResizeState.tableWidth);
         } else {
-          var _newResizeState = (0, _utils3.resizeColumn)(resizeState, colIndex, clientX - startX, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, _shouldScale, _isTableScalingEnabledWithLockButton && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent'));
+          var _newResizeState = (0, _utils3.resizeColumn)(resizeState, colIndex, clientX - startX, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, _shouldScale, isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent'));
           tr = (0, _transforms.updateColumnWidths)(_newResizeState, table, start)(tr);
         }
         if (colIndex === map.width - 1) {
@@ -218,9 +220,8 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
     var map = _tableMap.TableMap.get(table);
     var colIndex = map.colCount($cell.pos - $cell.start(-1)) + $cell.nodeAfter.attrs.colspan - 1;
     var shouldScale = tableDepth === 0 && isTableScalingEnabled;
-    var isTableScalingEnabledWithLockButton = isTableScalingEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button');
-    var shouldUseIncreasedScalingPercent = isTableScalingEnabledWithLockButton && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
-    if (isTableScalingEnabledWithLockButton) {
+    var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
+    if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
       shouldScale = shouldScale && originalTable.attrs.displayMode !== 'fixed';
     }
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.colum-resizing-improvements')) {

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

@@ -305,6 +305,7 @@ var normaliseTableLayout = exports.normaliseTableLayout = function normaliseTabl
 };
 var getNewResizeStateFromSelectedColumns = exports.getNewResizeStateFromSelectedColumns = function getNewResizeStateFromSelectedColumns(rect, state, domAtPos, getEditorContainerWidth) {
   var isTableScalingEnabled = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   // Fail early so that we don't do complex calculations for no reason
   var numColumnsSelected = rect.right - rect.left;
   if (numColumnsSelected <= 1) {
@@ -338,8 +339,8 @@ var getNewResizeStateFromSelectedColumns = exports.getNewResizeStateFromSelected
   });
   var resizeState;
   var isTableScalingEnabledOnCurrentTable = isTableScalingEnabled;
-  var isTableScalingEnabledWithLockButton = isTableScalingEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button');
-  if (isTableScalingEnabledWithLockButton) {
+  var isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled;
+  if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
     isTableScalingEnabledOnCurrentTable = table.node.attrs.displayMode !== 'fixed';
   }
   resizeState = getResizeState({
@@ -350,7 +351,7 @@ var getNewResizeStateFromSelectedColumns = exports.getNewResizeStateFromSelected
     start: table.start,
     domAtPos: domAtPos,
     isTableScalingEnabled: isTableScalingEnabledOnCurrentTable,
-    shouldUseIncreasedScalingPercent: isTableScalingEnabledWithLockButton && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent')
+    shouldUseIncreasedScalingPercent: isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent')
   });
   var newResizeState = evenSelectedColumnsWidths(resizeState, rect);
   var widthsBefore = resizeState.widths;

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

@@ -110,6 +110,7 @@ function scaleTableTo(state, maxSize) {
 }
 var previewScaleTable = exports.previewScaleTable = function previewScaleTable(tableRef, options, domAtPos) {
   var isTableScalingEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var isTableWithFixedColumnWidthsOptionEnabled = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   var node = options.node,
     start = options.start,
     parentWidth = options.parentWidth;
@@ -122,8 +123,8 @@ var previewScaleTable = exports.previewScaleTable = function previewScaleTable(t
     tableRef.style.width = "".concat(width, "px");
   }
   var isTableScalingEnabledOnCurrentTable = isTableScalingEnabled;
-  var isTableScalingEnabledWithLockButton = isTableScalingEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button');
-  if (isTableScalingEnabledWithLockButton) {
+  var isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && isTableWithFixedColumnWidthsOptionEnabled;
+  if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
     isTableScalingEnabledOnCurrentTable = isTableScalingEnabled && node.attrs.displayMode !== 'fixed';
   }
   // If the table hasn't been resize, the colgroup 48px width values will gracefully scale down.
@@ -132,7 +133,7 @@ var previewScaleTable = exports.previewScaleTable = function previewScaleTable(t
     (0, _dom.syncStickyRowToTable)(tableRef);
     return;
   }
-  var shouldUseIncreasedScalingPercent = isTableScalingEnabledWithLockButton && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
+  var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
   var resizeState = parentWidth ? scaleWithParent(tableRef, parentWidth, node, start, domAtPos, false,
   // Here isTableScalingEnabled = false
   shouldUseIncreasedScalingPercent) : scale(tableRef, options, domAtPos, false, shouldUseIncreasedScalingPercent);

package/dist/cjs/toolbar.js

@@ -96,6 +96,7 @@ var getToolbarMenuConfig = exports.getToolbarMenuConfig = function getToolbarMen
       type: optionItem
     }
   }];
+  var tableOptionsDropdownWidth = isTableScalingWithFixedColumnWidthsOptionShown ? 192 : undefined;
   if (state.isDragAndDropEnabled) {
     return {
       id: 'editor.table.tableOptions',
@@ -107,7 +108,7 @@ var getToolbarMenuConfig = exports.getToolbarMenuConfig = function getToolbarMen
         return option.hidden;
       }),
       options: options,
-      dropdownWidth: isTableScalingWithFixedColumnWidthsOptionShown ? 192 : undefined
+      dropdownWidth: tableOptionsDropdownWidth
     };
   } else {
     return {
@@ -119,7 +120,7 @@ var getToolbarMenuConfig = exports.getToolbarMenuConfig = function getToolbarMen
         return option.hidden;
       }),
       options: options,
-      dropdownWidth: isTableScalingWithFixedColumnWidthsOptionShown ? 192 : undefined
+      dropdownWidth: tableOptionsDropdownWidth
     };
   }
 };
@@ -131,7 +132,9 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
   var _pluginState$pluginCo, _pluginState$pluginCo2;
   var formatMessage = _ref2.formatMessage;
   var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  var shouldUseIncreasedScalingPercent = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
+  var isCellBackgroundDuplicated = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
+  var shouldUseIncreasedScalingPercent = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
   var top = initialSelectionRect.top,
     bottom = initialSelectionRect.bottom,
     right = initialSelectionRect.right,
@@ -146,7 +149,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
       var selectionRect = getClosestSelectionRect(state);
       var index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.right;
       if (index) {
-        (0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.FLOATING_TB, index)(state, dispatch, view);
+        (0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.FLOATING_TB, index)(state, dispatch, view);
       }
       return true;
     },
@@ -182,7 +185,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
     onClick: function onClick(state, dispatch, view) {
       var selectionRect = getClosestSelectionRect(state);
       if (selectionRect) {
-        (0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.FLOATING_TB, selectionRect)(state, dispatch, view);
+        (0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.FLOATING_TB, selectionRect)(state, dispatch, view);
       }
       return true;
     },
@@ -225,7 +228,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
   }];
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo = pluginState.pluginConfig) !== null && _pluginState$pluginCo !== void 0 && _pluginState$pluginCo.allowDistributeColumns) {
     var _newResizeStateWithAn;
-    var newResizeStateWithAnalytics = editorView ? (0, _resizeState.getNewResizeStateFromSelectedColumns)(initialSelectionRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled) : undefined;
+    var newResizeStateWithAnalytics = editorView ? (0, _resizeState.getNewResizeStateFromSelectedColumns)(initialSelectionRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled) : undefined;
     var wouldChange = (_newResizeStateWithAn = newResizeStateWithAnalytics === null || newResizeStateWithAnalytics === void 0 ? void 0 : newResizeStateWithAnalytics.changed) !== null && _newResizeStateWithAn !== void 0 ? _newResizeStateWithAn : false;
     var distributeColumnWidths = function distributeColumnWidths(state, dispatch) {
       if (newResizeStateWithAnalytics) {
@@ -333,7 +336,7 @@ var getClosestSelectionOrTableRect = exports.getClosestSelectionOrTableRect = fu
   return (0, _utils3.isSelectionType)(selection, 'cell') ? (0, _utils3.getSelectionRect)(selection) : tableRect;
 };
 var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getEditorContainerWidth, editorAnalyticsAPI, getEditorFeatureFlags, getEditorView, options) {
-  var isTableScalingWithFixedColumnWidthsOptionEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var shouldUseIncreasedScalingPercent = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   return function (config) {
     return function (state, intl) {
@@ -341,13 +344,14 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
       var pluginState = (0, _pluginFactory.getPluginState)(state);
       var resizeState = _tableResizing.pluginKey.getState(state);
       var tableWidthState = _tableWidth.pluginKey.getState(state);
+      var isTableScalingEnabled = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) || false;
 
       // We don't want to show floating toolbar while resizing the table
       var isWidthResizing = tableWidthState === null || tableWidthState === void 0 ? void 0 : tableWidthState.resizing;
       if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
         var nodeType = state.schema.nodes.table;
         var isNested = pluginState.tablePos && (0, _utils4.isTableNested)(state, pluginState.tablePos);
-        var isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingWithFixedColumnWidthsOptionEnabled && !isNested;
+        var isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
         var areTableColumWidthsFixed = tableObject.node.attrs.displayMode === 'fixed';
         var editorView = getEditorView();
         var getDomRef = function getDomRef(editorView) {
@@ -363,9 +367,10 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
           return element;
         };
         var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
-        var alignmentMenu = options !== null && options !== void 0 && options.isTableAlignmentEnabled && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, getDomRef, editorView) : [];
-        var cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, editorView, intl, getEditorContainerWidth, editorAnalyticsAPI, options === null || options === void 0 ? void 0 : options.isTableScalingEnabled, shouldUseIncreasedScalingPercent);
-        var columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, editorView, intl, getEditorContainerWidth, editorAnalyticsAPI, options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) : [];
+        var alignmentMenu = options !== null && options !== void 0 && options.isTableAlignmentEnabled && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, getDomRef, editorView, shouldUseIncreasedScalingPercent) : [];
+        var isCellBackgroundDuplicated = getEditorFeatureFlags().tableDuplicateCellColouring || false;
+        var cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, editorView, intl, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent);
+        var columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, editorView, intl, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled) : [];
         var colorPicker = getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView);
 
         // Check if we need to show confirm dialog for delete button
@@ -454,24 +459,27 @@ var separator = function separator(hidden) {
 var getCellItems = function getCellItems(state, view, _ref3, getEditorContainerWidth, editorAnalyticsAPI) {
   var formatMessage = _ref3.formatMessage;
   var isTableScalingEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
-  var shouldUseIncreasedScalingPercent = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+  var isCellBackgroundDuplicated = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
+  var shouldUseIncreasedScalingPercent = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
   var initialSelectionRect = getClosestSelectionRect(state);
   if (initialSelectionRect) {
     var cellOptions = getToolbarCellOptionsConfig(state, view, initialSelectionRect, {
       formatMessage: formatMessage
-    }, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, shouldUseIncreasedScalingPercent);
+    }, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent);
     return [cellOptions, separator(cellOptions.hidden)];
   }
   return [];
 };
 var getDistributeConfig = exports.getDistributeConfig = function getDistributeConfig(getEditorContainerWidth, editorAnalyticsAPI) {
   var isTableScalingEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   return function (state, dispatch, editorView) {
     var selectionOrTableRect = getClosestSelectionOrTableRect(state);
     if (!editorView || !selectionOrTableRect) {
       return false;
     }
-    var newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionOrTableRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled);
+    var newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionOrTableRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled);
     if (newResizeStateWithAnalytics) {
       (0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.FLOATING_TB, newResizeStateWithAnalytics)(state, dispatch);
       return true;
@@ -486,12 +494,13 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
   var _newResizeStateWithAn2, _pluginState$pluginCo3;
   var formatMessage = _ref4.formatMessage;
   var isTableScalingEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var pluginState = (0, _pluginFactory.getPluginState)(editorState);
   var selectionOrTableRect = getClosestSelectionOrTableRect(editorState);
   if (!selectionOrTableRect || !editorView) {
     return [];
   }
-  var newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionOrTableRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled);
+  var newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionOrTableRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled);
   var wouldChange = (_newResizeStateWithAn2 = newResizeStateWithAnalytics === null || newResizeStateWithAnalytics === void 0 ? void 0 : newResizeStateWithAnalytics.changed) !== null && _newResizeStateWithAn2 !== void 0 ? _newResizeStateWithAn2 : false;
   var items = [];
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo3 = pluginState.pluginConfig) !== null && _pluginState$pluginCo3 !== void 0 && _pluginState$pluginCo3.allowDistributeColumns && pluginState.isDragAndDropEnabled) {
@@ -501,7 +510,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
       title: formatMessage(_messages.tableMessages.distributeColumns),
       icon: _layoutThreeEqual.default,
       onClick: function onClick(state, dispatch, view) {
-        return getDistributeConfig(getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled)(state, dispatch, view);
+        return getDistributeConfig(getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled)(state, dispatch, view);
       },
       disabled: !wouldChange
     });
@@ -574,7 +583,7 @@ var highlightColumnsHandler = function highlightColumnsHandler(state, dispatch)
   }
   return false;
 };
-var getAlignmentOptionsConfig = exports.getAlignmentOptionsConfig = function getAlignmentOptionsConfig(editorState, _ref6, editorAnalyticsAPI, getEditorContainerWidth, getDomRef, editorView) {
+var getAlignmentOptionsConfig = exports.getAlignmentOptionsConfig = function getAlignmentOptionsConfig(editorState, _ref6, editorAnalyticsAPI, getEditorContainerWidth, getDomRef, editorView, shouldUseIncreasedScalingPercent) {
   var formatMessage = _ref6.formatMessage;
   var tableObject = (0, _utils3.findTable)(editorState.selection);
   if (!tableObject) {
@@ -607,7 +616,7 @@ var getAlignmentOptionsConfig = exports.getAlignmentOptionsConfig = function get
       title: formatMessage(layoutToMessages[value]),
       selected: (0, _alignment.normaliseAlignment)(currentLayout) === value,
       onClick: (0, _commandsWithAnalytics.setTableAlignmentWithAnalytics)(editorAnalyticsAPI)(value, currentLayout, _analytics.INPUT_METHOD.FLOATING_TB, _analytics.CHANGE_ALIGNMENT_REASON.TOOLBAR_OPTION_CHANGED)
-    }, isLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, getDomRef, editorView) && {
+    }, isLayoutOptionDisabled(tableObject.node, getEditorContainerWidth, getDomRef, editorView, shouldUseIncreasedScalingPercent) && {
       disabled: value !== 'center'
     });
   });
@@ -637,7 +646,7 @@ var getSelectedAlignmentIcon = exports.getSelectedAlignmentIcon = function getSe
     return icon.value === (0, _alignment.normaliseAlignment)(selectedAlignment);
   });
 };
-var isLayoutOptionDisabled = exports.isLayoutOptionDisabled = function isLayoutOptionDisabled(selectedNode, getEditorContainerWidth, getDomRef, editorView) {
+var isLayoutOptionDisabled = exports.isLayoutOptionDisabled = function isLayoutOptionDisabled(selectedNode, getEditorContainerWidth, getDomRef, editorView, shouldUseIncreasedScalingPercent) {
   var _getEditorContainerWi = getEditorContainerWidth(),
     lineLength = _getEditorContainerWi.lineLength;
   var tableContainerWidth = (0, _nodeWidth.getTableContainerWidth)(selectedNode);
@@ -646,7 +655,7 @@ var isLayoutOptionDisabled = exports.isLayoutOptionDisabled = function isLayoutO
   if (editorView) {
     var tableWrapper = getDomRef(editorView);
     var tableWrapperWidth = (tableWrapper === null || tableWrapper === void 0 ? void 0 : tableWrapper.clientWidth) || tableContainerWidth;
-    var scalePercent = (0, _misc.getStaticTableScalingPercent)(selectedNode, tableWrapperWidth);
+    var scalePercent = (0, _misc.getStaticTableScalingPercent)(selectedNode, tableWrapperWidth, shouldUseIncreasedScalingPercent);
     tableContainerWidth = tableContainerWidth * scalePercent;
   }
   if (selectedNode && lineLength && tableContainerWidth > lineLength) {

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

@@ -98,7 +98,8 @@ var updateColumnWidths = exports.updateColumnWidths = function updateColumnWidth
  */
 var rescaleColumns = exports.rescaleColumns = function rescaleColumns() {
   var isTableScalingEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  var shouldUseIncreasedScalingPercent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var shouldUseIncreasedScalingPercent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return function (table, view) {
     return function (tr) {
       if (!view) {
@@ -120,7 +121,7 @@ var rescaleColumns = exports.rescaleColumns = function rescaleColumns() {
       };
       var tableDepth = view.state.doc.resolve(table.pos).depth;
       var shouldScale = isTableScalingEnabled && tableDepth === 0;
-      if (shouldScale && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button')) {
+      if (shouldScale && isTableFixedColumnWidthsOptionEnabled) {
         shouldScale = newTable.attrs.displayMode !== 'fixed';
       }
       if (shouldScale) {
@@ -187,7 +188,6 @@ var rescaleColumns = exports.rescaleColumns = function rescaleColumns() {
         isTableScalingEnabled: shouldScale,
         shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent
       });
-
       // Two scenarios that require scaling:
       //   1. If the new table width will result in the table going into overflow
       //      we resize the cells to avoid it (e.g. adding a column)

package/dist/cjs/transforms/delete-columns.js

@@ -213,7 +213,8 @@ function fixRowSpans(table) {
 }
 var deleteColumns = exports.deleteColumns = function deleteColumns(rect, allowCustomStep, view) {
   var isTableScalingEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var shouldUseIncreasedScalingPercent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var shouldUseIncreasedScalingPercent = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   return function (tr) {
     var updatedTr = tr;
     updatedTr.setMeta(_tableAnalytics.META_KEYS.OVERFLOW_TRIGGER, {
@@ -226,7 +227,7 @@ var deleteColumns = exports.deleteColumns = function deleteColumns(rect, allowCu
     }
     var table = (0, _utils.findTable)(updatedTr.selection);
     if (table) {
-      updatedTr = (0, _columnWidth.rescaleColumns)(isTableScalingEnabled, shouldUseIncreasedScalingPercent)(table, view)(updatedTr);
+      updatedTr = (0, _columnWidth.rescaleColumns)(isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(table, view)(updatedTr);
     }
     return updatedTr;
   };

package/dist/cjs/ui/FloatingContextualMenu/ContextualMenu.js

@@ -279,7 +279,8 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         selectionRect = _this$props8.selectionRect,
         formatMessage = _this$props8.intl.formatMessage,
         editorView = _this$props8.editorView,
-        getEditorContainerWidth = _this$props8.getEditorContainerWidth;
+        getEditorContainerWidth = _this$props8.getEditorContainerWidth,
+        getEditorFeatureFlags = _this$props8.getEditorFeatureFlags;
       var _getPluginState8 = (0, _pluginFactory.getPluginState)(editorView.state),
         isDragAndDropEnabled = _getPluginState8.isDragAndDropEnabled,
         allowDistributeColumns = _getPluginState8.pluginConfig.allowDistributeColumns;
@@ -288,7 +289,10 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         var _getPluginState9 = (0, _pluginFactory.getPluginState)(editorView.state),
           _getPluginState9$isTa = _getPluginState9.isTableScalingEnabled,
           isTableScalingEnabled = _getPluginState9$isTa === void 0 ? false : _getPluginState9$isTa;
-        var newResizeState = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionRect, editorView.state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled);
+        var _ref = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
+          _ref$tableWithFixedCo = _ref.tableWithFixedColumnWidthsOption,
+          tableWithFixedColumnWidthsOption = _ref$tableWithFixedCo === void 0 ? false : _ref$tableWithFixedCo;
+        var newResizeState = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionRect, editorView.state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, tableWithFixedColumnWidthsOption);
         var wouldChange = (_newResizeState$chang = newResizeState === null || newResizeState === void 0 ? void 0 : newResizeState.changed) !== null && _newResizeState$chang !== void 0 ? _newResizeState$chang : false;
         return {
           content: formatMessage(_messages.tableMessages.distributeColumns),
@@ -370,8 +374,8 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
       items[1].items.push(deleteRowItem);
       return items;
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onMenuItemActivated", function (_ref) {
-      var item = _ref.item;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onMenuItemActivated", function (_ref2) {
+      var item = _ref2.item;
       var _this$props10 = _this.props,
         editorView = _this$props10.editorView,
         selectionRect = _this$props10.selectionRect,
@@ -385,10 +389,12 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         targetCellPosition = _getPluginState11.targetCellPosition,
         _getPluginState11$isT = _getPluginState11.isTableScalingEnabled,
         isTableScalingEnabled = _getPluginState11$isT === void 0 ? false : _getPluginState11$isT;
-      var _ref2 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
-        _ref2$tableDuplicateC = _ref2.tableDuplicateCellColouring,
-        tableDuplicateCellColouring = _ref2$tableDuplicateC === void 0 ? false : _ref2$tableDuplicateC;
-      var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button') && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
+      var _ref3 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
+        _ref3$tableDuplicateC = _ref3.tableDuplicateCellColouring,
+        tableDuplicateCellColouring = _ref3$tableDuplicateC === void 0 ? false : _ref3$tableDuplicateC,
+        _ref3$tableWithFixedC = _ref3.tableWithFixedColumnWidthsOption,
+        tableWithFixedColumnWidthsOption = _ref3$tableWithFixedC === void 0 ? false : _ref3$tableWithFixedC;
+      var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
       switch (item.value.name) {
         case 'sort_column_desc':
           (0, _commandsWithAnalytics.sortColumnWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect.left, _customSteps.TableSortOrder.DESC)(state, dispatch);
@@ -407,7 +413,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
           _this.toggleOpen();
           break;
         case 'distribute_columns':
-          var newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled);
+          var newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, tableWithFixedColumnWidthsOption);
           if (newResizeStateWithAnalytics) {
             (0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.CONTEXT_MENU, newResizeStateWithAnalytics)(state, dispatch);
             _this.toggleOpen();
@@ -418,7 +424,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
           _this.toggleOpen();
           break;
         case 'insert_column':
-          (0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(state, dispatch, editorView);
+          (0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(state, dispatch, editorView);
           _this.toggleOpen();
           break;
         case 'insert_row':
@@ -429,7 +435,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
           _this.toggleOpen();
           break;
         case 'delete_column':
-          (0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect)(state, dispatch, editorView);
+          (0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect)(state, dispatch, editorView);
           _this.toggleOpen();
           break;
         case 'delete_row':
@@ -462,8 +468,8 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         isSubmenuOpen: false
       });
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleItemMouseEnter", function (_ref3) {
-      var item = _ref3.item;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleItemMouseEnter", function (_ref4) {
+      var item = _ref4.item;
       var _this$props12 = _this.props,
         _this$props12$editorV = _this$props12.editorView,
         state = _this$props12$editorV.state,
@@ -486,8 +492,8 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         (0, _commands.hoverMergedCells)()(state, dispatch);
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleItemMouseLeave", function (_ref4) {
-      var item = _ref4.item;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleItemMouseLeave", function (_ref5) {
+      var item = _ref5.item;
       var _this$props$editorVie2 = _this.props.editorView,
         state = _this$props$editorVie2.state,
         dispatch = _this$props$editorVie2.dispatch;

package/dist/cjs/ui/FloatingDragMenu/DragMenu.js

@@ -193,7 +193,8 @@ var DragMenu = exports.DragMenu = /*#__PURE__*/_react.default.memo(function (_re
     boundariesElement = _ref.boundariesElement,
     isTableScalingEnabled = _ref.isTableScalingEnabled,
     tableDuplicateCellColouring = _ref.tableDuplicateCellColouring,
-    shouldUseIncreasedScalingPercent = _ref.shouldUseIncreasedScalingPercent;
+    shouldUseIncreasedScalingPercent = _ref.shouldUseIncreasedScalingPercent,
+    isTableFixedColumnWidthsOptionEnabled = _ref.isTableFixedColumnWidthsOptionEnabled;
   var state = editorView.state,
     dispatch = editorView.dispatch;
   var selection = state.selection;
@@ -217,7 +218,7 @@ var DragMenu = exports.DragMenu = /*#__PURE__*/_react.default.memo(function (_re
     hasMergedCellsInTable = (0, _utils3.getMergedCellsPositions)(state.tr).length > 0;
   }
   var allowBackgroundColor = (_pluginConfig$allowBa = pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.allowBackgroundColor) !== null && _pluginConfig$allowBa !== void 0 ? _pluginConfig$allowBa : false;
-  var dragMenuConfig = (0, _dragMenu.getDragMenuConfig)(direction, getEditorContainerWidth, !shouldMoveDisabled, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, shouldUseIncreasedScalingPercent);
+  var dragMenuConfig = (0, _dragMenu.getDragMenuConfig)(direction, getEditorContainerWidth, !shouldMoveDisabled, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent);
   var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, selectionRect),
     menuItems = _convertToDropdownIte.menuItems,
     menuCallback = _convertToDropdownIte.menuCallback;

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

@@ -39,8 +39,10 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
   }
   var _ref2 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
     _ref2$tableDuplicateC = _ref2.tableDuplicateCellColouring,
-    tableDuplicateCellColouring = _ref2$tableDuplicateC === void 0 ? false : _ref2$tableDuplicateC;
-  var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button') && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
+    tableDuplicateCellColouring = _ref2$tableDuplicateC === void 0 ? false : _ref2$tableDuplicateC,
+    _ref2$tableWithFixedC = _ref2.tableWithFixedColumnWidthsOption,
+    tableWithFixedColumnWidthsOption = _ref2$tableWithFixedC === void 0 ? false : _ref2$tableWithFixedC;
+  var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
   return /*#__PURE__*/_react.default.createElement(_ui.Popup, {
     alignX: direction === 'row' ? 'right' : undefined,
     alignY: direction === 'row' ? 'start' : undefined,
@@ -76,7 +78,8 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     scrollableElement: scrollableElement,
     isTableScalingEnabled: isTableScalingEnabled,
     tableDuplicateCellColouring: tableDuplicateCellColouring,
-    shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent
+    shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
+    isTableFixedColumnWidthsOptionEnabled: tableWithFixedColumnWidthsOption
   }));
 };
 FloatingDragMenu.displayName = 'FloatingDragMenu';

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

@@ -26,7 +26,6 @@ var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commandsWithAnalytics = require("../../commands-with-analytics");
-var _pluginFactory = require("../../pm-plugins/plugin-factory");
 var _types = require("../../types");
 var _utils4 = require("../../utils");
 var _getPopupOptions = _interopRequireDefault(require("./getPopupOptions"));
@@ -200,19 +199,19 @@ var FloatingInsertButton = exports.FloatingInsertButton = /*#__PURE__*/function
         editorView = _this$props4.editorView,
         insertColumnButtonIndex = _this$props4.insertColumnButtonIndex,
         editorAnalyticsAPI = _this$props4.editorAnalyticsAPI,
-        getEditorFeatureFlags = _this$props4.getEditorFeatureFlags;
+        getEditorFeatureFlags = _this$props4.getEditorFeatureFlags,
+        isTableScalingEnabled = _this$props4.isTableScalingEnabled;
       if (typeof insertColumnButtonIndex !== 'undefined') {
         event.preventDefault();
-        var _getPluginState = (0, _pluginFactory.getPluginState)(editorView.state),
-          _getPluginState$isTab = _getPluginState.isTableScalingEnabled,
-          isTableScalingEnabled = _getPluginState$isTab === void 0 ? false : _getPluginState$isTab;
-        var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.preserve-widths-with-lock-button') && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
         var _ref = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
           _ref$tableDuplicateCe = _ref.tableDuplicateCellColouring,
-          tableDuplicateCellColouring = _ref$tableDuplicateCe === void 0 ? false : _ref$tableDuplicateCe;
+          tableDuplicateCellColouring = _ref$tableDuplicateCe === void 0 ? false : _ref$tableDuplicateCe,
+          _ref$tableWithFixedCo = _ref.tableWithFixedColumnWidthsOption,
+          tableWithFixedColumnWidthsOption = _ref$tableWithFixedCo === void 0 ? false : _ref$tableWithFixedCo;
+        var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
         var state = editorView.state,
           dispatch = editorView.dispatch;
-        (0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
+        (0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
       }
     }
   }]);

package/dist/cjs/utils/drag-menu.js

@@ -79,7 +79,8 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
   var _tableMap$height, _tableMap$height2, _tableMap$width, _tableMap$width2;
   var isTableScalingEnabled = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
   var tableDuplicateCellColouring = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : false;
-  var shouldUseIncreasedScalingPercent = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : false;
+  var shouldUseIncreasedScalingPercent = arguments.length > 14 && arguments[14] !== undefined ? arguments[14] : false;
   var addOptions = direction === 'row' ? [{
     label: 'above',
     offset: 0,
@@ -164,7 +165,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
             moveCursorToInsertedRow: true
           })(state, dispatch);
         } else {
-          (0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, (index !== null && index !== void 0 ? index : 0) + offset)(state, dispatch, editorView);
+          (0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, (index !== null && index !== void 0 ? index : 0) + offset)(state, dispatch, editorView);
         }
         return true;
       },
@@ -177,7 +178,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     onClick: function onClick(state, dispatch) {
       var selectionRect = (0, _toolbar.getClosestSelectionRect)(state);
       if (selectionRect) {
-        var newResizeState = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled);
+        var newResizeState = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled);
         if (newResizeState) {
           (0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, newResizeState)(state, dispatch);
           return true;
@@ -203,7 +204,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
       if (direction === 'row') {
         (0, _commandsWithAnalytics.deleteRowsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect !== null && selectionRect !== void 0 ? selectionRect : defaultSelectionRect, !!isHeaderRowRequired)(state, dispatch);
       } else {
-        (0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect !== null && selectionRect !== void 0 ? selectionRect : defaultSelectionRect)(state, dispatch, editorView);
+        (0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect !== null && selectionRect !== void 0 ? selectionRect : defaultSelectionRect)(state, dispatch, editorView);
       }
       return true;
     },

package/dist/es2019/commands/column-resize.js

@@ -154,6 +154,7 @@ export const changeColumnWidthByStep = ({
   stepSize,
   getEditorContainerWidth,
   isTableScalingEnabled,
+  isTableFixedColumnWidthsOptionEnabled,
   ariaNotify,
   getIntl
 }) => (state, dispatch, view) => {
@@ -206,11 +207,11 @@ export const changeColumnWidthByStep = ({
     getEditorContainerWidth
   });
   let isTableScalingEnabledOnCurrentTable = isTableScalingEnabled;
-  const isTableScalingEnabledWithLockButton = isTableScalingEnabled && getBooleanFF('platform.editor.table.preserve-widths-with-lock-button');
-  if (isTableScalingEnabledWithLockButton) {
+  const isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled;
+  if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
     isTableScalingEnabledOnCurrentTable = originalTable.attrs.displayMode !== 'fixed';
   }
-  const shouldUseIncreasedScalingPercent = isTableScalingEnabledWithLockButton && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+  const shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
   const initialResizeState = getResizeState({
     minWidth: tableCellMinWidth,
     maxSize,