@atlaskit/editor-plugin-table 7.5.3 → 7.5.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-table
 
+## 7.5.5
+
+### Patch Changes
+
+- [#79509](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79509) [`111e580bb58a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/111e580bb58a) - update preserve table width changes to only appear on full width pages
+- Updated dependencies
+
+## 7.5.4
+
+### Patch Changes
+
+- [#80391](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/80391) [`bf741c7ef44c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bf741c7ef44c) - Make @atlaskit/editor-plugin-table, @atlaskit/date, @atlaskit/editor-plugin-date React 18 compatible.
+- [#79483](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79483) [`b2a75ed4502b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b2a75ed4502b) - add dynamic widest guideline for table resize
+
 ## 7.5.3
 
 ### Patch Changes

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

@@ -128,7 +128,7 @@ var activateNextResizeArea = exports.activateNextResizeArea = function activateN
   };
 };
 var changeColumnWidthByStep = exports.changeColumnWidthByStep = function changeColumnWidthByStep(stepSize, getEditorContainerWidth) {
-  var tablePreserveWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var isTableScalingEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return function (state, dispatch, view) {
     var customTr = state.tr;
     var fakeDispatch = function fakeDispatch(tr) {
@@ -178,14 +178,14 @@ var changeColumnWidthByStep = exports.changeColumnWidthByStep = function changeC
       tableRef: dom,
       start: tableStartPosition,
       domAtPos: domAtPos,
-      tablePreserveWidth: tablePreserveWidth
+      isTableScalingEnabled: isTableScalingEnabled
     });
     (0, _utils3.updateControls)()(state);
     var selectionRect = (0, _utils.getSelectionRect)(state.selection);
     var selectedColumns = selectionRect ? (0, _utils4.getSelectedColumnIndexes)(selectionRect) : [];
     // only selected (or selected - 1) columns should be distributed
     var resizingSelectedColumns = selectedColumns.indexOf(colIndex) > -1 || selectedColumns.indexOf(colIndex + 1) > -1;
-    var newResizeState = (0, _utils3.resizeColumn)(initialResizeState, colIndex, stepSize, dom, resizingSelectedColumns ? selectedColumns : undefined, tablePreserveWidth);
+    var newResizeState = (0, _utils3.resizeColumn)(initialResizeState, colIndex, stepSize, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, isTableScalingEnabled);
     customTr = (0, _transforms.updateColumnWidths)(newResizeState, originalTable, tableStartPosition)(customTr);
     if (dispatch) {
       dispatch(customTr);

package/dist/cjs/commands/delete.js

@@ -7,9 +7,9 @@ exports.deleteColumnsCommand = void 0;
 var _deleteColumns = require("../transforms/delete-columns");
 var _getAllowAddColumnCustomStep = require("../utils/get-allow-add-column-custom-step");
 var deleteColumnsCommand = exports.deleteColumnsCommand = function deleteColumnsCommand(rect) {
-  var tablePreserveWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var isTableScalingEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return function (state, dispatch, view) {
-    var tr = (0, _deleteColumns.deleteColumns)(rect, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view, tablePreserveWidth)(state.tr);
+    var tr = (0, _deleteColumns.deleteColumns)(rect, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view, isTableScalingEnabled)(state.tr);
     if (dispatch) {
       dispatch(tr);
       return true;

package/dist/cjs/commands/insert.js

@@ -29,8 +29,8 @@ function addColumnAtCustomStep(column) {
     return tr;
   };
 }
-function addColumnAt(getEditorContainerWidth) {
-  var tablePreserveWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+function addColumnAt() {
+  var isTableScalingEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   return function (column) {
     var allowAddColumnCustomStep = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var view = arguments.length > 2 ? arguments[2] : undefined;
@@ -44,7 +44,7 @@ function addColumnAt(getEditorContainerWidth) {
       var table = (0, _utils2.findTable)(updatedTr.selection);
       if (table) {
         // [ED-8288] Update colwidths manually to avoid multiple dispatch in TableComponent
-        updatedTr = (0, _columnWidth.rescaleColumns)(tablePreserveWidth)(table, view)(updatedTr);
+        updatedTr = (0, _columnWidth.rescaleColumns)(isTableScalingEnabled)(table, view)(updatedTr);
       }
       if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.analytics-plugin-moved-event') && view) {
         updatedTr = (0, _commands.updateRowOrColumnMovedTransform)({
@@ -61,8 +61,8 @@ function addColumnAt(getEditorContainerWidth) {
 
 // :: (EditorState, dispatch: ?(tr: Transaction)) → bool
 // Command to add a column before the column with the selection.
-var addColumnBefore = exports.addColumnBefore = function addColumnBefore(getEditorContainerWidth) {
-  var tablePreserveWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+var addColumnBefore = exports.addColumnBefore = function addColumnBefore() {
+  var isTableScalingEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   return function (state, dispatch, view) {
     var table = (0, _utils2.findTable)(state.selection);
     if (!table) {
@@ -70,7 +70,7 @@ var addColumnBefore = exports.addColumnBefore = function addColumnBefore(getEdit
     }
     if (dispatch) {
       var rect = (0, _utils2.selectedRect)(state);
-      dispatch(addColumnAt(getEditorContainerWidth, tablePreserveWidth)(rect.left, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
+      dispatch(addColumnAt(isTableScalingEnabled)(rect.left, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
     }
     return true;
   };
@@ -78,7 +78,7 @@ var addColumnBefore = exports.addColumnBefore = function addColumnBefore(getEdit
 
 // :: (EditorState, dispatch: ?(tr: Transaction)) → bool
 // Command to add a column after the column with the selection.
-var addColumnAfter = exports.addColumnAfter = function addColumnAfter(getEditorContainerWidth) {
+var addColumnAfter = exports.addColumnAfter = function addColumnAfter(isTableScalingEnabled) {
   return function (state, dispatch, view) {
     var table = (0, _utils2.findTable)(state.selection);
     if (!table) {
@@ -86,16 +86,16 @@ var addColumnAfter = exports.addColumnAfter = function addColumnAfter(getEditorC
     }
     if (dispatch) {
       var rect = (0, _utils2.selectedRect)(state);
-      dispatch(addColumnAt(getEditorContainerWidth)(rect.right, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
+      dispatch(addColumnAt(isTableScalingEnabled)(rect.right, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
     }
     return true;
   };
 };
-var insertColumn = exports.insertColumn = function insertColumn(getEditorContainerWidth) {
-  var tablePreserveWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+var insertColumn = exports.insertColumn = function insertColumn() {
+  var isTableScalingEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   return function (column) {
     return function (state, dispatch, view) {
-      var tr = addColumnAt(getEditorContainerWidth, tablePreserveWidth)(column, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr);
+      var tr = addColumnAt(isTableScalingEnabled)(column, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr);
       var table = (0, _utils2.findTable)(tr.selection);
       if (!table) {
         return false;
@@ -144,20 +144,20 @@ var insertRow = exports.insertRow = function insertRow(row, moveCursorToTheNewRo
     return true;
   };
 };
-var createTable = exports.createTable = function createTable(isFullWidthModeEnabled, getEditorFeatureFlags) {
+var createTable = exports.createTable = function createTable(isTableScalingEnabled, isFullWidthModeEnabled) {
   return function (state, dispatch) {
-    var table = (0, _utils3.createTableWithWidth)(isFullWidthModeEnabled, getEditorFeatureFlags)(state.schema);
+    var table = (0, _utils3.createTableWithWidth)(isTableScalingEnabled, isFullWidthModeEnabled)(state.schema);
     if (dispatch) {
       dispatch((0, _utils.safeInsert)(table)(state.tr).scrollIntoView());
     }
     return true;
   };
 };
-var insertTableWithSize = exports.insertTableWithSize = function insertTableWithSize(isFullWidthModeEnabled, getEditorFeatureFlags, editorAnalyticsAPI) {
+var insertTableWithSize = exports.insertTableWithSize = function insertTableWithSize(isFullWidthModeEnabled, isTableScalingEnabled, editorAnalyticsAPI) {
   return function (rowsCount, colsCount, inputMethod) {
     return function (_ref) {
       var tr = _ref.tr;
-      var tableNode = (0, _utils3.createTableWithWidth)(isFullWidthModeEnabled, getEditorFeatureFlags, {
+      var tableNode = (0, _utils3.createTableWithWidth)(isTableScalingEnabled, isFullWidthModeEnabled, {
         rowsCount: rowsCount,
         colsCount: colsCount
       })(tr.doc.type.schema);

package/dist/cjs/commands-with-analytics.js

@@ -191,7 +191,7 @@ var insertRowWithAnalytics = exports.insertRowWithAnalytics = function insertRow
   };
 };
 var changeColumnWidthByStepWithAnalytics = exports.changeColumnWidthByStepWithAnalytics = function changeColumnWidthByStepWithAnalytics(editorAnalyticsAPI) {
-  return function (stepSize, getEditorContainerWidth, tablePreserveWidth, inputMethod) {
+  return function (stepSize, getEditorContainerWidth, isTableScalingEnabled, inputMethod) {
     return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
       var _getSelectedTableInfo2 = (0, _utils2.getSelectedTableInfo)(state.selection),
         table = _getSelectedTableInfo2.table,
@@ -213,11 +213,11 @@ var changeColumnWidthByStepWithAnalytics = exports.changeColumnWidthByStepWithAn
           totalColumnCount: totalColumnCount
         }
       };
-    })(editorAnalyticsAPI)((0, _columnResize.changeColumnWidthByStep)(stepSize, getEditorContainerWidth, tablePreserveWidth));
+    })(editorAnalyticsAPI)((0, _columnResize.changeColumnWidthByStep)(stepSize, getEditorContainerWidth, isTableScalingEnabled));
   };
 };
-var insertColumnWithAnalytics = exports.insertColumnWithAnalytics = function insertColumnWithAnalytics(getEditorContainerWidth, editorAnalyticsAPI) {
-  var tablePreserveWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+var insertColumnWithAnalytics = exports.insertColumnWithAnalytics = function insertColumnWithAnalytics(editorAnalyticsAPI) {
+  var isTableScalingEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return function (inputMethod, position) {
     return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
       var _getSelectedTableInfo3 = (0, _utils2.getSelectedTableInfo)(state.selection),
@@ -235,7 +235,7 @@ var insertColumnWithAnalytics = exports.insertColumnWithAnalytics = function ins
         },
         eventType: _analytics.EVENT_TYPE.TRACK
       };
-    })(editorAnalyticsAPI)((0, _insert.insertColumn)(getEditorContainerWidth, tablePreserveWidth)(position));
+    })(editorAnalyticsAPI)((0, _insert.insertColumn)(isTableScalingEnabled)(position));
   };
 };
 var deleteRowsWithAnalytics = exports.deleteRowsWithAnalytics = function deleteRowsWithAnalytics(editorAnalyticsAPI) {
@@ -267,7 +267,7 @@ var deleteRowsWithAnalytics = exports.deleteRowsWithAnalytics = function deleteR
   };
 };
 var deleteColumnsWithAnalytics = exports.deleteColumnsWithAnalytics = function deleteColumnsWithAnalytics(editorAnalyticsAPI) {
-  var tablePreserveWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var isTableScalingEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return function (inputMethod, rect) {
     return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref6) {
       var selection = _ref6.selection;
@@ -287,7 +287,7 @@ var deleteColumnsWithAnalytics = exports.deleteColumnsWithAnalytics = function d
         },
         eventType: _analytics.EVENT_TYPE.TRACK
       };
-    })(editorAnalyticsAPI)((0, _delete.deleteColumnsCommand)(rect, tablePreserveWidth));
+    })(editorAnalyticsAPI)((0, _delete.deleteColumnsCommand)(rect, isTableScalingEnabled));
   };
 };
 var deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = exports.deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = function deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut(editorAnalyticsAPI) {

package/dist/cjs/event-handlers.js

@@ -337,7 +337,7 @@ function handleTripleClick(view, pos) {
   return false;
 }
 var handleCut = exports.handleCut = function handleCut(oldTr, oldState, newState, editorAnalyticsAPI, editorView) {
-  var tablePreserveWidth = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var isTableScalingEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var oldSelection = oldState.tr.selection;
   var tr = newState.tr;
   if (oldSelection instanceof _cellSelection.CellSelection) {
@@ -380,7 +380,7 @@ var handleCut = exports.handleCut = function handleCut(oldTr, oldState, newState
               isHeaderRowRequired = _getPluginState9.pluginConfig.isHeaderRowRequired;
             tr = (0, _transforms.deleteRows)(rect, isHeaderRowRequired)(tr);
           } else if (tr.selection.isColSelection()) {
-            tr = (0, _transforms.deleteColumns)(rect, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(oldState), editorView, tablePreserveWidth)(tr);
+            tr = (0, _transforms.deleteColumns)(rect, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(oldState), editorView, isTableScalingEnabled)(tr);
           }
         }
       }

package/dist/cjs/nodeviews/TableComponent.js

@@ -32,9 +32,10 @@ var _stickyHeaders = require("../pm-plugins/sticky-headers");
 var _tableAnalytics = require("../pm-plugins/table-analytics");
 var _utils4 = require("../pm-plugins/table-resizing/utils");
 var _colgroup = require("../pm-plugins/table-resizing/utils/colgroup");
+var _consts = require("../pm-plugins/table-resizing/utils/consts");
 var _dom = require("../pm-plugins/table-resizing/utils/dom");
 var _types = require("../types");
-var _consts = require("../ui/consts");
+var _consts2 = require("../ui/consts");
 var _TableFloatingColumnControls = _interopRequireDefault(require("../ui/TableFloatingColumnControls"));
 var _TableFloatingControls = _interopRequireDefault(require("../ui/TableFloatingControls"));
 var _utils5 = require("../utils");
@@ -176,7 +177,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         getPos = _this$props2.getPos,
         containerWidth = _this$props2.containerWidth,
         options = _this$props2.options,
-        getEditorFeatureFlags = _this$props2.getEditorFeatureFlags;
+        isTableScalingEnabled = _this$props2.isTableScalingEnabled;
       var node = getNode();
       var state = view.state,
         dispatch = view.dispatch;
@@ -187,16 +188,13 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       var domAtPos = view.domAtPos.bind(view);
       var width = containerWidth.width;
       _this.scaleTableDebounced.cancel();
-      var _getEditorFeatureFlag = getEditorFeatureFlags(),
-        _getEditorFeatureFlag2 = _getEditorFeatureFlag.tablePreserveWidth,
-        tablePreserveWidth = _getEditorFeatureFlag2 === void 0 ? false : _getEditorFeatureFlag2;
       var tr = (0, _utils4.scaleTable)(_this.table, _objectSpread(_objectSpread({}, scaleOptions), {}, {
         node: node,
         prevNode: _this.node || node,
         start: pos + 1,
         containerWidth: width,
         previousContainerWidth: _this.containerWidth.width || width
-      }, options), domAtPos, tablePreserveWidth)(state.tr);
+      }, options), domAtPos, isTableScalingEnabled)(state.tr);
       dispatch(tr);
     });
     (0, _defineProperty3.default)((0, _assertThisInitialized2.default)(_this), "setTimerToSendInitialOverflowCaptured", function (isOverflowing) {
@@ -318,13 +316,17 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         options = _this$props7.options,
         isDragAndDropEnabled = _this$props7.isDragAndDropEnabled,
         getNode = _this$props7.getNode,
-        getEditorFeatureFlags = _this$props7.getEditorFeatureFlags;
+        getEditorFeatureFlags = _this$props7.getEditorFeatureFlags,
+        isTableScalingEnabled = _this$props7.isTableScalingEnabled;
+      if (isTableScalingEnabled) {
+        this.handleColgroupUpdates(true);
+      }
       if (allowColumnResizing && this.wrapper && !isIE11) {
         this.wrapper.addEventListener('scroll', this.handleScrollDebounced, {
           passive: true
         });
-        var _getEditorFeatureFlag3 = getEditorFeatureFlags(),
-          stickyScrollbar = _getEditorFeatureFlag3.stickyScrollbar;
+        var _getEditorFeatureFlag = getEditorFeatureFlags(),
+          stickyScrollbar = _getEditorFeatureFlag.stickyScrollbar;
         if (stickyScrollbar) {
           if (this.table) {
             this.stickyScrollbar = new _TableStickyScrollbar.TableStickyScrollbar(this.wrapper, this.props.view);
@@ -370,8 +372,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       if (isDragAndDropEnabled && this.dragAndDropCleanupFn) {
         this.dragAndDropCleanupFn();
       }
-      var _getEditorFeatureFlag4 = getEditorFeatureFlags(),
-        stickyScrollbar = _getEditorFeatureFlag4.stickyScrollbar;
+      var _getEditorFeatureFlag2 = getEditorFeatureFlags(),
+        stickyScrollbar = _getEditorFeatureFlag2.stickyScrollbar;
       if (stickyScrollbar) {
         if (this.stickyScrollbar) {
           this.stickyScrollbar.dispose();
@@ -398,23 +400,21 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "handleColgroupUpdates",
     value: function handleColgroupUpdates() {
-      var _this2 = this,
-        _this$containerWidth;
+      var _this$containerWidth;
+      var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var _this$props9 = this.props,
         getNode = _this$props9.getNode,
         containerWidth = _this$props9.containerWidth,
         isResizing = _this$props9.isResizing,
         view = _this$props9.view,
-        getPos = _this$props9.getPos,
-        tableRef = _this$props9.tableRef;
-      if (!tableRef) {
+        getPos = _this$props9.getPos;
+      if (!this.table) {
         return;
       }
-      var TABLE_MARGIN = 76;
 
       // Remove any widths styles after resizing preview is completed
-      tableRef.style.width = '';
-      var tableRenderWidth = containerWidth.width - TABLE_MARGIN;
+      this.table.style.width = '';
+      var tableRenderWidth = containerWidth.width - _consts.TABLE_EDITOR_MARGIN;
       var tableNode = getNode();
       var start = getPos() || 0;
       var depth = view.state.doc.resolve(start).depth;
@@ -424,17 +424,10 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         return;
       }
       var tableNodeWidth = tableNode.attrs.width;
-      var tableColumnWidths = (0, _utils.calcTableColumnWidths)(tableNode);
       var shouldTableScale = tableRenderWidth < tableNodeWidth;
-      var isTableColumnWidthsSame = false;
-      if (this.tableColumnWidths) {
-        isTableColumnWidthsSame = tableColumnWidths === null || tableColumnWidths === void 0 ? void 0 : tableColumnWidths.every(function (width, index) {
-          return width === _this2.tableColumnWidths[index];
-        });
-      }
       var containerWidthValue = containerWidth.width;
       var isWidthChanged = ((_this$containerWidth = this.containerWidth) === null || _this$containerWidth === void 0 ? void 0 : _this$containerWidth.width) !== containerWidthValue;
-      if (shouldTableScale && !isResizing && (!isTableColumnWidthsSame || isWidthChanged)) {
+      if (force || shouldTableScale && !isResizing && isWidthChanged) {
         var resizeState = (0, _utils4.getResizeState)({
           minWidth: _utils4.COLUMN_MIN_WIDTH,
           maxSize: tableRenderWidth,
@@ -442,20 +435,17 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           tableRef: this.table,
           start: start,
           domAtPos: view.domAtPos,
-          tablePreserveWidth: true
-        });
-        requestAnimationFrame(function () {
-          (0, _utils4.updateColgroup)(resizeState, _this2.table, true);
+          isTableScalingEnabled: true
         });
-        this.tableColumnWidths = tableColumnWidths;
-        this.containerWidth = containerWidth;
+        (0, _utils4.updateColgroup)(resizeState, this.table, tableNode, true);
       }
+      this.containerWidth = containerWidth;
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(_, prevState) {
       var _this$wrapper,
-        _this3 = this;
+        _this2 = this;
       var _this$props10 = this.props,
         view = _this$props10.view,
         getNode = _this$props10.getNode,
@@ -463,14 +453,11 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         allowColumnResizing = _this$props10.allowColumnResizing,
         isResizing = _this$props10.isResizing,
         options = _this$props10.options,
-        getEditorFeatureFlags = _this$props10.getEditorFeatureFlags;
+        isTableScalingEnabled = _this$props10.isTableScalingEnabled;
       var _getPluginState = (0, _pluginFactory.getPluginState)(view.state),
         isInDanger = _getPluginState.isInDanger;
-      var _getEditorFeatureFlag5 = getEditorFeatureFlags(),
-        _getEditorFeatureFlag6 = _getEditorFeatureFlag5.tablePreserveWidth,
-        tablePreserveWidth = _getEditorFeatureFlag6 === void 0 ? false : _getEditorFeatureFlag6;
       var table = (0, _utils2.findTable)(view.state.selection);
-      if (tablePreserveWidth) {
+      if (isTableScalingEnabled) {
         this.handleColgroupUpdates();
       }
       if (isInDanger && !table) {
@@ -482,7 +469,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           // that happens when a table is nested in expand and expand's width is
           // changed via breakout button
           window.requestAnimationFrame(function () {
-            _this3.overflowShadowsObserver = new _OverflowShadowsObserver.OverflowShadowsObserver(_this3.updateShadowState, _this3.table, _this3.wrapper);
+            _this2.overflowShadowsObserver = new _OverflowShadowsObserver.OverflowShadowsObserver(_this2.updateShadowState, _this2.table, _this2.wrapper);
           });
         } else {
           this.overflowShadowsObserver = new _OverflowShadowsObserver.OverflowShadowsObserver(this.updateShadowState, this.table, this.wrapper);
@@ -507,7 +494,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           var _view = this.props.view;
           var shouldRecreateResizeCols = !(options !== null && options !== void 0 && options.isTableResizingEnabled) || !isResizing || (0, _utils5.tablesHaveDifferentNoOfColumns)(currentTable, previousTable) && isResizing;
           if (shouldRecreateResizeCols) {
-            (0, _utils4.insertColgroupFromNode)(this.table, currentTable, tablePreserveWidth);
+            (0, _utils4.insertColgroupFromNode)(this.table, currentTable, isTableScalingEnabled);
           }
           (0, _dom.updateControls)()(_view.state);
         }
@@ -538,7 +525,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this4 = this,
+      var _this3 = this,
         _classnames;
       var _this$props11 = this.props,
         view = _this$props11.view,
@@ -555,7 +542,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         getPos = _this$props11.getPos,
         pluginInjectionApi = _this$props11.pluginInjectionApi,
         isDragAndDropEnabled = _this$props11.isDragAndDropEnabled,
-        getEditorFeatureFlags = _this$props11.getEditorFeatureFlags;
+        getEditorFeatureFlags = _this$props11.getEditorFeatureFlags,
+        isTableScalingEnabled = _this$props11.isTableScalingEnabled;
       var _this$state3 = this.state,
         showBeforeShadow = _this$state3.showBeforeShadow,
         showAfterShadow = _this$state3.showAfterShadow;
@@ -613,8 +601,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         tableContainerWidth: tableContainerWidth,
         isNumberColumnEnabled: node.attrs.isNumberColumnEnabled,
         getScrollOffset: function getScrollOffset() {
-          var _this4$wrapper;
-          return ((_this4$wrapper = _this4.wrapper) === null || _this4$wrapper === void 0 ? void 0 : _this4$wrapper.scrollLeft) || 0;
+          var _this3$wrapper;
+          return ((_this3$wrapper = _this3.wrapper) === null || _this3$wrapper === void 0 ? void 0 : _this3$wrapper.scrollLeft) || 0;
         }
       }) : null;
       var shadowPadding = allowControls && tableActive ? -_editorSharedStyles.akEditorTableToolbarSize : _styles.tableMarginSides;
@@ -637,9 +625,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       }
       var isNested = (0, _utils5.isTableNested)(view.state, tablePos);
       var topStickyShadowPosition = isDragAndDropEnabled ? this.state.stickyHeader && this.state.stickyHeader.top + this.state.stickyHeader.padding + 2 : this.state.stickyHeader && this.state.stickyHeader.top + this.state.stickyHeader.padding + shadowPadding + 2;
-      var _getEditorFeatureFlag7 = getEditorFeatureFlags(),
-        stickyScrollbar = _getEditorFeatureFlag7.stickyScrollbar,
-        tablePreserveWidth = _getEditorFeatureFlag7.tablePreserveWidth;
+      var _getEditorFeatureFlag3 = getEditorFeatureFlags(),
+        stickyScrollbar = _getEditorFeatureFlag3.stickyScrollbar;
       return /*#__PURE__*/_react.default.createElement(_TableContainer.TableContainer, {
         className: (0, _classnames2.default)(_types.TableCssClassName.TABLE_CONTAINER, (_classnames = {}, (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.WITH_CONTROLS, allowControls && tableActive), (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.TABLE_STICKY, this.state.stickyHeader && hasHeaderRow), (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.HOVERED_DELETE_BUTTON, isInDanger), (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.TABLE_SELECTED, (0, _utils2.isTableSelected)(view.state.selection)), _classnames)),
         editorView: view,
@@ -652,7 +639,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         pluginInjectionApi: pluginInjectionApi,
         isTableResizingEnabled: options === null || options === void 0 ? void 0 : options.isTableResizingEnabled,
         isResizing: isResizing,
-        tablePreserveWidth: tablePreserveWidth
+        isTableScalingEnabled: isTableScalingEnabled
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: _types.TableCssClassName.TABLE_STICKY_SENTINEL_TOP,
         "data-testid": "sticky-sentinel-top"
@@ -663,12 +650,12 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         editorView: view,
         node: node,
         getScrollOffset: function getScrollOffset() {
-          var _this4$wrapper2;
-          return ((_this4$wrapper2 = _this4.wrapper) === null || _this4$wrapper2 === void 0 ? void 0 : _this4$wrapper2.scrollLeft) || 0;
+          var _this3$wrapper2;
+          return ((_this3$wrapper2 = _this3.wrapper) === null || _this3$wrapper2 === void 0 ? void 0 : _this3$wrapper2.scrollLeft) || 0;
         },
         getTableWrapperWidth: function getTableWrapperWidth() {
-          var _this4$wrapper3;
-          return ((_this4$wrapper3 = _this4.wrapper) === null || _this4$wrapper3 === void 0 ? void 0 : _this4$wrapper3.clientWidth) || 760;
+          var _this3$wrapper3;
+          return ((_this3$wrapper3 = _this3.wrapper) === null || _this3$wrapper3 === void 0 ? void 0 : _this3$wrapper3.clientWidth) || 760;
         }
       }), /*#__PURE__*/_react.default.createElement("div", {
         style: shadowStyle(showBeforeShadow),
@@ -683,13 +670,13 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       }), /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames2.default)(_types.TableCssClassName.TABLE_NODE_WRAPPER),
         ref: function ref(elem) {
-          _this4.wrapper = elem;
+          _this3.wrapper = elem;
           if (elem) {
-            _this4.props.contentDOM(elem);
+            _this3.props.contentDOM(elem);
             var tableElement = elem.querySelector('table');
-            if (tableElement !== _this4.table) {
-              _this4.table = tableElement;
-              _this4.createShadowSentinels(_this4.table);
+            if (tableElement !== _this3.table) {
+              _this3.table = tableElement;
+              _this3.createShadowSentinels(_this3.table);
             }
           }
         }
@@ -712,7 +699,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       }), this.state.stickyHeader && /*#__PURE__*/_react.default.createElement("div", {
         style: {
           position: 'absolute',
-          right: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.custom-table-width') ? "".concat((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.increase-shadow-visibility_lh89r') ? _consts.tableOverflowShadowWidthWide : _consts.tableOverflowShadowWidth, "px") : '-2px'
+          right: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.custom-table-width') ? "".concat((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.increase-shadow-visibility_lh89r') ? _consts2.tableOverflowShadowWidthWide : _consts2.tableOverflowShadowWidth, "px") : '-2px'
         }
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: "".concat(_types.TableCssClassName.TABLE_RIGHT_SHADOW, " ").concat(_types.TableCssClassName.TABLE_STICKY_SHADOW),

package/dist/cjs/nodeviews/TableContainer.js

@@ -54,7 +54,7 @@ var ResizableTableContainer = exports.ResizableTableContainer = /*#__PURE__*/_re
     tableRef = _ref2.tableRef,
     isResizing = _ref2.isResizing,
     pluginInjectionApi = _ref2.pluginInjectionApi,
-    tablePreserveWidth = _ref2.tablePreserveWidth;
+    isTableScalingEnabled = _ref2.isTableScalingEnabled;
   var containerRef = (0, _react.useRef)(null);
   var tableWidthRef = (0, _react.useRef)(_editorSharedStyles.akEditorDefaultLayoutWidth);
   var updateContainerHeight = (0, _react.useCallback)(function (height) {
@@ -118,7 +118,7 @@ var ResizableTableContainer = exports.ResizableTableContainer = /*#__PURE__*/_re
   }, [pluginInjectionApi]);
   var tableWidth = (0, _nodeWidth.getTableContainerWidth)(node);
   // 76 is currently an accepted padding value considering the spacing for resizer handle
-  var responsiveContainerWidth = containerWidth - 76;
+  var responsiveContainerWidth = isTableScalingEnabled ? containerWidth - _editorSharedStyles.akEditorGutterPadding * 2 - _editorSharedStyles.akEditorMediaResizeHandlerPaddingWide / 2 : containerWidth - _editorSharedStyles.akEditorGutterPadding * 2 - _editorSharedStyles.akEditorMediaResizeHandlerPaddingWide;
   var width = Math.min(tableWidth, responsiveContainerWidth);
   if (!isResizing) {
     tableWidthRef.current = width;
@@ -136,7 +136,7 @@ var ResizableTableContainer = exports.ResizableTableContainer = /*#__PURE__*/_re
     displayGuideline: displayGuideline,
     attachAnalyticsEvent: attachAnalyticsEvent,
     displayGapCursor: displayGapCursor,
-    tablePreserveWidth: tablePreserveWidth
+    isTableScalingEnabled: isTableScalingEnabled
   };
   if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.resizing-table-height-improvement')) {
     tableResizerProps = _objectSpread(_objectSpread({}, tableResizerProps), {}, {
@@ -175,7 +175,7 @@ var TableContainer = exports.TableContainer = function TableContainer(_ref3) {
     isNested = _ref3.isNested,
     isResizing = _ref3.isResizing,
     pluginInjectionApi = _ref3.pluginInjectionApi,
-    tablePreserveWidth = _ref3.tablePreserveWidth;
+    isTableScalingEnabled = _ref3.isTableScalingEnabled;
   if (isTableResizingEnabled && !isNested) {
     return /*#__PURE__*/_react.default.createElement(ResizableTableContainer, {
       className: className,
@@ -186,7 +186,7 @@ var TableContainer = exports.TableContainer = function TableContainer(_ref3) {
       tableRef: tableRef,
       isResizing: isResizing,
       pluginInjectionApi: pluginInjectionApi,
-      tablePreserveWidth: tablePreserveWidth
+      isTableScalingEnabled: isTableScalingEnabled
     }, children);
   }
   var tableWidth = isBreakoutEnabled ? (0, _styles.calcTableWidth)(node.attrs.layout, editorWidth) : 'inherit';

package/dist/cjs/nodeviews/TableResizer.js

@@ -98,7 +98,7 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
     displayGuideline = _ref.displayGuideline,
     attachAnalyticsEvent = _ref.attachAnalyticsEvent,
     displayGapCursor = _ref.displayGapCursor,
-    tablePreserveWidth = _ref.tablePreserveWidth;
+    isTableScalingEnabled = _ref.isTableScalingEnabled;
   var currentGap = (0, _react.useRef)(0);
   // track resizing state - use ref over state to avoid re-render
   var isResizing = (0, _react.useRef)(false);
@@ -145,15 +145,15 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
       keys = _ref2.keys;
     if (gap !== currentGap.current) {
       currentGap.current = gap;
-      var visibleGuidelines = getVisibleGuidelines(_guidelines.defaultGuidelines, containerWidth);
+      var visibleGuidelines = getVisibleGuidelines(isTableScalingEnabled ? (0, _guidelines.defaultGuidelinesForPreserveTable)(containerWidth) : _guidelines.defaultGuidelines, containerWidth);
       displayGuideline((0, _guideline.getGuidelinesWithHighlights)(gap, _consts.TABLE_SNAP_GAP, keys, visibleGuidelines));
     }
-  }, [displayGuideline, containerWidth]);
+  }, [isTableScalingEnabled, containerWidth, displayGuideline]);
   var guidelineSnaps = (0, _react.useMemo)(function () {
     return snappingEnabled ? {
-      x: _snapping.defaultSnappingWidths
+      x: isTableScalingEnabled ? (0, _snapping.defaultTablePreserveSnappingWidths)(containerWidth) : _snapping.defaultSnappingWidths
     } : undefined;
-  }, [snappingEnabled]);
+  }, [snappingEnabled, isTableScalingEnabled, containerWidth]);
   (0, _react.useEffect)(function () {
     return function () {
       // only bring back the cursor if this table was deleted - i.e. if a user was resizing, then another
@@ -183,12 +183,12 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
       name: _analytics.TABLE_OVERFLOW_CHANGE_TRIGGER.RESIZED
     });
     dispatch(tr);
-    var visibleGuidelines = getVisibleGuidelines(_guidelines.defaultGuidelines, containerWidth);
+    var visibleGuidelines = getVisibleGuidelines(isTableScalingEnabled ? (0, _guidelines.defaultGuidelinesForPreserveTable)(containerWidth) : _guidelines.defaultGuidelines, containerWidth);
     setSnappingEnabled(displayGuideline(visibleGuidelines));
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.resizing-table-height-improvement') && onResizeStart) {
       onResizeStart();
     }
-  }, [displayGapCursor, displayGuideline, editorView, startMeasure, onResizeStart, containerWidth]);
+  }, [startMeasure, editorView, displayGapCursor, isTableScalingEnabled, containerWidth, displayGuideline, onResizeStart]);
   var handleResize = (0, _react.useCallback)(function (originalState, delta) {
     countFrames();
     var newWidth = originalState.width + delta.width;
@@ -206,11 +206,11 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
       prevNode: node,
       start: pos + 1,
       parentWidth: newWidth
-    }, editorView.domAtPos.bind(editorView), tablePreserveWidth);
-    updateActiveGuidelines((0, _snapping.findClosestSnap)(newWidth, _snapping.defaultSnappingWidths, _guidelines.defaultGuidelines, _consts.TABLE_HIGHLIGHT_GAP, _consts.TABLE_HIGHLIGHT_TOLERANCE));
+    }, editorView.domAtPos.bind(editorView), isTableScalingEnabled);
+    updateActiveGuidelines((0, _snapping.findClosestSnap)(newWidth, isTableScalingEnabled ? (0, _snapping.defaultTablePreserveSnappingWidths)(containerWidth) : _snapping.defaultSnappingWidths, isTableScalingEnabled ? (0, _guidelines.defaultGuidelinesForPreserveTable)(containerWidth) : _guidelines.defaultGuidelines, _consts.TABLE_HIGHLIGHT_GAP, _consts.TABLE_HIGHLIGHT_TOLERANCE));
     updateWidth(newWidth);
     return newWidth;
-  }, [editorView, getPos, node, tableRef, updateWidth, updateActiveGuidelines, countFrames, tablePreserveWidth]);
+  }, [countFrames, isTableScalingEnabled, tableRef, node, editorView, updateActiveGuidelines, containerWidth, updateWidth, getPos]);
   var scheduleResize = (0, _react.useMemo)(function () {
     return (0, _rafSchd.default)(handleResize);
   }, [handleResize]);
@@ -246,7 +246,7 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
         prevNode: node,
         start: pos + 1,
         parentWidth: newWidth
-      }, editorView.domAtPos.bind(editorView), tablePreserveWidth)(tr);
+      }, editorView.domAtPos.bind(editorView), isTableScalingEnabled)(tr);
       var scaledNode = tr.doc.nodeAt(pos);
       (_attachAnalyticsEvent2 = attachAnalyticsEvent((0, _analytics2.generateResizedPayload)({
         originalNode: node,
@@ -264,7 +264,7 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
       onResizeStop();
     }
     return newWidth;
-  }, [displayGapCursor, updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure, onResizeStop, tablePreserveWidth]);
+  }, [displayGapCursor, updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure, onResizeStop, isTableScalingEnabled]);
   var handleTableSizeChangeOnKeypress = (0, _react.useCallback)(function (step) {
     var newWidth = width + step;
     if (newWidth > maxWidth || newWidth < resizerMinWidth) {