@atlaskit/editor-plugin-table 5.7.3 → 5.7.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-table
 
+## 5.7.4
+
+### Patch Changes
+
+- [#63287](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/63287) [`8b58c452f126`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8b58c452f126) - ED-20334 Cleaned reference for feature flag 'platform.editor.table-update-colwidths-after-column-is-deleted'and refactored code for it.
+
 ## 5.7.3
 
 ### Patch Changes

package/dist/cjs/commands/insert.js

@@ -43,7 +43,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)(getEditorContainerWidth)(table, view)(updatedTr);
+        updatedTr = (0, _columnWidth.rescaleColumns)()(table, view)(updatedTr);
       }
       if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.analytics-plugin-moved-event') && view) {
         updatedTr = (0, _commands.updateRowOrColumnMovedTransform)({

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

@@ -4,16 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateColumnWidths = exports.rescaleColumnsOld = exports.rescaleColumnsNew = exports.rescaleColumns = void 0;
+exports.updateColumnWidths = exports.rescaleColumns = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _styles = require("@atlaskit/editor-common/styles");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("../pm-plugins/table-resizing/utils");
 var _colgroup = require("../pm-plugins/table-resizing/utils/colgroup");
-var _misc = require("../pm-plugins/table-resizing/utils/misc");
 var _resizeState = require("../pm-plugins/table-resizing/utils/resize-state");
 var _scaleTable = require("../pm-plugins/table-resizing/utils/scale-table");
 var _commonStyles = require("../ui/common-styles");
@@ -95,7 +93,7 @@ var updateColumnWidths = exports.updateColumnWidths = function updateColumnWidth
  * @param view
  * @returns Updated transaction with rescaled columns for a given table
  */
-var rescaleColumnsNew = exports.rescaleColumnsNew = function rescaleColumnsNew() {
+var rescaleColumns = exports.rescaleColumns = function rescaleColumns() {
   return function (table, view) {
     return function (tr) {
       var _tableRef$parentEleme, _tableRef$parentEleme2;
@@ -115,7 +113,7 @@ var rescaleColumnsNew = exports.rescaleColumnsNew = function rescaleColumnsNew()
         // when table is resized the tableRef client width will be 1px larger than colGroup, which is used in calculations
         width: isResized ? tableRef.clientWidth - 1 : tableRef.clientWidth,
         /** the is the width the table can reach before overflowing */
-        possibleMaxWidth: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.custom-table-width') ? (tableRef === null || tableRef === void 0 || (_tableRef$parentEleme = tableRef.parentElement) === null || _tableRef$parentEleme === void 0 ? void 0 : _tableRef$parentEleme.clientWidth) || 0 : ((tableRef === null || tableRef === void 0 || (_tableRef$parentEleme2 = tableRef.parentElement) === null || _tableRef$parentEleme2 === void 0 ? void 0 : _tableRef$parentEleme2.clientWidth) || 0) - _commonStyles.insertColumnButtonOffset - 1,
+        possibleMaxWidth: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.custom-table-width') ? (tableRef === null || tableRef === void 0 || (_tableRef$parentEleme = tableRef.parentElement) === null || _tableRef$parentEleme === void 0 ? void 0 : _tableRef$parentEleme.clientWidth) || 0 : ((tableRef === null || tableRef === void 0 || (_tableRef$parentEleme2 = tableRef.parentElement) === null || _tableRef$parentEleme2 === void 0 ? void 0 : _tableRef$parentEleme2.clientWidth) || 0) - _commonStyles.insertColumnButtonOffset,
         isResized: isResized
       };
 
@@ -175,104 +173,4 @@ var rescaleColumnsNew = exports.rescaleColumnsNew = function rescaleColumnsNew()
       return updateColumnWidths(resizeState, table.node, table.start)(tr);
     };
   };
-};
-
-/**
- * This function is called when user inserts/deletes a column in a table to;
- * - rescale all columns (if the table did not overflow before the insertion)
- * - and update column widths.
- *
- * This is done manually to avoid a multi-dispatch in TableComponent. See [ED-8288].
- * @param table
- * @param view
- * @returns Updated transaction with rescaled columns for a given table
- */
-var rescaleColumnsOld = exports.rescaleColumnsOld = function rescaleColumnsOld(getEditorContainerWidth) {
-  return function (table, view) {
-    return function (tr) {
-      var _tableRef$parentEleme3;
-      if (!view) {
-        return tr;
-      }
-      var pos = table.pos;
-      var newTable = tr.doc.nodeAt(pos);
-      var state = view.state;
-      var domAtPos = view.domAtPos.bind(view);
-      var maybeTable = domAtPos(table.start).node;
-      var tableRef = maybeTable.closest('table');
-      if (!tableRef || !newTable) {
-        return tr;
-      }
-      var layout = (0, _resizeState.normaliseTableLayout)(tableRef === null || tableRef === void 0 ? void 0 : tableRef.dataset.layout);
-      // The is the width the table can reach before overflowing
-      var maxSize = (0, _misc.getTableMaxWidth)({
-        table: table.node,
-        tableStart: table.start,
-        state: state,
-        layout: layout,
-        getEditorContainerWidth: getEditorContainerWidth
-      });
-      var tableWidth = tableRef.clientWidth || _editorSharedStyles.akEditorDefaultLayoutWidth;
-      var tableMaxWidth = (tableRef === null || tableRef === void 0 || (_tableRef$parentEleme3 = tableRef.parentElement) === null || _tableRef$parentEleme3 === void 0 ? void 0 : _tableRef$parentEleme3.clientWidth) || 0;
-      tableMaxWidth -= _commonStyles.insertColumnButtonOffset;
-      var newTableMap = _tableMap.TableMap.get(newTable);
-      var noOfColumns = newTableMap.width;
-      if (!noOfColumns || noOfColumns <= 0) {
-        return tr;
-      }
-      var columnWidthUnresized = tableWidth / noOfColumns;
-
-      // If the table has not been resized, and the column width is bigger than the minimum column width
-      // we skip updating the size of columns here.
-      if (!(0, _utils.hasTableBeenResized)(table.node) && columnWidthUnresized > _styles.tableCellMinWidth) {
-        return tr;
-      }
-
-      // If the table has not been resized, and the column width is smaller than the minimum column width
-      // Or if the table has been resized, but each column width is either 48px or null
-      // we update the table to have 48px for each column
-      if (!(0, _utils.hasTableBeenResized)(table.node) && columnWidthUnresized <= _styles.tableCellMinWidth || (0, _utils.hasTableBeenResized)(table.node) && (0, _colgroup.isMinCellWidthTable)(table.node)) {
-        var widths = new Array(noOfColumns).fill(_styles.tableCellMinWidth);
-        var cols = widths.map(function (_, index) {
-          return {
-            width: _styles.tableCellMinWidth,
-            minWidth: _styles.tableCellMinWidth,
-            index: index
-          };
-        });
-        var overflow = tableWidth > maxSize;
-        var minWidthResizeState = {
-          cols: cols,
-          widths: widths,
-          maxSize: maxSize,
-          tableWidth: tableWidth,
-          overflow: overflow
-        };
-        return updateColumnWidths(minWidthResizeState, table.node, table.start)(tr);
-      }
-      var resizeState = (0, _resizeState.getResizeState)({
-        minWidth: _styles.tableCellMinWidth,
-        table: table.node,
-        start: table.start,
-        tableRef: tableRef,
-        domAtPos: domAtPos,
-        maxSize: maxSize
-      });
-      var previousTableWidth = resizeState.tableWidth - _tableMap.tableNewColumnMinWidth;
-      var tableDidntPreviouslyOverflow = previousTableWidth <= Math.max(maxSize, tableMaxWidth);
-
-      // If the new table width will result in the table going into an overflow state
-      // we resize the cells to avoid the overflow occuring
-      if (tableDidntPreviouslyOverflow && resizeState.overflow) {
-        resizeState = (0, _scaleTable.scaleTableTo)(resizeState, maxSize);
-      }
-      return updateColumnWidths(resizeState, table.node, table.start)(tr);
-    };
-  };
-};
-var rescaleColumns = exports.rescaleColumns = function rescaleColumns(getEditorContainerWidth) {
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table-update-colwidths-after-column-is-deleted')) {
-    return rescaleColumnsNew();
-  }
-  return rescaleColumnsOld(getEditorContainerWidth);
 };

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

@@ -12,7 +12,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _tableAnalytics = require("../pm-plugins/table-analytics");
 var _columnWidth = require("./column-width");
 var _split = require("./split");
@@ -224,10 +223,8 @@ var deleteColumns = exports.deleteColumns = function deleteColumns(rect, allowCu
       updatedTr = deleteColumnsLegacy(rect)(updatedTr);
     }
     var table = (0, _utils.findTable)(updatedTr.selection);
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table-update-colwidths-after-column-is-deleted')) {
-      if (table) {
-        updatedTr = (0, _columnWidth.rescaleColumns)()(table, view)(updatedTr);
-      }
+    if (table) {
+      updatedTr = (0, _columnWidth.rescaleColumns)()(table, view)(updatedTr);
     }
     return updatedTr;
   };

