@atlaskit/editor-plugin-table 7.21.4 → 7.21.5

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

@@ -1,8 +1,9 @@
 // Resize a given column by an amount from the current state
 
+import { akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
 import { TableCssClassName as ClassName } from '../../../types';
 import { ALIGN_CENTER, ALIGN_START, shouldChangeAlignmentToCenterResized } from '../../../utils/alignment';
-import { getTableContainerElementWidth, getTableScalingPercent } from './misc';
+import { getTableScalingPercent } from './misc';
 import { growColumn, shrinkColumn, updateAffectedColumn } from './resize-logic';
 import { updateColgroup } from './resize-state';
 export const resizeColumn = (resizeState, colIndex, amount, tableRef, tableNode, selectedColumns, isTableScalingEnabled = false, shouldUseIncreasedScalingPercent = false) => {
@@ -16,64 +17,112 @@ export const resizeColumn = (resizeState, colIndex, amount, tableRef, tableNode,
   updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled, shouldUseIncreasedScalingPercent);
   return newState;
 };
+export const resizeColumnAndTable = ({
+  resizeState,
+  colIndex,
+  amount,
+  tableRef,
+  tableNode,
+  lineLength,
+  width: editorWidth,
+  isTableAlignmentEnabled
+}) => {
+  const editorContainerWidth = getEditorContainerWidth(editorWidth);
+  const isTableLeftAligned = tableNode.attrs.layout === ALIGN_START;
+  let resizeAmount = isTableLeftAligned ? amount : amount * 2;
+  const willTableHitEditorEdge = resizeState.maxSize + resizeAmount > editorContainerWidth;
+  const willResizedTableStayInOverflow = resizeState.overflow && resizeState.tableWidth + resizeAmount / 2 > resizeState.maxSize;
 
-// try not scale table during resize
-export const resizeColumnAndTable = (resizeState, colIndex, amount, tableRef, tableNode, selectedColumns, isTableScalingEnabled = false, originalTableWidth, shouldUseIncreasedScalingPercent = false, lineLength, isTableAlignmentEnabled = false) => {
-  var _tableRef$closest;
-  // TODO: can we use document state, and apply scaling factor?
-  const tableWidth = tableRef.clientWidth;
-  const tableContainerWidth = (_tableRef$closest = tableRef.closest('.pm-table-container')) === null || _tableRef$closest === void 0 ? void 0 : _tableRef$closest.clientWidth;
-  const isOverflowed = !!(tableWidth && tableContainerWidth && tableWidth > tableContainerWidth);
-  let resizeAmount = tableNode.attrs.layout === ALIGN_START && !isOverflowed ? amount : amount * 2;
-
-  // todo: reimplement - use getTableScalingPercentFrozen to get scaled percent before table width changes dynamically
-  // let scalePercent = 1;
-  // if (isTableScalingEnabled) {
-  // import from ./misc
-  //   scalePercent = getStaticTableScalingPercent(
-  //     tableNode,
-  //     originalTableWidth || resizeState.maxSize,
-  //   );
-  //   resizeAmount = amount / scalePercent;
-  // }
-
-  // need to look at the resize amount and try to adjust the colgroups
-  if (isOverflowed) {
-    resizeAmount = amount < 0 ? amount : resizeAmount - (tableNode.attrs.width + resizeAmount - tableContainerWidth) / 2;
+  // STEP 1: Update col width
+  if (willTableHitEditorEdge || willResizedTableStayInOverflow) {
+    var _tableRef$closest;
+    const tableContainerWidth = (_tableRef$closest = tableRef.closest('.pm-table-container')) === null || _tableRef$closest === void 0 ? void 0 : _tableRef$closest.clientWidth;
+    resizeAmount = amount < 0 ? amount : resizeAmount - (resizeState.maxSize + resizeAmount - tableContainerWidth) / 2;
   }
-  const newState = updateAffectedColumn(resizeState, colIndex, resizeAmount);
-
-  // this function only updates the colgroup in DOM, it reverses the scalePercent
-  // todo: change isScalingEnabled to true when reimplementing scaling
-  updateColgroup(newState, tableRef, tableNode, false, shouldUseIncreasedScalingPercent);
+  if (!willResizedTableStayInOverflow && !willTableHitEditorEdge) {
+    const diff = -(resizeState.tableWidth - resizeState.maxSize);
+    const rest = amount - diff;
+    const final = isTableLeftAligned ? diff + rest : diff + rest * 2;
+    resizeAmount = final;
+  }
+  let newState = updateAffectedColumn(resizeState, colIndex, resizeAmount);
 
-  // use the difference in width from affected column to update overall table width
+  // STEP 2: Update table container width
+  // columns have a min width, so delta !== resizeAmount when this is reached, use this for calculations
   const delta = newState.cols[colIndex].width - resizeState.cols[colIndex].width;
-  if (!isOverflowed) {
-    // If the table is aligned to the start and the table width is greater than the line length, we should change the alignment to center
-    const shouldChangeAlignment = shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, newState.tableWidth + delta);
-    shouldChangeAlignment ? updateTablePreview(delta, tableRef, tableNode, ALIGN_CENTER) : updateTablePreview(delta, tableRef, tableNode);
+  newState.maxSize = Math.round(resizeState.overflow ? willResizedTableStayInOverflow ?
+  // CASE 1A: table will stay in overflow
+  // do not grow the table because resize is happening in the overflow region
+  // and the overall table container needs to be retained
+  resizeState.maxSize :
+  // CASE 1B: table will no longer be in overflow, so adjust container width
+  // ensure the table is resized without any 'big jumps' by working out
+  // the difference between the new table width and the max size and adding the resize
+  resizeState.maxSize + (resizeState.tableWidth - resizeState.maxSize + delta) : willTableHitEditorEdge ?
+  // CASE 2: table will hit editor edge
+  editorContainerWidth :
+  // CASE 3: table is being resized from a non-overflow state
+  resizeState.maxSize + delta);
+
+  // do not apply scaling logic because resize state is already scaled
+  updateColgroup(newState, tableRef, tableNode, false, false);
+  if (!willTableHitEditorEdge && !willResizedTableStayInOverflow) {
+    updateTablePreview(tableRef, newState.maxSize, shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, newState.maxSize));
   }
-  return {
-    ...newState,
-    // resizeState.tableWidth sometimes is off by ~3px on load on resized table when !isOverflowed, using resizeState.maxSize instead
-    tableWidth: isOverflowed ? tableContainerWidth : resizeState.maxSize + delta
-  };
+  return newState;
 };
-const updateTablePreview = (resizeAmount, tableRef, tableNode, tableAligment) => {
-  const currentWidth = getTableContainerElementWidth(tableNode);
-  const resizingContainer = tableRef === null || tableRef === void 0 ? void 0 : tableRef.closest(`.${ClassName.TABLE_RESIZER_CONTAINER}`);
+const updateTablePreview = (tableRef, newTableWidth, shouldChangeAlignment) => {
+  const resizingContainer = tableRef.closest(`.${ClassName.TABLE_RESIZER_CONTAINER}`);
   const resizingItem = resizingContainer === null || resizingContainer === void 0 ? void 0 : resizingContainer.querySelector('.resizer-item');
   const alignmentContainer = resizingContainer === null || resizingContainer === void 0 ? void 0 : resizingContainer.parentElement;
   if (resizingItem) {
-    const newWidth = `${currentWidth + resizeAmount}px`;
-    if (tableRef) {
-      tableRef.style.width = newWidth;
-    }
+    const newWidth = `${newTableWidth}px`;
     resizingContainer.style.width = newWidth;
     resizingItem.style.width = newWidth;
-    if (tableAligment && alignmentContainer) {
-      alignmentContainer.style.justifyContent = tableAligment;
+    if (shouldChangeAlignment && alignmentContainer) {
+      alignmentContainer.style.justifyContent = ALIGN_CENTER;
     }
   }
+};
+const getEditorContainerWidth = editorWidth => Math.min(editorWidth - akEditorGutterPaddingDynamic() * 2, akEditorFullWidthLayoutWidth);
+
+/**
+ * Apply a scaling factor to resize state
+ */
+export const scaleResizeState = ({
+  resizeState,
+  tableRef,
+  tableNode,
+  editorWidth
+}) => {
+  // check if table is scaled, if not then avoid applying scaling values down
+  if (resizeState.maxSize < getEditorContainerWidth(editorWidth)) {
+    return resizeState;
+  }
+  const scalePercent = getTableScalingPercent(tableNode, tableRef);
+  let cols = resizeState.cols.map(col => ({
+    ...col,
+    width: Math.round(Math.max(col.width * scalePercent, col.minWidth))
+  }));
+  const scaledTableWidth = Math.round(resizeState.tableWidth * scalePercent);
+  const calculatedTableWidth = cols.reduce((prev, curr) => prev + curr.width, 0);
+
+  // using Math.round can cause the sum of col widths to be larger than the table width
+  // distribute the difference to the smallest column
+  if (calculatedTableWidth > scaledTableWidth) {
+    const diff = calculatedTableWidth - scaledTableWidth;
+    cols = cols.map(col => {
+      return col.width - diff >= col.minWidth ? {
+        ...col,
+        width: col.width - diff
+      } : col;
+    });
+  }
+  return {
+    ...resizeState,
+    widths: cols.map(col => col.width),
+    tableWidth: scaledTableWidth,
+    maxSize: Math.round(resizeState.maxSize * scalePercent),
+    cols
+  };
 };

package/dist/es2019/utils/alignment.js

@@ -11,4 +11,4 @@ export const normaliseAlignment = layout => layout === ALIGN_CENTER || layout ==
 /**
  * We don't want to switch alignment in Full-width editor
  */
-export const shouldChangeAlignmentToCenterResized = (isTableAlignmentEnabled, tableNode, lineLength, updatedTableWidth) => isTableAlignmentEnabled && tableNode && tableNode.attrs.layout === ALIGN_START && lineLength && updatedTableWidth > lineLength && lineLength < FULL_WIDTH_EDITOR_CONTENT_WIDTH;
+export const shouldChangeAlignmentToCenterResized = (isTableAlignmentEnabled, tableNode, lineLength, updatedTableWidth) => Boolean(isTableAlignmentEnabled && tableNode && tableNode.attrs.layout === ALIGN_START && lineLength && updatedTableWidth > lineLength && lineLength < FULL_WIDTH_EDITOR_CONTENT_WIDTH);

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

@@ -33,12 +33,10 @@ export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI, dragAn
   bindKeymapWithCommand(addRowAfter.common, addRowAroundSelection(editorAnalyticsAPI)('BOTTOM'), list);
   bindKeymapWithCommand(addColumnBefore.common, addColumnBeforeCommand(isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
   bindKeymapWithCommand(addColumnAfter.common, addColumnAfterCommand(isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
-  if (fg('platform.editor.a11y-help-dialog-shortcut-keys-position_aghfg')) {
-    bindKeymapWithCommand(addRowBeforeVO.common, addRowAroundSelection(editorAnalyticsAPI)('TOP'), list);
-    bindKeymapWithCommand(addRowAfterVO.common, addRowAroundSelection(editorAnalyticsAPI)('BOTTOM'), list);
-    bindKeymapWithCommand(addColumnBeforeVO.common, addColumnBeforeCommand(isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
-    bindKeymapWithCommand(addColumnAfterVO.common, addColumnAfterCommand(isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
-  }
+  bindKeymapWithCommand(addRowBeforeVO.common, addRowAroundSelection(editorAnalyticsAPI)('TOP'), list);
+  bindKeymapWithCommand(addRowAfterVO.common, addRowAroundSelection(editorAnalyticsAPI)('BOTTOM'), list);
+  bindKeymapWithCommand(addColumnBeforeVO.common, addColumnBeforeCommand(isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
+  bindKeymapWithCommand(addColumnAfterVO.common, addColumnAfterCommand(isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
   if (dragAndDropEnabled) {
     // Move row/column shortcuts
     /**

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

@@ -16,13 +16,15 @@ import { META_KEYS } from '../table-analytics';
 import { evenColumns, setDragging, stopResizing } from './commands';
 import { getPluginState } from './plugin-factory';
 import { currentColWidth, getResizeState, getTableMaxWidth, pointsAtCell, resizeColumn, resizeColumnAndTable, updateControls } from './utils';
+import { scaleResizeState } from './utils/resize-column';
 export var handleMouseDown = function handleMouseDown(view, event, localResizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, isTableScalingEnabled, editorAnalyticsAPI, isNewColumnResizingEnabled, isTableAlignmentEnabled) {
   var state = view.state,
     dispatch = view.dispatch;
   var editorDisabled = !view.editable;
   var domAtPos = view.domAtPos.bind(view);
   var _getEditorContainerWi = getEditorContainerWidth(),
-    lineLength = _getEditorContainerWi.lineLength;
+    lineLength = _getEditorContainerWi.lineLength,
+    editorWidth = _getEditorContainerWi.width;
   if (editorDisabled || localResizeHandlePos === null || !pointsAtCell(state.doc.resolve(localResizeHandlePos))) {
     return false;
   }
@@ -88,6 +90,17 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
   // When we start resizing a column we need to ensure the underlying tooltip is removed from the decoration to avoid
   // unnecessary tooltips being displayed during drag.
   updateResizeHandleDecorations(undefined, undefined, false)(state, dispatch);
+
+  // for new column resizing, take the current scaled version of table widths and use those as the basis for resizing
+  // implication: the scaled version of the table becomes the source of truth
+  if (isNewColumnResizingEnabled && shouldScale) {
+    resizeState = scaleResizeState({
+      resizeState: resizeState,
+      tableRef: dom,
+      tableNode: originalTable,
+      editorWidth: editorWidth
+    });
+  }
   function finish(event) {
     window.removeEventListener('mouseup', finish);
     window.removeEventListener('mousemove', move);
@@ -147,18 +160,23 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
         var resizedDelta = clientX - startX;
         var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent');
         if (isNewColumnResizingEnabled && !isTableNested(state, tablePos)) {
-          var newResizeState = resizeColumnAndTable(resizeState, colIndex, resizedDelta, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, _shouldScale,
-          // isTableScalingEnabled
-          undefined,
-          // originalTableWidth
-          shouldUseIncreasedScalingPercent, lineLength, isTableAlignmentEnabled);
+          var newResizeState = resizeColumnAndTable({
+            resizeState: resizeState,
+            colIndex: colIndex,
+            amount: resizedDelta,
+            tableRef: dom,
+            tableNode: originalTable,
+            width: editorWidth,
+            lineLength: lineLength,
+            isTableAlignmentEnabled: isTableAlignmentEnabled
+          });
           tr = updateColumnWidths(newResizeState, table, start)(tr);
 
           // If the table is aligned to the start and the table width is greater than the line length, we should change the alignment to center
-          var shouldChangeAlignment = shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, originalTable, lineLength, newResizeState.tableWidth);
+          var shouldChangeAlignment = shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, originalTable, lineLength, newResizeState.maxSize);
           if (shouldChangeAlignment) {
             tr = tr.setNodeMarkup(start - 1, state.schema.nodes.table, _objectSpread(_objectSpread({}, table.attrs), {}, {
-              width: newResizeState.tableWidth,
+              width: newResizeState.maxSize,
               layout: ALIGN_CENTER
             }));
             editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
@@ -166,7 +184,7 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
               actionSubject: ACTION_SUBJECT.TABLE,
               actionSubjectId: null,
               attributes: {
-                tableWidth: newResizeState.tableWidth,
+                tableWidth: newResizeState.maxSize,
                 newAlignment: ALIGN_CENTER,
                 previousAlignment: ALIGN_START,
                 totalRowCount: totalRowCount,
@@ -177,7 +195,7 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
               eventType: EVENT_TYPE.TRACK
             })(tr);
           } else {
-            tr.setNodeAttribute(start - 1, 'width', newResizeState.tableWidth);
+            tr.setNodeAttribute(start - 1, 'width', newResizeState.maxSize);
           }
         } else {
           var _newResizeState = resizeColumn(resizeState, colIndex, resizedDelta, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, _shouldScale, shouldUseIncreasedScalingPercent);
@@ -249,10 +267,20 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
     if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
       shouldScale = shouldScale && originalTable.attrs.displayMode !== 'fixed';
     }
+    var resizedDelta = clientX - dragging.startX;
     if (isNewColumnResizingEnabled && !isTableNested(state, tablePos)) {
-      resizeColumnAndTable(resizeState, colIndex, clientX - dragging.startX, dom, table, undefined, shouldScale, undefined, shouldUseIncreasedScalingPercent, lineLength, isTableAlignmentEnabled);
+      resizeColumnAndTable({
+        resizeState: resizeState,
+        colIndex: colIndex,
+        amount: resizedDelta,
+        tableRef: dom,
+        tableNode: originalTable,
+        width: editorWidth,
+        lineLength: lineLength,
+        isTableAlignmentEnabled: isTableAlignmentEnabled
+      });
     } else {
-      resizeColumn(resizeState, colIndex, clientX - dragging.startX, dom, table, undefined, shouldScale, shouldUseIncreasedScalingPercent);
+      resizeColumn(resizeState, colIndex, resizedDelta, dom, table, undefined, shouldScale, shouldUseIncreasedScalingPercent);
     }
     updateControls()(state);
   }

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

@@ -3,9 +3,10 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // Resize a given column by an amount from the current state
 
+import { akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
 import { TableCssClassName as ClassName } from '../../../types';
 import { ALIGN_CENTER, ALIGN_START, shouldChangeAlignmentToCenterResized } from '../../../utils/alignment';
-import { getTableContainerElementWidth, getTableScalingPercent } from './misc';
+import { getTableScalingPercent } from './misc';
 import { growColumn, shrinkColumn, updateAffectedColumn } from './resize-logic';
 import { updateColgroup } from './resize-state';
 export var resizeColumn = function resizeColumn(resizeState, colIndex, amount, tableRef, tableNode, selectedColumns) {
@@ -21,68 +22,115 @@ export var resizeColumn = function resizeColumn(resizeState, colIndex, amount, t
   updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled, shouldUseIncreasedScalingPercent);
   return newState;
 };
+export var resizeColumnAndTable = function resizeColumnAndTable(_ref) {
+  var resizeState = _ref.resizeState,
+    colIndex = _ref.colIndex,
+    amount = _ref.amount,
+    tableRef = _ref.tableRef,
+    tableNode = _ref.tableNode,
+    lineLength = _ref.lineLength,
+    editorWidth = _ref.width,
+    isTableAlignmentEnabled = _ref.isTableAlignmentEnabled;
+  var editorContainerWidth = getEditorContainerWidth(editorWidth);
+  var isTableLeftAligned = tableNode.attrs.layout === ALIGN_START;
+  var resizeAmount = isTableLeftAligned ? amount : amount * 2;
+  var willTableHitEditorEdge = resizeState.maxSize + resizeAmount > editorContainerWidth;
+  var willResizedTableStayInOverflow = resizeState.overflow && resizeState.tableWidth + resizeAmount / 2 > resizeState.maxSize;
 
-// try not scale table during resize
-export var resizeColumnAndTable = function resizeColumnAndTable(resizeState, colIndex, amount, tableRef, tableNode, selectedColumns) {
-  var _tableRef$closest;
-  var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  var originalTableWidth = arguments.length > 7 ? arguments[7] : undefined;
-  var shouldUseIncreasedScalingPercent = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
-  var lineLength = arguments.length > 9 ? arguments[9] : undefined;
-  var isTableAlignmentEnabled = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
-  // TODO: can we use document state, and apply scaling factor?
-  var tableWidth = tableRef.clientWidth;
-  var tableContainerWidth = (_tableRef$closest = tableRef.closest('.pm-table-container')) === null || _tableRef$closest === void 0 ? void 0 : _tableRef$closest.clientWidth;
-  var isOverflowed = !!(tableWidth && tableContainerWidth && tableWidth > tableContainerWidth);
-  var resizeAmount = tableNode.attrs.layout === ALIGN_START && !isOverflowed ? amount : amount * 2;
-
-  // todo: reimplement - use getTableScalingPercentFrozen to get scaled percent before table width changes dynamically
-  // let scalePercent = 1;
-  // if (isTableScalingEnabled) {
-  // import from ./misc
-  //   scalePercent = getStaticTableScalingPercent(
-  //     tableNode,
-  //     originalTableWidth || resizeState.maxSize,
-  //   );
-  //   resizeAmount = amount / scalePercent;
-  // }
-
-  // need to look at the resize amount and try to adjust the colgroups
-  if (isOverflowed) {
-    resizeAmount = amount < 0 ? amount : resizeAmount - (tableNode.attrs.width + resizeAmount - tableContainerWidth) / 2;
+  // STEP 1: Update col width
+  if (willTableHitEditorEdge || willResizedTableStayInOverflow) {
+    var _tableRef$closest;
+    var tableContainerWidth = (_tableRef$closest = tableRef.closest('.pm-table-container')) === null || _tableRef$closest === void 0 ? void 0 : _tableRef$closest.clientWidth;
+    resizeAmount = amount < 0 ? amount : resizeAmount - (resizeState.maxSize + resizeAmount - tableContainerWidth) / 2;
+  }
+  if (!willResizedTableStayInOverflow && !willTableHitEditorEdge) {
+    var diff = -(resizeState.tableWidth - resizeState.maxSize);
+    var rest = amount - diff;
+    var final = isTableLeftAligned ? diff + rest : diff + rest * 2;
+    resizeAmount = final;
   }
   var newState = updateAffectedColumn(resizeState, colIndex, resizeAmount);
 
-  // this function only updates the colgroup in DOM, it reverses the scalePercent
-  // todo: change isScalingEnabled to true when reimplementing scaling
-  updateColgroup(newState, tableRef, tableNode, false, shouldUseIncreasedScalingPercent);
-
-  // use the difference in width from affected column to update overall table width
+  // STEP 2: Update table container width
+  // columns have a min width, so delta !== resizeAmount when this is reached, use this for calculations
   var delta = newState.cols[colIndex].width - resizeState.cols[colIndex].width;
-  if (!isOverflowed) {
-    // If the table is aligned to the start and the table width is greater than the line length, we should change the alignment to center
-    var shouldChangeAlignment = shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, newState.tableWidth + delta);
-    shouldChangeAlignment ? updateTablePreview(delta, tableRef, tableNode, ALIGN_CENTER) : updateTablePreview(delta, tableRef, tableNode);
+  newState.maxSize = Math.round(resizeState.overflow ? willResizedTableStayInOverflow ?
+  // CASE 1A: table will stay in overflow
+  // do not grow the table because resize is happening in the overflow region
+  // and the overall table container needs to be retained
+  resizeState.maxSize :
+  // CASE 1B: table will no longer be in overflow, so adjust container width
+  // ensure the table is resized without any 'big jumps' by working out
+  // the difference between the new table width and the max size and adding the resize
+  resizeState.maxSize + (resizeState.tableWidth - resizeState.maxSize + delta) : willTableHitEditorEdge ?
+  // CASE 2: table will hit editor edge
+  editorContainerWidth :
+  // CASE 3: table is being resized from a non-overflow state
+  resizeState.maxSize + delta);
+
+  // do not apply scaling logic because resize state is already scaled
+  updateColgroup(newState, tableRef, tableNode, false, false);
+  if (!willTableHitEditorEdge && !willResizedTableStayInOverflow) {
+    updateTablePreview(tableRef, newState.maxSize, shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, newState.maxSize));
   }
-  return _objectSpread(_objectSpread({}, newState), {}, {
-    // resizeState.tableWidth sometimes is off by ~3px on load on resized table when !isOverflowed, using resizeState.maxSize instead
-    tableWidth: isOverflowed ? tableContainerWidth : resizeState.maxSize + delta
-  });
+  return newState;
 };
-var updateTablePreview = function updateTablePreview(resizeAmount, tableRef, tableNode, tableAligment) {
-  var currentWidth = getTableContainerElementWidth(tableNode);
-  var resizingContainer = tableRef === null || tableRef === void 0 ? void 0 : tableRef.closest(".".concat(ClassName.TABLE_RESIZER_CONTAINER));
+var updateTablePreview = function updateTablePreview(tableRef, newTableWidth, shouldChangeAlignment) {
+  var resizingContainer = tableRef.closest(".".concat(ClassName.TABLE_RESIZER_CONTAINER));
   var resizingItem = resizingContainer === null || resizingContainer === void 0 ? void 0 : resizingContainer.querySelector('.resizer-item');
   var alignmentContainer = resizingContainer === null || resizingContainer === void 0 ? void 0 : resizingContainer.parentElement;
   if (resizingItem) {
-    var newWidth = "".concat(currentWidth + resizeAmount, "px");
-    if (tableRef) {
-      tableRef.style.width = newWidth;
-    }
+    var newWidth = "".concat(newTableWidth, "px");
     resizingContainer.style.width = newWidth;
     resizingItem.style.width = newWidth;
-    if (tableAligment && alignmentContainer) {
-      alignmentContainer.style.justifyContent = tableAligment;
+    if (shouldChangeAlignment && alignmentContainer) {
+      alignmentContainer.style.justifyContent = ALIGN_CENTER;
     }
   }
+};
+var getEditorContainerWidth = function getEditorContainerWidth(editorWidth) {
+  return Math.min(editorWidth - akEditorGutterPaddingDynamic() * 2, akEditorFullWidthLayoutWidth);
+};
+
+/**
+ * Apply a scaling factor to resize state
+ */
+export var scaleResizeState = function scaleResizeState(_ref2) {
+  var resizeState = _ref2.resizeState,
+    tableRef = _ref2.tableRef,
+    tableNode = _ref2.tableNode,
+    editorWidth = _ref2.editorWidth;
+  // check if table is scaled, if not then avoid applying scaling values down
+  if (resizeState.maxSize < getEditorContainerWidth(editorWidth)) {
+    return resizeState;
+  }
+  var scalePercent = getTableScalingPercent(tableNode, tableRef);
+  var cols = resizeState.cols.map(function (col) {
+    return _objectSpread(_objectSpread({}, col), {}, {
+      width: Math.round(Math.max(col.width * scalePercent, col.minWidth))
+    });
+  });
+  var scaledTableWidth = Math.round(resizeState.tableWidth * scalePercent);
+  var calculatedTableWidth = cols.reduce(function (prev, curr) {
+    return prev + curr.width;
+  }, 0);
+
+  // using Math.round can cause the sum of col widths to be larger than the table width
+  // distribute the difference to the smallest column
+  if (calculatedTableWidth > scaledTableWidth) {
+    var diff = calculatedTableWidth - scaledTableWidth;
+    cols = cols.map(function (col) {
+      return col.width - diff >= col.minWidth ? _objectSpread(_objectSpread({}, col), {}, {
+        width: col.width - diff
+      }) : col;
+    });
+  }
+  return _objectSpread(_objectSpread({}, resizeState), {}, {
+    widths: cols.map(function (col) {
+      return col.width;
+    }),
+    tableWidth: scaledTableWidth,
+    maxSize: Math.round(resizeState.maxSize * scalePercent),
+    cols: cols
+  });
 };

package/dist/esm/utils/alignment.js

@@ -14,5 +14,5 @@ export var normaliseAlignment = function normaliseAlignment(layout) {
  * We don't want to switch alignment in Full-width editor
  */
 export var shouldChangeAlignmentToCenterResized = function shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, updatedTableWidth) {
-  return isTableAlignmentEnabled && tableNode && tableNode.attrs.layout === ALIGN_START && lineLength && updatedTableWidth > lineLength && lineLength < FULL_WIDTH_EDITOR_CONTENT_WIDTH;
+  return Boolean(isTableAlignmentEnabled && tableNode && tableNode.attrs.layout === ALIGN_START && lineLength && updatedTableWidth > lineLength && lineLength < FULL_WIDTH_EDITOR_CONTENT_WIDTH);
 };

package/dist/types/pm-plugins/table-resizing/utils/resize-column.d.ts

@@ -1,4 +1,26 @@
+import { type EditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { ResizeState } from './types';
 export declare const resizeColumn: (resizeState: ResizeState, colIndex: number, amount: number, tableRef: HTMLElement | null, tableNode: PmNode, selectedColumns?: number[], isTableScalingEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean) => ResizeState;
-export declare const resizeColumnAndTable: (resizeState: ResizeState, colIndex: number, amount: number, tableRef: HTMLElement, tableNode: PmNode, selectedColumns?: number[], isTableScalingEnabled?: boolean, originalTableWidth?: number, shouldUseIncreasedScalingPercent?: boolean, lineLength?: number, isTableAlignmentEnabled?: boolean) => ResizeState;
+type ResizeInformation = {
+    resizeState: ResizeState;
+    colIndex: number;
+    amount: number;
+};
+type TableReferences = {
+    tableRef: HTMLElement;
+    tableNode: PmNode;
+};
+type TableResizingPluginOptions = {
+    isTableAlignmentEnabled?: boolean;
+};
+type ResizeColumnAndTable = ResizeInformation & TableResizingPluginOptions & TableReferences & EditorContainerWidth;
+export declare const resizeColumnAndTable: ({ resizeState, colIndex, amount, tableRef, tableNode, lineLength, width: editorWidth, isTableAlignmentEnabled, }: ResizeColumnAndTable) => ResizeState;
+/**
+ * Apply a scaling factor to resize state
+ */
+export declare const scaleResizeState: ({ resizeState, tableRef, tableNode, editorWidth, }: TableReferences & {
+    resizeState: ResizeState;
+    editorWidth: number;
+}) => ResizeState;
+export {};

package/dist/types/utils/alignment.d.ts

@@ -11,4 +11,4 @@ export declare const normaliseAlignment: (layout: TableLayout) => AlignmentOptio
 /**
  * We don't want to switch alignment in Full-width editor
  */
-export declare const shouldChangeAlignmentToCenterResized: (isTableAlignmentEnabled: boolean | undefined, tableNode: PmNode, lineLength: number | undefined, updatedTableWidth: number) => boolean | 0 | undefined;
+export declare const shouldChangeAlignmentToCenterResized: (isTableAlignmentEnabled: boolean | undefined, tableNode: PmNode, lineLength: number | undefined, updatedTableWidth: number) => boolean;

package/dist/types-ts4.5/pm-plugins/table-resizing/utils/resize-column.d.ts

@@ -1,4 +1,26 @@
+import { type EditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { ResizeState } from './types';
 export declare const resizeColumn: (resizeState: ResizeState, colIndex: number, amount: number, tableRef: HTMLElement | null, tableNode: PmNode, selectedColumns?: number[], isTableScalingEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean) => ResizeState;
-export declare const resizeColumnAndTable: (resizeState: ResizeState, colIndex: number, amount: number, tableRef: HTMLElement, tableNode: PmNode, selectedColumns?: number[], isTableScalingEnabled?: boolean, originalTableWidth?: number, shouldUseIncreasedScalingPercent?: boolean, lineLength?: number, isTableAlignmentEnabled?: boolean) => ResizeState;
+type ResizeInformation = {
+    resizeState: ResizeState;
+    colIndex: number;
+    amount: number;
+};
+type TableReferences = {
+    tableRef: HTMLElement;
+    tableNode: PmNode;
+};
+type TableResizingPluginOptions = {
+    isTableAlignmentEnabled?: boolean;
+};
+type ResizeColumnAndTable = ResizeInformation & TableResizingPluginOptions & TableReferences & EditorContainerWidth;
+export declare const resizeColumnAndTable: ({ resizeState, colIndex, amount, tableRef, tableNode, lineLength, width: editorWidth, isTableAlignmentEnabled, }: ResizeColumnAndTable) => ResizeState;
+/**
+ * Apply a scaling factor to resize state
+ */
+export declare const scaleResizeState: ({ resizeState, tableRef, tableNode, editorWidth, }: TableReferences & {
+    resizeState: ResizeState;
+    editorWidth: number;
+}) => ResizeState;
+export {};

package/dist/types-ts4.5/utils/alignment.d.ts

@@ -11,4 +11,4 @@ export declare const normaliseAlignment: (layout: TableLayout) => AlignmentOptio
 /**
  * We don't want to switch alignment in Full-width editor
  */
-export declare const shouldChangeAlignmentToCenterResized: (isTableAlignmentEnabled: boolean | undefined, tableNode: PmNode, lineLength: number | undefined, updatedTableWidth: number) => boolean | 0 | undefined;
+export declare const shouldChangeAlignmentToCenterResized: (isTableAlignmentEnabled: boolean | undefined, tableNode: PmNode, lineLength: number | undefined, updatedTableWidth: number) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "7.21.4",
+	"version": "7.21.5",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
 		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/button": "^19.0.0",
 		"@atlaskit/custom-steps": "^0.4.0",
-		"@atlaskit/editor-common": "^86.4.0",
+		"@atlaskit/editor-common": "^86.5.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.1.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
@@ -105,9 +105,6 @@
 		"platform_editor_lazy-node-views": {
 			"type": "boolean"
 		},
-		"platform.editor.a11y-help-dialog-shortcut-keys-position_aghfg": {
-			"type": "boolean"
-		},
 		"platform.editor.transform-slice-for-nested-expand": {
 			"type": "boolean"
 		},