@atlaskit/editor-plugin-table 7.4.9 → 7.5.1

package/dist/esm/plugin.js

@@ -147,8 +147,9 @@ var tablesPlugin = function tablesPlugin(_ref) {
         name: 'tableKeymap',
         plugin: function plugin() {
           var _ref6 = options || {},
-            dragAndDropEnabled = _ref6.dragAndDropEnabled;
-          return keymapPlugin(defaultGetEditorContainerWidth, editorAnalyticsAPI, dragAndDropEnabled);
+            dragAndDropEnabled = _ref6.dragAndDropEnabled,
+            getEditorFeatureFlags = _ref6.getEditorFeatureFlags;
+          return keymapPlugin(defaultGetEditorContainerWidth, editorAnalyticsAPI, getEditorFeatureFlags, dragAndDropEnabled);
         }
       }, {
         name: 'tableSelectionKeymap',
@@ -189,40 +190,40 @@ var tablesPlugin = function tablesPlugin(_ref) {
       }, {
         name: 'tableDragAndDrop',
         plugin: function plugin(_ref10) {
-          var dispatch = _ref10.dispatch,
-            eventDispatcher = _ref10.eventDispatcher,
-            dispatchAnalyticsEvent = _ref10.dispatchAnalyticsEvent;
-          return options !== null && options !== void 0 && options.dragAndDropEnabled ? createDragAndDropPlugin(dispatch, eventDispatcher, editorAnalyticsAPI) : undefined;
+          var dispatch = _ref10.dispatch;
+          var _ref11 = options || {},
+            getEditorFeatureFlags = _ref11.getEditorFeatureFlags;
+          return options !== null && options !== void 0 && options.dragAndDropEnabled ? createDragAndDropPlugin(dispatch, getEditorFeatureFlags, editorAnalyticsAPI) : undefined;
         }
       }, {
         name: 'tableLocalId',
-        plugin: function plugin(_ref11) {
-          var dispatch = _ref11.dispatch;
+        plugin: function plugin(_ref12) {
+          var dispatch = _ref12.dispatch;
           return createTableLocalIdPlugin(dispatch);
         }
       }, {
         name: 'tableWidth',
-        plugin: function plugin(_ref12) {
+        plugin: function plugin(_ref13) {
           var _options$fullWidthEna;
-          var dispatchAnalyticsEvent = _ref12.dispatchAnalyticsEvent,
-            dispatch = _ref12.dispatch;
+          var dispatchAnalyticsEvent = _ref13.dispatchAnalyticsEvent,
+            dispatch = _ref13.dispatch;
           return options !== null && options !== void 0 && options.tableResizingEnabled ? createTableWidthPlugin(dispatch, dispatchAnalyticsEvent, (_options$fullWidthEna = options === null || options === void 0 ? void 0 : options.fullWidthEnabled) !== null && _options$fullWidthEna !== void 0 ? _options$fullWidthEna : false, options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) : undefined;
         }
       },
       // TODO: should be deprecated and eventually replaced with 'tableAnalyticsPlugin'
       {
         name: 'tableOverflowAnalyticsPlugin',
-        plugin: function plugin(_ref13) {
+        plugin: function plugin(_ref14) {
           var _options$tableResizin;
-          var dispatch = _ref13.dispatch,
-            dispatchAnalyticsEvent = _ref13.dispatchAnalyticsEvent;
+          var dispatch = _ref14.dispatch,
+            dispatchAnalyticsEvent = _ref14.dispatchAnalyticsEvent;
           return createTableOverflowAnalyticsPlugin(dispatch, dispatchAnalyticsEvent, (_options$tableResizin = options === null || options === void 0 ? void 0 : options.tableResizingEnabled) !== null && _options$tableResizin !== void 0 ? _options$tableResizin : false);
         }
       }, {
         name: 'tableAnalyticsPlugin',
-        plugin: function plugin(_ref14) {
-          var dispatch = _ref14.dispatch,
-            dispatchAnalyticsEvent = _ref14.dispatchAnalyticsEvent;
+        plugin: function plugin(_ref15) {
+          var dispatch = _ref15.dispatch,
+            dispatchAnalyticsEvent = _ref15.dispatchAnalyticsEvent;
           return getBooleanFF('platform.editor.table.analytics-plugin-moved-event') ? createTableAnalyticsPlugin(dispatch, dispatchAnalyticsEvent) : undefined;
         }
       }, {
@@ -253,12 +254,12 @@ var tablesPlugin = function tablesPlugin(_ref) {
       }
       return plugins;
     },
-    contentComponent: function contentComponent(_ref15) {
-      var editorView = _ref15.editorView,
-        popupsMountPoint = _ref15.popupsMountPoint,
-        popupsBoundariesElement = _ref15.popupsBoundariesElement,
-        popupsScrollableElement = _ref15.popupsScrollableElement,
-        dispatchAnalyticsEvent = _ref15.dispatchAnalyticsEvent;
+    contentComponent: function contentComponent(_ref16) {
+      var editorView = _ref16.editorView,
+        popupsMountPoint = _ref16.popupsMountPoint,
+        popupsBoundariesElement = _ref16.popupsBoundariesElement,
+        popupsScrollableElement = _ref16.popupsScrollableElement,
+        dispatchAnalyticsEvent = _ref16.dispatchAnalyticsEvent;
       return /*#__PURE__*/React.createElement(ErrorBoundary, {
         component: ACTION_SUBJECT.TABLES_PLUGIN,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
@@ -272,30 +273,30 @@ var tablesPlugin = function tablesPlugin(_ref) {
           stickyHeadersState: stickyHeadersPluginKey,
           dragAndDropState: dragAndDropPluginKey
         },
-        render: function render(_ref16) {
-          var resizingPluginState = _ref16.tableResizingPluginState,
-            stickyHeadersState = _ref16.stickyHeadersState,
-            tablePluginState = _ref16.tablePluginState,
-            tableWidthPluginState = _ref16.tableWidthPluginState,
-            dragAndDropState = _ref16.dragAndDropState;
+        render: function render(_ref17) {
+          var resizingPluginState = _ref17.tableResizingPluginState,
+            stickyHeadersState = _ref17.stickyHeadersState,
+            tablePluginState = _ref17.tablePluginState,
+            tableWidthPluginState = _ref17.tableWidthPluginState,
+            dragAndDropState = _ref17.dragAndDropState;
           var state = editorView.state;
           var isColumnResizing = resizingPluginState === null || resizingPluginState === void 0 ? void 0 : resizingPluginState.dragging;
           var isTableResizing = tableWidthPluginState === null || tableWidthPluginState === void 0 ? void 0 : tableWidthPluginState.resizing;
           var isResizing = isColumnResizing || isTableResizing;
-          var _ref17 = tablePluginState,
-            tableNode = _ref17.tableNode,
-            tablePos = _ref17.tablePos,
-            targetCellPosition = _ref17.targetCellPosition,
-            isContextualMenuOpen = _ref17.isContextualMenuOpen,
-            layout = _ref17.layout,
-            tableRef = _ref17.tableRef,
-            pluginConfig = _ref17.pluginConfig,
-            insertColumnButtonIndex = _ref17.insertColumnButtonIndex,
-            insertRowButtonIndex = _ref17.insertRowButtonIndex,
-            isHeaderColumnEnabled = _ref17.isHeaderColumnEnabled,
-            isHeaderRowEnabled = _ref17.isHeaderRowEnabled,
-            isDragAndDropEnabled = _ref17.isDragAndDropEnabled,
-            tableWrapperTarget = _ref17.tableWrapperTarget;
+          var _ref18 = tablePluginState,
+            tableNode = _ref18.tableNode,
+            tablePos = _ref18.tablePos,
+            targetCellPosition = _ref18.targetCellPosition,
+            isContextualMenuOpen = _ref18.isContextualMenuOpen,
+            layout = _ref18.layout,
+            tableRef = _ref18.tableRef,
+            pluginConfig = _ref18.pluginConfig,
+            insertColumnButtonIndex = _ref18.insertColumnButtonIndex,
+            insertRowButtonIndex = _ref18.insertRowButtonIndex,
+            isHeaderColumnEnabled = _ref18.isHeaderColumnEnabled,
+            isHeaderRowEnabled = _ref18.isHeaderRowEnabled,
+            isDragAndDropEnabled = _ref18.isDragAndDropEnabled,
+            tableWrapperTarget = _ref18.tableWrapperTarget;
           var allowControls = pluginConfig.allowControls;
           var stickyHeader = stickyHeadersState ? findStickyHeaderForTable(stickyHeadersState, tablePos) : undefined;
           var LayoutContent = options && !options.tableResizingEnabled && isLayoutSupported(state) && options.breakoutEnabled ? /*#__PURE__*/React.createElement(LayoutButton, {
@@ -336,7 +337,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
             hasStickyHeaders: stickyHeader && stickyHeader.sticky,
             dispatchAnalyticsEvent: dispatchAnalyticsEvent,
             editorAnalyticsAPI: editorAnalyticsAPI,
-            getEditorContainerWidth: defaultGetEditorContainerWidth
+            getEditorContainerWidth: defaultGetEditorContainerWidth,
+            getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags
           }), (options === null || options === void 0 ? void 0 : options.allowContextualMenu) && /*#__PURE__*/React.createElement(FloatingContextualMenu, {
             editorView: editorView,
             mountPoint: popupsMountPoint,
@@ -360,7 +362,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
             getEditorContainerWidth: defaultGetEditorContainerWidth,
             editorAnalyticsAPI: editorAnalyticsAPI,
             stickyHeaders: stickyHeader,
-            pluginConfig: pluginConfig
+            pluginConfig: pluginConfig,
+            getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags
           }), allowControls && !isDragAndDropEnabled && !isResizing && /*#__PURE__*/React.createElement(FloatingDeleteButton, {
             editorView: editorView,
             selection: editorView.state.selection,
@@ -376,8 +379,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
       }));
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref18) {
-        var formatMessage = _ref18.formatMessage;
+      quickInsert: function quickInsert(_ref19) {
+        var formatMessage = _ref19.formatMessage;
         return [{
           id: 'table',
           title: formatMessage(messages.table),

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

@@ -17,7 +17,7 @@ import { DropTargetType } from './consts';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
 import { getDraggableDataFromEvent } from './utils/monitor';
-var destroyFn = function destroyFn(editorView, editorAnalyticsAPI) {
+var destroyFn = function destroyFn(editorView, editorAnalyticsAPI, getEditorFeatureFlags) {
   var editorPageScrollContainer = document.querySelector('.fabric-editor-popup-scroll-parent');
   var rowAutoScrollers = editorPageScrollContainer ? [monitorForElements({
     canMonitor: function canMonitor(_ref) {
@@ -147,7 +147,10 @@ var destroyFn = function destroyFn(editorView, editorAnalyticsAPI) {
             tableRef = _getTablePluginState3.tableRef,
             tableNode = _getTablePluginState3.tableNode;
           if (tableRef && tableNode) {
-            insertColgroupFromNode(tableRef, tableNode);
+            var _ref8 = (getEditorFeatureFlags === null || getEditorFeatureFlags === void 0 ? void 0 : getEditorFeatureFlags()) || {},
+              _ref8$tablePreserveWi = _ref8.tablePreserveWidth,
+              tablePreserveWidth = _ref8$tablePreserveWi === void 0 ? false : _ref8$tablePreserveWi;
+            insertColgroupFromNode(tableRef, tableNode, tablePreserveWidth);
           }
         }
         editorView.focus();
@@ -155,7 +158,7 @@ var destroyFn = function destroyFn(editorView, editorAnalyticsAPI) {
     }
   })]));
 };
-export var createPlugin = function createPlugin(dispatch, eventDispatcher, editorAnalyticsAPI) {
+export var createPlugin = function createPlugin(dispatch, getEditorFeatureFlags, editorAnalyticsAPI) {
   return new SafePlugin({
     state: createPluginState(dispatch, function (state) {
       return {
@@ -223,7 +226,7 @@ export var createPlugin = function createPlugin(dispatch, eventDispatcher, edito
     },
     view: function view(editorView) {
       return {
-        destroy: destroyFn(editorView, editorAnalyticsAPI)
+        destroy: destroyFn(editorView, editorAnalyticsAPI, getEditorFeatureFlags)
       };
     },
     props: {
@@ -233,7 +236,7 @@ export var createPlugin = function createPlugin(dispatch, eventDispatcher, edito
         return decorationSet;
       },
       handleKeyDown: function handleKeyDown(view, event) {
-        var _ref8;
+        var _ref9;
         var tr = view.state.tr;
         var keysToTrapWhen = ['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'];
 
@@ -254,7 +257,7 @@ export var createPlugin = function createPlugin(dispatch, eventDispatcher, edito
             return true;
           }
         }
-        var isDragHandleFocused = ['drag-handle-button-row', 'drag-handle-button-column'].includes((_ref8 = event.target || null) === null || _ref8 === void 0 ? void 0 : _ref8.id);
+        var isDragHandleFocused = ['drag-handle-button-row', 'drag-handle-button-column'].includes((_ref9 = event.target || null) === null || _ref9 === void 0 ? void 0 : _ref9.id);
         var keysToTrap = ['Enter', ' '];
         var _getPluginState3 = getPluginState(view.state),
           isDragMenuOpen = _getPluginState3.isDragMenuOpen;

package/dist/esm/pm-plugins/keymap.js

@@ -20,7 +20,7 @@ var createTableWithAnalytics = function createTableWithAnalytics(editorAnalytics
     eventType: EVENT_TYPE.TRACK
   })(editorAnalyticsAPI)(createTable());
 };
-export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI, dragAndDropEnabled) {
+export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI, getEditorFeatureFlags, dragAndDropEnabled) {
   var list = {};
   bindKeymapWithCommand(nextCell.common, goToNextCell(editorAnalyticsAPI)(1), list);
   bindKeymapWithCommand(previousCell.common, goToNextCell(editorAnalyticsAPI)(-1), list);
@@ -52,11 +52,14 @@ export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI, dragAn
     bindKeymapWithCommand(deleteRow.common, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut(editorAnalyticsAPI), list);
   }
   if (getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
+    var _ref = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
+      _ref$tablePreserveWid = _ref.tablePreserveWidth,
+      tablePreserveWidth = _ref$tablePreserveWid === void 0 ? false : _ref$tablePreserveWid;
     bindKeymapWithCommand(startColumnResizing.common, initiateKeyboardColumnResizing, list);
     bindKeymapWithCommand(moveRight.common, activateNextResizeArea(1), list);
     bindKeymapWithCommand(moveLeft.common, activateNextResizeArea(-1), list);
-    bindKeymapWithCommand(decreaseMediaSize.common, changeColumnWidthByStep(-10, getEditorContainerWidth), list);
-    bindKeymapWithCommand(increaseMediaSize.common, changeColumnWidthByStep(10, getEditorContainerWidth), list);
+    bindKeymapWithCommand(decreaseMediaSize.common, changeColumnWidthByStep(-10, getEditorContainerWidth, tablePreserveWidth), list);
+    bindKeymapWithCommand(increaseMediaSize.common, changeColumnWidthByStep(10, getEditorContainerWidth, tablePreserveWidth), list);
     bindKeymapWithCommand(escape.common, stopKeyboardColumnResizing(), list);
   }
   return keymap(list);

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

@@ -88,9 +88,12 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
           }
         });
       }
+      var _getEditorFeatureFlag = getEditorFeatureFlags(),
+        _getEditorFeatureFlag2 = _getEditorFeatureFlag.tablePreserveWidth,
+        tablePreserveWidth = _getEditorFeatureFlag2 === void 0 ? false : _getEditorFeatureFlag2;
       if (tr) {
         // "fixTables" removes empty rows as we don't allow that in schema
-        var updatedTr = handleCut(tr, oldState, newState, editorAnalyticsAPI, editorViewRef || undefined);
+        var updatedTr = handleCut(tr, oldState, newState, editorAnalyticsAPI, editorViewRef || undefined, tablePreserveWidth);
         return fixTables(updatedTr) || updatedTr;
       }
       if (transactions.find(function (tr) {

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

@@ -19,6 +19,9 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
     dispatch = view.dispatch;
   var editorDisabled = !view.editable;
   var domAtPos = view.domAtPos.bind(view);
+  var _getEditorFeatureFlag = getEditorFeatureFlags(),
+    _getEditorFeatureFlag2 = _getEditorFeatureFlag.tablePreserveWidth,
+    tablePreserveWidth = _getEditorFeatureFlag2 === void 0 ? false : _getEditorFeatureFlag2;
   if (editorDisabled || localResizeHandlePos === null || !pointsAtCell(state.doc.resolve(localResizeHandlePos))) {
     return false;
   }
@@ -64,7 +67,8 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
     table: originalTable,
     tableRef: dom,
     start: start,
-    domAtPos: domAtPos
+    domAtPos: domAtPos,
+    tablePreserveWidth: tablePreserveWidth
   });
   if (evenColumns({
     resizeState: resizeState,
@@ -136,7 +140,7 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
         var selectedColumns = selectionRect ? getSelectedColumnIndexes(selectionRect) : [];
         // only selected (or selected - 1) columns should be distributed
         var resizingSelectedColumns = selectedColumns.indexOf(colIndex) > -1 || selectedColumns.indexOf(colIndex + 1) > -1;
-        var newResizeState = resizeColumn(resizeState, colIndex, clientX - startX, dom, resizingSelectedColumns ? selectedColumns : undefined);
+        var newResizeState = resizeColumn(resizeState, colIndex, clientX - startX, dom, resizingSelectedColumns ? selectedColumns : undefined, tablePreserveWidth);
         tr = updateColumnWidths(newResizeState, table, start)(tr);
         if (colIndex === map.width - 1) {
           var mouseUpTime = event.timeStamp;
@@ -184,7 +188,7 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
     var table = $cell.node(-1);
     var map = TableMap.get(table);
     var colIndex = map.colCount($cell.pos - $cell.start(-1)) + $cell.nodeAfter.attrs.colspan - 1;
-    resizeColumn(resizeState, colIndex, clientX - dragging.startX, dom);
+    resizeColumn(resizeState, colIndex, clientX - dragging.startX, dom, undefined, tablePreserveWidth);
     updateControls()(state);
   }
   window.addEventListener('mouseup', finish);

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

@@ -4,6 +4,7 @@ import { getFragmentBackingArray } from '@atlaskit/editor-common/utils';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { MAX_SCALING_PERCENT } from './consts';
 /**
  * This ensures the combined width of the columns (and tbody) of table is always smaller or equal
  * than the table and table wrapper elements. This is necessary as there is no longer
@@ -13,7 +14,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export var getColWidthFix = function getColWidthFix(colwidth, tableColumnCount) {
   return colwidth - 1 / tableColumnCount;
 };
-export var generateColgroup = function generateColgroup(table) {
+export var generateColgroup = function generateColgroup(table, tableRef) {
   var cols = [];
   if (getBooleanFF('platform.editor.custom-table-width')) {
     var map = TableMap.get(table);
@@ -22,11 +23,27 @@ export var generateColgroup = function generateColgroup(table) {
       if (Array.isArray(cell.attrs.colwidth)) {
         // We slice here to guard against our colwidth array having more entries
         // Than the we actually span. We'll patch the document at a later point.
-        cell.attrs.colwidth.slice(0, colspan).forEach(function (width) {
-          cols.push(['col', {
-            style: "width: ".concat(getColWidthFix(width ? Math.max(width, tableCellMinWidth) : tableCellMinWidth, map.width), "px;")
-          }]);
-        });
+        if (tableRef) {
+          var _tableRef$parentEleme;
+          var tableWidth = table.attrs && table.attrs.width;
+          var renderWidth = ((_tableRef$parentEleme = tableRef.parentElement) === null || _tableRef$parentEleme === void 0 ? void 0 : _tableRef$parentEleme.clientWidth) || 760;
+          var scalePercent = renderWidth / tableWidth;
+          scalePercent = Math.max(scalePercent, 1 - MAX_SCALING_PERCENT);
+          cell.attrs.colwidth.slice(0, colspan).forEach(function (width) {
+            var fixedColWidth = getColWidthFix(width, map.width);
+            var scaledWidth = fixedColWidth * Math.min(scalePercent, 1);
+            var finalWidth = Math.max(scaledWidth, tableCellMinWidth);
+            cols.push(['col', {
+              style: "width: ".concat(finalWidth, "px;")
+            }]);
+          });
+        } else {
+          cell.attrs.colwidth.slice(0, colspan).forEach(function (width) {
+            cols.push(['col', {
+              style: "width: ".concat(getColWidthFix(width ? Math.max(width, tableCellMinWidth) : tableCellMinWidth, map.width), "px;")
+            }]);
+          });
+        }
       } else {
         // When we have merged cells on the first row (firstChild),
         // We want to ensure we're creating the appropriate amount of
@@ -66,12 +83,16 @@ export var generateColgroup = function generateColgroup(table) {
   return cols;
 };
 export var insertColgroupFromNode = function insertColgroupFromNode(tableRef, table) {
+  var tablePreserveWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var shouldRemove = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   var colgroup = tableRef.querySelector('colgroup');
-  if (colgroup) {
+  if (colgroup && shouldRemove) {
     tableRef.removeChild(colgroup);
   }
-  colgroup = renderColgroupFromNode(table);
-  tableRef.insertBefore(colgroup, tableRef.firstChild);
+  colgroup = renderColgroupFromNode(table, tablePreserveWidth ? tableRef : undefined);
+  if (shouldRemove) {
+    tableRef.insertBefore(colgroup, tableRef.firstChild);
+  }
   return colgroup.children;
 };
 export var hasTableBeenResized = function hasTableBeenResized(table) {
@@ -93,8 +114,8 @@ export var isMinCellWidthTable = function isMinCellWidthTable(table) {
   });
   return isTableMinCellWidth;
 };
-function renderColgroupFromNode(table) {
-  var rendered = DOMSerializer.renderSpec(document, ['colgroup', {}].concat(_toConsumableArray(generateColgroup(table))));
+function renderColgroupFromNode(table, maybeTableRef) {
+  var rendered = DOMSerializer.renderSpec(document, ['colgroup', {}].concat(_toConsumableArray(generateColgroup(table, maybeTableRef))));
   return rendered.dom;
 }
 export var getColgroupChildrenLength = function getColgroupChildrenLength(table) {

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

@@ -1,2 +1,4 @@
 export var COLUMN_MIN_WIDTH = 48;
-export var TABLE_MAX_WIDTH = 1800;
+export var TABLE_DEFAULT_WIDTH = 760;
+export var TABLE_MAX_WIDTH = 1800;
+export var MAX_SCALING_PERCENT = 0.3;

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

@@ -3,8 +3,8 @@ export { contentWidth } from './content-width';
 export { getColumnStateFromDOM, getFreeSpace, getCellsRefsInColumn, calculateColumnWidth, addContainerLeftRightPadding } from './column-state';
 export { growColumn, shrinkColumn, reduceSpace } from './resize-logic';
 export { getResizeState, updateColgroup, getTotalWidth, evenAllColumnsWidths, bulkColumnsResize, areColumnsEven, adjustColumnsWidths } from './resize-state';
-export { getLayoutSize, getDefaultLayoutMaxWidth, pointsAtCell, currentColWidth, domCellAround, getTableMaxWidth } from './misc';
+export { getLayoutSize, getDefaultLayoutMaxWidth, pointsAtCell, currentColWidth, domCellAround, getTableMaxWidth, getTableElementWidth, getTableContainerElement } from './misc';
 export { updateControls, isClickNear, getResizeCellPos } from './dom';
 export { scale, scaleWithParent, scaleTable, previewScaleTable } from './scale-table';
 export { resizeColumn } from './resize-column';
-export { COLUMN_MIN_WIDTH, TABLE_MAX_WIDTH } from './consts';
+export { COLUMN_MIN_WIDTH, TABLE_MAX_WIDTH, TABLE_DEFAULT_WIDTH, MAX_SCALING_PERCENT } from './consts';

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

@@ -1,9 +1,11 @@
-import { getParentNodeWidth, layoutToWidth } from '@atlaskit/editor-common/node-width';
+import { getParentNodeWidth, getTableContainerWidth, layoutToWidth } from '@atlaskit/editor-common/node-width';
 import { calcTableWidth } from '@atlaskit/editor-common/styles';
 import { getBreakpoint, mapBreakpointToLayoutMaxWidth } from '@atlaskit/editor-common/ui';
-import { containsClassName } from '@atlaskit/editor-common/utils';
+import { calcTableColumnWidths, containsClassName } from '@atlaskit/editor-common/utils';
 import { akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { hasTableBeenResized } from './colgroup';
+
 // Translates named layouts in number values.
 export function getLayoutSize(tableLayout) {
   var containerWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
@@ -69,4 +71,22 @@ export var getTableMaxWidth = function getTableMaxWidth(_ref2) {
     maxWidth -= akEditorTableNumberColumnWidth;
   }
   return maxWidth;
+};
+
+/**
+ *
+ * @param table
+ * @returns calculated width of <table /> element derived from sum of colwidths on tableCell or tableHeader nodes or falls back to container width
+ */
+export var getTableElementWidth = function getTableElementWidth(table) {
+  if (hasTableBeenResized(table)) {
+    // TODO: is there a scenario where ADF columns are SMALLER than container width?
+    return calcTableColumnWidths(table).reduce(function (sum, width) {
+      return sum + width;
+    }, 0);
+  }
+  return getTableContainerElement(table);
+};
+export var getTableContainerElement = function getTableContainerElement(table) {
+  return getTableContainerWidth(table);
 };

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

@@ -2,7 +2,8 @@
 import { growColumn, shrinkColumn } from './resize-logic';
 import { updateColgroup } from './resize-state';
 export var resizeColumn = function resizeColumn(resizeState, colIndex, amount, tableRef, selectedColumns) {
+  var tablePreserveWidth = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var newState = amount > 0 ? growColumn(resizeState, colIndex, amount, selectedColumns) : amount < 0 ? shrinkColumn(resizeState, colIndex, amount, selectedColumns) : resizeState;
-  updateColgroup(newState, tableRef);
+  updateColgroup(newState, tableRef, tablePreserveWidth);
   return newState;
 };

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

@@ -9,13 +9,17 @@ import { getColWidthFix, hasTableBeenResized, insertColgroupFromNode } from './c
 import { getCellsRefsInColumn, getColumnStateFromDOM } from './column-state';
 import { syncStickyRowToTable } from './dom';
 import { getTableMaxWidth } from './misc';
+import { MAX_SCALING_PERCENT, TABLE_DEFAULT_WIDTH } from './index';
 export var getResizeState = function getResizeState(_ref) {
   var minWidth = _ref.minWidth,
     maxSize = _ref.maxSize,
     table = _ref.table,
     tableRef = _ref.tableRef,
     start = _ref.start,
-    domAtPos = _ref.domAtPos;
+    domAtPos = _ref.domAtPos,
+    _ref$tablePreserveWid = _ref.tablePreserveWidth,
+    tablePreserveWidth = _ref$tablePreserveWid === void 0 ? false : _ref$tablePreserveWid;
+  // If the table has been resized, we can use the column widths from the table node
   if (hasTableBeenResized(table)) {
     var _cols = calcTableColumnWidths(table).map(function (width, index) {
       return {
@@ -39,10 +43,22 @@ export var getResizeState = function getResizeState(_ref) {
       overflow: _overflow
     };
   }
+  var shouldReinsertColgroup = !tablePreserveWidth;
 
   // Getting the resize state from DOM
-  var colgroupChildren = insertColgroupFromNode(tableRef, table);
+  var colgroupChildren = insertColgroupFromNode(tableRef, table, tablePreserveWidth, shouldReinsertColgroup // don't reinsert colgroup when preserving table width - this causes widths to jump
+  );
+
   var cols = Array.from(colgroupChildren).map(function (_, index) {
+    // If the table hasn't been resized and we have a table width attribute, we can use it
+    // to calculate the widths of the columns
+    if (tablePreserveWidth && table.attrs.width) {
+      return {
+        index: index,
+        width: table.attrs.width / colgroupChildren.length,
+        minWidth: 48
+      };
+    }
     var cellsRefs = getCellsRefsInColumn(index, table, start, domAtPos);
     return getColumnStateFromDOM(cellsRefs, index, minWidth);
   });
@@ -63,18 +79,41 @@ export var getResizeState = function getResizeState(_ref) {
 };
 
 // updates Colgroup DOM node with new widths
-export var updateColgroup = function updateColgroup(state, tableRef) {
+export var updateColgroup = function updateColgroup(state, tableRef, tablePreserveWidth) {
   var cols = tableRef.querySelectorAll('col');
   if (getBooleanFF('platform.editor.custom-table-width')) {
     var columnsCount = cols.length;
-    state.cols.filter(function (column) {
-      return column && !!column.width;
-    }) // if width is 0, we dont want to apply that.
-    .forEach(function (column, i) {
-      if (cols[i]) {
-        cols[i].style.width = "".concat(getColWidthFix(column.width, columnsCount), "px");
+    if (tablePreserveWidth) {
+      var _tableRef$dataset;
+      var tableWidth = parseInt(((_tableRef$dataset = tableRef.dataset) === null || _tableRef$dataset === void 0 ? void 0 : _tableRef$dataset.tableWidth) || ''); // TODO - get this value from the table node, not the dom
+      if (tableWidth) {
+        var _tableRef$parentEleme;
+        var renderWidth = ((_tableRef$parentEleme = tableRef.parentElement) === null || _tableRef$parentEleme === void 0 ? void 0 : _tableRef$parentEleme.clientWidth) || TABLE_DEFAULT_WIDTH;
+        var scalePercent = renderWidth / tableWidth;
+        scalePercent = Math.max(scalePercent, 1 - MAX_SCALING_PERCENT);
+        state.cols.filter(function (column) {
+          return column && !!column.width;
+        }) // if width is 0, we dont want to apply that.
+        .forEach(function (column, i) {
+          var fixedColWidth = getColWidthFix(column.width, columnsCount);
+          var scaledWidth = fixedColWidth * Math.min(scalePercent, 1);
+          var finalWidth = Math.max(scaledWidth, tableCellMinWidth);
+          // we aren't handling the remaining pixels here when the 48px min width is reached
+          if (cols[i]) {
+            cols[i].style.width = "".concat(finalWidth, "px");
+          }
+        });
       }
-    });
+    } else {
+      state.cols.filter(function (column) {
+        return column && !!column.width;
+      }) // if width is 0, we dont want to apply that.
+      .forEach(function (column, i) {
+        if (cols[i]) {
+          cols[i].style.width = "".concat(getColWidthFix(column.width, columnsCount), "px");
+        }
+      });
+    }
   } else {
     state.cols.filter(function (column) {
       return column && !!column.width;
@@ -262,6 +301,7 @@ export var normaliseTableLayout = function normaliseTableLayout(input) {
   }
 };
 export var getNewResizeStateFromSelectedColumns = function getNewResizeStateFromSelectedColumns(rect, state, domAtPos, getEditorContainerWidth) {
+  var tablePreserveWidth = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   // Fail early so that we don't do complex calculations for no reason
   var numColumnsSelected = rect.right - rect.left;
   if (numColumnsSelected <= 1) {
@@ -298,7 +338,8 @@ export var getNewResizeStateFromSelectedColumns = function getNewResizeStateFrom
     table: table.node,
     tableRef: tableRef,
     start: table.start,
-    domAtPos: domAtPos
+    domAtPos: domAtPos,
+    tablePreserveWidth: tablePreserveWidth
   });
   var newResizeState = evenSelectedColumnsWidths(resizeState, rect);
   var widthsBefore = resizeState.widths;