package/dist/es2019/commands/insert.js

@@ -32,7 +32,7 @@ export function addColumnAt(getEditorContainerWidth) {
       const table = findTable(updatedTr.selection);
       if (table) {
         // [ED-8288] Update colwidths manually to avoid multiple dispatch in TableComponent
-        updatedTr = rescaleColumns(getEditorContainerWidth)(table, view)(updatedTr);
+        updatedTr = rescaleColumns()(table, view)(updatedTr);
       }
       if (getBooleanFF('platform.editor.table.analytics-plugin-moved-event') && view) {
         updatedTr = updateRowOrColumnMovedTransform({

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

@@ -1,12 +1,10 @@
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
-import { akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
-import { TableMap, tableNewColumnMinWidth } from '@atlaskit/editor-tables/table-map';
+import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { hasTableBeenResized } from '../pm-plugins/table-resizing/utils';
 import { isMinCellWidthTable } from '../pm-plugins/table-resizing/utils/colgroup';
-import { getTableMaxWidth } from '../pm-plugins/table-resizing/utils/misc';
-import { getResizeState, normaliseTableLayout } from '../pm-plugins/table-resizing/utils/resize-state';
+import { getResizeState } from '../pm-plugins/table-resizing/utils/resize-state';
 import { scaleTableTo } from '../pm-plugins/table-resizing/utils/scale-table';
 import { insertColumnButtonOffset } from '../ui/common-styles';
 
@@ -87,7 +85,7 @@ export const updateColumnWidths = (resizeState, table, start) => tr => {
  * @param view
  * @returns Updated transaction with rescaled columns for a given table
  */
-export const rescaleColumnsNew = () => (table, view) => tr => {
+export const rescaleColumns = () => (table, view) => tr => {
   var _tableRef$parentEleme, _tableRef$parentEleme2;
   if (!view) {
     return tr;
@@ -105,7 +103,7 @@ export const rescaleColumnsNew = () => (table, view) => tr => {
     // when table is resized the tableRef client width will be 1px larger than colGroup, which is used in calculations
     width: isResized ? tableRef.clientWidth - 1 : tableRef.clientWidth,
     /** the is the width the table can reach before overflowing */
-    possibleMaxWidth: getBooleanFF('platform.editor.custom-table-width') ? (tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$parentEleme = tableRef.parentElement) === null || _tableRef$parentEleme === void 0 ? void 0 : _tableRef$parentEleme.clientWidth) || 0 : ((tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$parentEleme2 = tableRef.parentElement) === null || _tableRef$parentEleme2 === void 0 ? void 0 : _tableRef$parentEleme2.clientWidth) || 0) - insertColumnButtonOffset - 1,
+    possibleMaxWidth: getBooleanFF('platform.editor.custom-table-width') ? (tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$parentEleme = tableRef.parentElement) === null || _tableRef$parentEleme === void 0 ? void 0 : _tableRef$parentEleme.clientWidth) || 0 : ((tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$parentEleme2 = tableRef.parentElement) === null || _tableRef$parentEleme2 === void 0 ? void 0 : _tableRef$parentEleme2.clientWidth) || 0) - insertColumnButtonOffset,
     isResized
   };
 
@@ -161,100 +159,4 @@ export const rescaleColumnsNew = () => (table, view) => tr => {
     resizeState = scaleTableTo(resizeState, previousTableInfo.possibleMaxWidth);
   }
   return updateColumnWidths(resizeState, table.node, table.start)(tr);
-};
-
-/**
- * This function is called when user inserts/deletes a column in a table to;
- * - rescale all columns (if the table did not overflow before the insertion)
- * - and update column widths.
- *
- * This is done manually to avoid a multi-dispatch in TableComponent. See [ED-8288].
- * @param table
- * @param view
- * @returns Updated transaction with rescaled columns for a given table
- */
-export const rescaleColumnsOld = getEditorContainerWidth => (table, view) => tr => {
-  var _tableRef$parentEleme3;
-  if (!view) {
-    return tr;
-  }
-  const pos = table.pos;
-  const newTable = tr.doc.nodeAt(pos);
-  const {
-    state
-  } = view;
-  const domAtPos = view.domAtPos.bind(view);
-  const maybeTable = domAtPos(table.start).node;
-  const tableRef = maybeTable.closest('table');
-  if (!tableRef || !newTable) {
-    return tr;
-  }
-  const layout = normaliseTableLayout(tableRef === null || tableRef === void 0 ? void 0 : tableRef.dataset.layout);
-  // The is the width the table can reach before overflowing
-  const maxSize = getTableMaxWidth({
-    table: table.node,
-    tableStart: table.start,
-    state,
-    layout,
-    getEditorContainerWidth
-  });
-  const tableWidth = tableRef.clientWidth || akEditorDefaultLayoutWidth;
-  let tableMaxWidth = (tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$parentEleme3 = tableRef.parentElement) === null || _tableRef$parentEleme3 === void 0 ? void 0 : _tableRef$parentEleme3.clientWidth) || 0;
-  tableMaxWidth -= insertColumnButtonOffset;
-  const newTableMap = TableMap.get(newTable);
-  const noOfColumns = newTableMap.width;
-  if (!noOfColumns || noOfColumns <= 0) {
-    return tr;
-  }
-  const columnWidthUnresized = tableWidth / noOfColumns;
-
-  // If the table has not been resized, and the column width is bigger than the minimum column width
-  // we skip updating the size of columns here.
-  if (!hasTableBeenResized(table.node) && columnWidthUnresized > tableCellMinWidth) {
-    return tr;
-  }
-
-  // If the table has not been resized, and the column width is smaller than the minimum column width
-  // Or if the table has been resized, but each column width is either 48px or null
-  // we update the table to have 48px for each column
-  if (!hasTableBeenResized(table.node) && columnWidthUnresized <= tableCellMinWidth || hasTableBeenResized(table.node) && isMinCellWidthTable(table.node)) {
-    const widths = new Array(noOfColumns).fill(tableCellMinWidth);
-    const cols = widths.map((_, index) => ({
-      width: tableCellMinWidth,
-      minWidth: tableCellMinWidth,
-      index
-    }));
-    const overflow = tableWidth > maxSize;
-    const minWidthResizeState = {
-      cols,
-      widths,
-      maxSize,
-      tableWidth,
-      overflow
-    };
-    return updateColumnWidths(minWidthResizeState, table.node, table.start)(tr);
-  }
-  let resizeState = getResizeState({
-    minWidth: tableCellMinWidth,
-    table: table.node,
-    start: table.start,
-    tableRef,
-    domAtPos,
-    maxSize
-  });
-  const previousTableWidth = resizeState.tableWidth - tableNewColumnMinWidth;
-  const tableDidntPreviouslyOverflow = previousTableWidth <= Math.max(maxSize, tableMaxWidth);
-
-  // If the new table width will result in the table going into an overflow state
-  // we resize the cells to avoid the overflow occuring
-  if (tableDidntPreviouslyOverflow && resizeState.overflow) {
-    resizeState = scaleTableTo(resizeState, maxSize);
-  }
-  return updateColumnWidths(resizeState, table.node, table.start)(tr);
-};
-export const rescaleColumns = getEditorContainerWidth => {
-  if (getBooleanFF('platform.editor.table-update-colwidths-after-column-is-deleted')) {
-    return rescaleColumnsNew();
-  }
-  return rescaleColumnsOld(getEditorContainerWidth);
 };

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

@@ -3,7 +3,6 @@ import { TABLE_OVERFLOW_CHANGE_TRIGGER } from '@atlaskit/editor-common/analytics
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { META_KEYS } from '../pm-plugins/table-analytics';
 import { rescaleColumns } from './column-width';
 import { splitCellsInColumns } from './split';
@@ -204,10 +203,8 @@ export const deleteColumns = (rect, allowCustomStep, view) => tr => {
     updatedTr = deleteColumnsLegacy(rect)(updatedTr);
   }
   const table = findTable(updatedTr.selection);
-  if (getBooleanFF('platform.editor.table-update-colwidths-after-column-is-deleted')) {
-    if (table) {
-      updatedTr = rescaleColumns()(table, view)(updatedTr);
-    }
+  if (table) {
+    updatedTr = rescaleColumns()(table, view)(updatedTr);
   }
   return updatedTr;
 };

package/dist/esm/commands/insert.js

@@ -34,7 +34,7 @@ export function addColumnAt(getEditorContainerWidth) {
       var table = findTable(updatedTr.selection);
       if (table) {
         // [ED-8288] Update colwidths manually to avoid multiple dispatch in TableComponent
-        updatedTr = rescaleColumns(getEditorContainerWidth)(table, view)(updatedTr);
+        updatedTr = rescaleColumns()(table, view)(updatedTr);
       }
       if (getBooleanFF('platform.editor.table.analytics-plugin-moved-event') && view) {
         updatedTr = updateRowOrColumnMovedTransform({

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

@@ -3,13 +3,11 @@ 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; }
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
-import { akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
-import { TableMap, tableNewColumnMinWidth } from '@atlaskit/editor-tables/table-map';
+import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { hasTableBeenResized } from '../pm-plugins/table-resizing/utils';
 import { isMinCellWidthTable } from '../pm-plugins/table-resizing/utils/colgroup';
-import { getTableMaxWidth } from '../pm-plugins/table-resizing/utils/misc';
-import { getResizeState, normaliseTableLayout } from '../pm-plugins/table-resizing/utils/resize-state';
+import { getResizeState } from '../pm-plugins/table-resizing/utils/resize-state';
 import { scaleTableTo } from '../pm-plugins/table-resizing/utils/scale-table';
 import { insertColumnButtonOffset } from '../ui/common-styles';
 
@@ -89,7 +87,7 @@ export var updateColumnWidths = function updateColumnWidths(resizeState, table,
  * @param view
  * @returns Updated transaction with rescaled columns for a given table
  */
-export var rescaleColumnsNew = function rescaleColumnsNew() {
+export var rescaleColumns = function rescaleColumns() {
   return function (table, view) {
     return function (tr) {
       var _tableRef$parentEleme, _tableRef$parentEleme2;
@@ -109,7 +107,7 @@ export var rescaleColumnsNew = function rescaleColumnsNew() {
         // when table is resized the tableRef client width will be 1px larger than colGroup, which is used in calculations
         width: isResized ? tableRef.clientWidth - 1 : tableRef.clientWidth,
         /** the is the width the table can reach before overflowing */
-        possibleMaxWidth: getBooleanFF('platform.editor.custom-table-width') ? (tableRef === null || tableRef === void 0 || (_tableRef$parentEleme = tableRef.parentElement) === null || _tableRef$parentEleme === void 0 ? void 0 : _tableRef$parentEleme.clientWidth) || 0 : ((tableRef === null || tableRef === void 0 || (_tableRef$parentEleme2 = tableRef.parentElement) === null || _tableRef$parentEleme2 === void 0 ? void 0 : _tableRef$parentEleme2.clientWidth) || 0) - insertColumnButtonOffset - 1,
+        possibleMaxWidth: getBooleanFF('platform.editor.custom-table-width') ? (tableRef === null || tableRef === void 0 || (_tableRef$parentEleme = tableRef.parentElement) === null || _tableRef$parentEleme === void 0 ? void 0 : _tableRef$parentEleme.clientWidth) || 0 : ((tableRef === null || tableRef === void 0 || (_tableRef$parentEleme2 = tableRef.parentElement) === null || _tableRef$parentEleme2 === void 0 ? void 0 : _tableRef$parentEleme2.clientWidth) || 0) - insertColumnButtonOffset,
         isResized: isResized
       };
 
@@ -169,104 +167,4 @@ export var rescaleColumnsNew = function rescaleColumnsNew() {
       return updateColumnWidths(resizeState, table.node, table.start)(tr);
     };
   };
-};
-
-/**
- * This function is called when user inserts/deletes a column in a table to;
- * - rescale all columns (if the table did not overflow before the insertion)
- * - and update column widths.
- *
- * This is done manually to avoid a multi-dispatch in TableComponent. See [ED-8288].
- * @param table
- * @param view
- * @returns Updated transaction with rescaled columns for a given table
- */
-export var rescaleColumnsOld = function rescaleColumnsOld(getEditorContainerWidth) {
-  return function (table, view) {
-    return function (tr) {
-      var _tableRef$parentEleme3;
-      if (!view) {
-        return tr;
-      }
-      var pos = table.pos;
-      var newTable = tr.doc.nodeAt(pos);
-      var state = view.state;
-      var domAtPos = view.domAtPos.bind(view);
-      var maybeTable = domAtPos(table.start).node;
-      var tableRef = maybeTable.closest('table');
-      if (!tableRef || !newTable) {
-        return tr;
-      }
-      var layout = normaliseTableLayout(tableRef === null || tableRef === void 0 ? void 0 : tableRef.dataset.layout);
-      // The is the width the table can reach before overflowing
-      var maxSize = getTableMaxWidth({
-        table: table.node,
-        tableStart: table.start,
-        state: state,
-        layout: layout,
-        getEditorContainerWidth: getEditorContainerWidth
-      });
-      var tableWidth = tableRef.clientWidth || akEditorDefaultLayoutWidth;
-      var tableMaxWidth = (tableRef === null || tableRef === void 0 || (_tableRef$parentEleme3 = tableRef.parentElement) === null || _tableRef$parentEleme3 === void 0 ? void 0 : _tableRef$parentEleme3.clientWidth) || 0;
-      tableMaxWidth -= insertColumnButtonOffset;
-      var newTableMap = TableMap.get(newTable);
-      var noOfColumns = newTableMap.width;
-      if (!noOfColumns || noOfColumns <= 0) {
-        return tr;
-      }
-      var columnWidthUnresized = tableWidth / noOfColumns;
-
-      // If the table has not been resized, and the column width is bigger than the minimum column width
-      // we skip updating the size of columns here.
-      if (!hasTableBeenResized(table.node) && columnWidthUnresized > tableCellMinWidth) {
-        return tr;
-      }
-
-      // If the table has not been resized, and the column width is smaller than the minimum column width
-      // Or if the table has been resized, but each column width is either 48px or null
-      // we update the table to have 48px for each column
-      if (!hasTableBeenResized(table.node) && columnWidthUnresized <= tableCellMinWidth || hasTableBeenResized(table.node) && isMinCellWidthTable(table.node)) {
-        var widths = new Array(noOfColumns).fill(tableCellMinWidth);
-        var cols = widths.map(function (_, index) {
-          return {
-            width: tableCellMinWidth,
-            minWidth: tableCellMinWidth,
-            index: index
-          };
-        });
-        var overflow = tableWidth > maxSize;
-        var minWidthResizeState = {
-          cols: cols,
-          widths: widths,
-          maxSize: maxSize,
-          tableWidth: tableWidth,
-          overflow: overflow
-        };
-        return updateColumnWidths(minWidthResizeState, table.node, table.start)(tr);
-      }
-      var resizeState = getResizeState({
-        minWidth: tableCellMinWidth,
-        table: table.node,
-        start: table.start,
-        tableRef: tableRef,
-        domAtPos: domAtPos,
-        maxSize: maxSize
-      });
-      var previousTableWidth = resizeState.tableWidth - tableNewColumnMinWidth;
-      var tableDidntPreviouslyOverflow = previousTableWidth <= Math.max(maxSize, tableMaxWidth);
-
-      // If the new table width will result in the table going into an overflow state
-      // we resize the cells to avoid the overflow occuring
-      if (tableDidntPreviouslyOverflow && resizeState.overflow) {
-        resizeState = scaleTableTo(resizeState, maxSize);
-      }
-      return updateColumnWidths(resizeState, table.node, table.start)(tr);
-    };
-  };
-};
-export var rescaleColumns = function rescaleColumns(getEditorContainerWidth) {
-  if (getBooleanFF('platform.editor.table-update-colwidths-after-column-is-deleted')) {
-    return rescaleColumnsNew();
-  }
-  return rescaleColumnsOld(getEditorContainerWidth);
 };

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

@@ -7,7 +7,6 @@ import { TABLE_OVERFLOW_CHANGE_TRIGGER } from '@atlaskit/editor-common/analytics
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { META_KEYS } from '../pm-plugins/table-analytics';
 import { rescaleColumns } from './column-width';
 import { splitCellsInColumns } from './split';
@@ -217,10 +216,8 @@ export var deleteColumns = function deleteColumns(rect, allowCustomStep, view) {
       updatedTr = deleteColumnsLegacy(rect)(updatedTr);
     }
     var table = findTable(updatedTr.selection);
-    if (getBooleanFF('platform.editor.table-update-colwidths-after-column-is-deleted')) {
-      if (table) {
-        updatedTr = rescaleColumns()(table, view)(updatedTr);
-      }
+    if (table) {
+      updatedTr = rescaleColumns()(table, view)(updatedTr);
     }
     return updatedTr;
   };

package/dist/types/transforms/column-width.d.ts

@@ -1,4 +1,3 @@
-import type { GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
@@ -22,16 +21,4 @@ export declare const updateColumnWidths: (resizeState: ResizeState, table: PMNod
  * @param view
  * @returns Updated transaction with rescaled columns for a given table
  */
-export declare const rescaleColumnsNew: () => (table: ContentNodeWithPos, view: EditorView | undefined) => (tr: Transaction) => Transaction;
-/**
- * This function is called when user inserts/deletes a column in a table to;
- * - rescale all columns (if the table did not overflow before the insertion)
- * - and update column widths.
- *
- * This is done manually to avoid a multi-dispatch in TableComponent. See [ED-8288].
- * @param table
- * @param view
- * @returns Updated transaction with rescaled columns for a given table
- */
-export declare const rescaleColumnsOld: (getEditorContainerWidth: GetEditorContainerWidth) => (table: ContentNodeWithPos, view: EditorView | undefined) => (tr: Transaction) => Transaction;
-export declare const rescaleColumns: (getEditorContainerWidth?: GetEditorContainerWidth) => (table: ContentNodeWithPos, view: EditorView | undefined) => (tr: Transaction) => Transaction;
+export declare const rescaleColumns: () => (table: ContentNodeWithPos, view: EditorView | undefined) => (tr: Transaction) => Transaction;

package/dist/types-ts4.5/transforms/column-width.d.ts

@@ -1,4 +1,3 @@
-import type { GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
@@ -22,16 +21,4 @@ export declare const updateColumnWidths: (resizeState: ResizeState, table: PMNod
  * @param view
  * @returns Updated transaction with rescaled columns for a given table
  */
-export declare const rescaleColumnsNew: () => (table: ContentNodeWithPos, view: EditorView | undefined) => (tr: Transaction) => Transaction;
-/**
- * This function is called when user inserts/deletes a column in a table to;
- * - rescale all columns (if the table did not overflow before the insertion)
- * - and update column widths.
- *
- * This is done manually to avoid a multi-dispatch in TableComponent. See [ED-8288].
- * @param table
- * @param view
- * @returns Updated transaction with rescaled columns for a given table
- */
-export declare const rescaleColumnsOld: (getEditorContainerWidth: GetEditorContainerWidth) => (table: ContentNodeWithPos, view: EditorView | undefined) => (tr: Transaction) => Transaction;
-export declare const rescaleColumns: (getEditorContainerWidth?: GetEditorContainerWidth) => (table: ContentNodeWithPos, view: EditorView | undefined) => (tr: Transaction) => Transaction;
+export declare const rescaleColumns: () => (table: ContentNodeWithPos, view: EditorView | undefined) => (tr: Transaction) => Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "5.7.3",
+  "version": "5.7.4",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -125,9 +125,6 @@
     "platform.editor.table.shift-arrowup-fix": {
       "type": "boolean"
     },
-    "platform.editor.table-update-colwidths-after-column-is-deleted": {
-      "type": "boolean"
-    },
     "platform.editor.table.alternative-sticky-header-logic": {
       "type": "boolean"
     },

package/src/__tests__/unit/commands/insert.ts

@@ -69,6 +69,11 @@ describe('table plugin: insert', () => {
       });
 
     it('does scale cells in tables which are not overflowing', () => {
+      jest
+        .spyOn(HTMLElement.prototype, 'clientWidth', 'get')
+        .mockImplementationOnce(() => 760)
+        .mockImplementationOnce(() => 770);
+
       const { editorView } = editor(
         doc(
           table({ localId: TABLE_LOCAL_ID })(
@@ -97,6 +102,8 @@ describe('table plugin: insert', () => {
       expect(updatedLastTableCellNode?.attrs.colwidth[0]).not.toBe(
         lastTableCellNode?.attrs.colwidth[0],
       );
+
+      jest.restoreAllMocks();
     });
 
     it('does not scale cells in tables which are overflowing', () => {