handsontable 0.0.0-next-3d099da-20231208 → 0.0.0-next-51d3397-20231211

package/3rdparty/walkontable/src/core/_base.mjs

@@ -230,30 +230,24 @@ export default class CoreAbstract {
       get drawn() {
         return wot.drawn; // TODO refactoring: consider about injecting `isDrawn` function : ()=>return wot.drawn. (it'll enables remove dao layer)
       },
-
       get topOverlay() {
         return wot.wtOverlays.topOverlay; // TODO refactoring: move outside dao, use IOC
       },
-
       get inlineStartOverlay() {
         return wot.wtOverlays.inlineStartOverlay; // TODO refactoring: move outside dao, use IOC
       },
-
       get wtTable() {
         return wot.wtTable; // TODO refactoring: move outside dao, use IOC
       },
-
       get wtViewport() {
         return wot.wtViewport; // TODO refactoring: move outside dao, use IOC
       },
-
       get wtSettings() {
         return wot.wtSettings;
       },
       get rootWindow() {
         return wot.domBindings.rootWindow; // TODO refactoring: move outside dao
       },
-
       // TODO refactoring, consider about using injecting wtSettings into scroll (it'll enables remove dao layer)
       get totalRows() {
         return wot.wtSettings.getSetting('totalRows');
@@ -289,26 +283,21 @@ export default class CoreAbstract {
       get parentTableOffset() {
         return wot.cloneSource.wtTable.tableOffset; // TODO rethink: cloneSource exists only in Clone type.
       },
-
       get cloneSource() {
         return wot.cloneSource; // TODO rethink: cloneSource exists only in Clone type.
       },
-
       get workspaceWidth() {
         return wot.wtViewport.getWorkspaceWidth();
       },
       get wtViewport() {
         return wot.wtViewport; // TODO refactoring: move outside dao, use IOC
       },
-
       get wtOverlays() {
         return wot.wtOverlays; // TODO refactoring: move outside dao, use IOC
       },
-
       get selectionManager() {
         return wot.selectionManager; // TODO refactoring: move outside dao, use IOC
       },
-
       get drawn() {
         return wot.drawn;
       },
@@ -319,7 +308,6 @@ export default class CoreAbstract {
       get wtTable() {
         return wot.wtTable; // TODO refactoring: it provides itself
       },
-
       get startColumnRendered() {
         return wot.wtViewport.columnsRenderCalculator.startColumn;
       },

package/3rdparty/walkontable/src/core/core.js

@@ -85,11 +85,9 @@ class Walkontable extends _base.default {
       get topOverlay() {
         return wot.wtOverlays.topOverlay; // TODO refactoring: move outside dao, use IOC
       },
-
       get inlineStartOverlay() {
         return wot.wtOverlays.inlineStartOverlay; // TODO refactoring: move outside dao, use IOC
       },
-
       get bottomOverlay() {
         return wot.wtOverlays.bottomOverlay; // TODO refactoring: move outside dao, use IOC
       }

package/3rdparty/walkontable/src/core/core.mjs

@@ -81,11 +81,9 @@ export default class Walkontable extends CoreAbstract {
       get topOverlay() {
         return wot.wtOverlays.topOverlay; // TODO refactoring: move outside dao, use IOC
       },
-
       get inlineStartOverlay() {
         return wot.wtOverlays.inlineStartOverlay; // TODO refactoring: move outside dao, use IOC
       },
-
       get bottomOverlay() {
         return wot.wtOverlays.bottomOverlay; // TODO refactoring: move outside dao, use IOC
       }

package/3rdparty/walkontable/src/facade/core.js

@@ -41,39 +41,30 @@ class WalkontableFacade {
   get wtSettings() {
     return this._wot.wtSettings; // todo create facade
   }
-
   get cloneSource() {
     return this._wot.cloneSource; // todo create facade
   }
-
   get cloneOverlay() {
     return this._wot.cloneOverlay; // todo create facade
   }
-
   get selectionManager() {
     return this._wot.selectionManager; // todo create facade
   }
-
   get wtViewport() {
     return this._wot.wtViewport; // todo create facade
   }
-
   get wtOverlays() {
     return this._wot.wtOverlays; // todo create facade
   }
-
   get wtTable() {
     return this._wot.wtTable; // todo create facade
   }
-
   get wtEvent() {
     return this._wot.wtEvent; // todo create facade
   }
-
   get wtScroll() {
     return this._wot.wtScroll; // todo create facade
   }
-
   get drawn() {
     return this._wot.drawn;
   }

package/3rdparty/walkontable/src/facade/core.mjs

@@ -37,39 +37,30 @@ export default class WalkontableFacade {
   get wtSettings() {
     return this._wot.wtSettings; // todo create facade
   }
-
   get cloneSource() {
     return this._wot.cloneSource; // todo create facade
   }
-
   get cloneOverlay() {
     return this._wot.cloneOverlay; // todo create facade
   }
-
   get selectionManager() {
     return this._wot.selectionManager; // todo create facade
   }
-
   get wtViewport() {
     return this._wot.wtViewport; // todo create facade
   }
-
   get wtOverlays() {
     return this._wot.wtOverlays; // todo create facade
   }
-
   get wtTable() {
     return this._wot.wtTable; // todo create facade
   }
-
   get wtEvent() {
     return this._wot.wtEvent; // todo create facade
   }
-
   get wtScroll() {
     return this._wot.wtScroll; // todo create facade
   }
-
   get drawn() {
     return this._wot.drawn;
   }

package/3rdparty/walkontable/src/index.js

@@ -1,10 +1,9 @@
 "use strict";
 
 exports.__esModule = true;
-var _viewportColumns = _interopRequireDefault(require("./calculator/viewportColumns"));
-exports.ViewportColumnsCalculator = _viewportColumns.default;
-var _viewportRows = _interopRequireDefault(require("./calculator/viewportRows"));
-exports.ViewportRowsCalculator = _viewportRows.default;
+var _calculator = require("./calculator");
+exports.ViewportColumnsCalculator = _calculator.ViewportColumnsCalculator;
+exports.ViewportRowsCalculator = _calculator.ViewportRowsCalculator;
 var _coords = _interopRequireDefault(require("./cell/coords"));
 exports.CellCoords = _coords.default;
 var _range = _interopRequireDefault(require("./cell/range"));

package/3rdparty/walkontable/src/index.mjs

@@ -1,5 +1,4 @@
-import ViewportColumnsCalculator from "./calculator/viewportColumns.mjs";
-import ViewportRowsCalculator from "./calculator/viewportRows.mjs";
+import { ViewportColumnsCalculator, ViewportRowsCalculator } from "./calculator/index.mjs";
 import CellCoords from "./cell/coords.mjs";
 import CellRange from "./cell/range.mjs";
 import Walkontable from "./facade/core.mjs";

package/3rdparty/walkontable/src/overlays.js

@@ -226,7 +226,6 @@ class Overlays {
     if (this.verticalScrolling) {
       this.inlineStartOverlay.onScroll(); // todo the inlineStartOverlay.onScroll() fires hook. Why is it needed there, not in any another place?
     }
-
     if (this.horizontalScrolling) {
       this.topOverlay.onScroll();
     }
@@ -456,11 +455,9 @@ class Overlays {
     if (this.topOverlay.needFullRender) {
       this.topOverlay.clone.wtTable.holder.scrollLeft = scrollLeft; // todo rethink, *overlay.setScroll*()
     }
-
     if (this.bottomOverlay.needFullRender) {
       this.bottomOverlay.clone.wtTable.holder.scrollLeft = scrollLeft; // todo rethink, *overlay.setScroll*()
     }
-
     if (this.inlineStartOverlay.needFullRender) {
       this.inlineStartOverlay.clone.wtTable.holder.scrollTop = scrollTop; // todo rethink, *overlay.setScroll*()
     }

package/3rdparty/walkontable/src/overlays.mjs

@@ -223,7 +223,6 @@ class Overlays {
     if (this.verticalScrolling) {
       this.inlineStartOverlay.onScroll(); // todo the inlineStartOverlay.onScroll() fires hook. Why is it needed there, not in any another place?
     }
-
     if (this.horizontalScrolling) {
       this.topOverlay.onScroll();
     }
@@ -453,11 +452,9 @@ class Overlays {
     if (this.topOverlay.needFullRender) {
       this.topOverlay.clone.wtTable.holder.scrollLeft = scrollLeft; // todo rethink, *overlay.setScroll*()
     }
-
     if (this.bottomOverlay.needFullRender) {
       this.bottomOverlay.clone.wtTable.holder.scrollLeft = scrollLeft; // todo rethink, *overlay.setScroll*()
     }
-
     if (this.inlineStartOverlay.needFullRender) {
       this.inlineStartOverlay.clone.wtTable.holder.scrollTop = scrollTop; // todo rethink, *overlay.setScroll*()
     }
@@ -645,5 +642,4 @@ class Overlays {
     });
   }
 }
-
 export default Overlays;

package/3rdparty/walkontable/src/renderer/colGroup.js

@@ -2,8 +2,12 @@
 
 exports.__esModule = true;
 var _base = _interopRequireDefault(require("./_base"));
+var _console = require("./../../../../helpers/console");
+var _templateLiteralTag = require("./../../../../helpers/templateLiteralTag");
 var _element = require("./../../../../helpers/dom/element");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+let performanceWarningAppeared = false;
+
 /**
  * Colgroup renderer responsible for managing (inserting, tracking, rendering) COL elements.
  *
@@ -49,6 +53,12 @@ class ColGroupRenderer extends _base.default {
       columnsToRender,
       rowHeadersCount
     } = this.table;
+    if (!performanceWarningAppeared && columnsToRender > 1000) {
+      performanceWarningAppeared = true;
+      (0, _console.warn)((0, _templateLiteralTag.toSingleLine)`Performance tip: Handsontable rendered more than 1000 visible columns.\x20
+        Consider limiting the number of rendered columns by specifying the table width and/or\x20
+        turning off the "renderAllColumns" option.`);
+    }
 
     // Render column nodes for row headers
     for (let visibleColumnIndex = 0; visibleColumnIndex < rowHeadersCount; visibleColumnIndex++) {

package/3rdparty/walkontable/src/renderer/colGroup.mjs

@@ -1,5 +1,9 @@
 import BaseRenderer from "./_base.mjs";
+import { warn } from "./../../../../helpers/console.mjs";
+import { toSingleLine } from "./../../../../helpers/templateLiteralTag.mjs";
 import { addClass } from "./../../../../helpers/dom/element.mjs";
+let performanceWarningAppeared = false;
+
 /**
  * Colgroup renderer responsible for managing (inserting, tracking, rendering) COL elements.
  *
@@ -45,6 +49,12 @@ export default class ColGroupRenderer extends BaseRenderer {
       columnsToRender,
       rowHeadersCount
     } = this.table;
+    if (!performanceWarningAppeared && columnsToRender > 1000) {
+      performanceWarningAppeared = true;
+      warn(toSingleLine`Performance tip: Handsontable rendered more than 1000 visible columns.\x20
+        Consider limiting the number of rendered columns by specifying the table width and/or\x20
+        turning off the "renderAllColumns" option.`);
+    }
 
     // Render column nodes for row headers
     for (let visibleColumnIndex = 0; visibleColumnIndex < rowHeadersCount; visibleColumnIndex++) {

package/3rdparty/walkontable/src/renderer/rows.js

@@ -2,10 +2,10 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
+var _base = _interopRequireDefault(require("./_base"));
 var _console = require("./../../../../helpers/console");
 var _templateLiteralTag = require("./../../../../helpers/templateLiteralTag");
 var _orderView = require("./../utils/orderView");
-var _base = _interopRequireDefault(require("./_base"));
 var _element = require("../../../../helpers/dom/element");
 var _a11y = require("../../../../helpers/a11y");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -57,8 +57,9 @@ class RowsRenderer extends _base.default {
     } = this.table;
     if (!performanceWarningAppeared && rowsToRender > 1000) {
       performanceWarningAppeared = true;
-      (0, _console.warn)((0, _templateLiteralTag.toSingleLine)`Performance tip: Handsontable rendered more than 1000 visible rows. Consider limiting\x20
-        the number of rendered rows by specifying the table height and/or turning off the "renderAllRows" option.`);
+      (0, _console.warn)((0, _templateLiteralTag.toSingleLine)`Performance tip: Handsontable rendered more than 1000 visible rows.\x20
+        Consider limiting the number of rendered rows by specifying the table height and/or\x20
+        turning off the "renderAllRows" option.`);
     }
     if (this.table.isAriaEnabled()) {
       (0, _element.setAttribute)(this.rootNode, [(0, _a11y.A11Y_ROWGROUP)()]);

package/3rdparty/walkontable/src/renderer/rows.mjs

@@ -2,10 +2,10 @@ import "core-js/modules/es.error.cause.js";
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import BaseRenderer from "./_base.mjs";
 import { warn } from "./../../../../helpers/console.mjs";
 import { toSingleLine } from "./../../../../helpers/templateLiteralTag.mjs";
 import { OrderView } from "./../utils/orderView/index.mjs";
-import BaseRenderer from "./_base.mjs";
 import { setAttribute } from "../../../../helpers/dom/element.mjs";
 import { A11Y_ROW, A11Y_ROWGROUP, A11Y_ROWINDEX } from "../../../../helpers/a11y.mjs";
 let performanceWarningAppeared = false;
@@ -53,8 +53,9 @@ export default class RowsRenderer extends BaseRenderer {
     } = this.table;
     if (!performanceWarningAppeared && rowsToRender > 1000) {
       performanceWarningAppeared = true;
-      warn(toSingleLine`Performance tip: Handsontable rendered more than 1000 visible rows. Consider limiting\x20
-        the number of rendered rows by specifying the table height and/or turning off the "renderAllRows" option.`);
+      warn(toSingleLine`Performance tip: Handsontable rendered more than 1000 visible rows.\x20
+        Consider limiting the number of rendered rows by specifying the table height and/or\x20
+        turning off the "renderAllRows" option.`);
     }
     if (this.table.isAriaEnabled()) {
       setAttribute(this.rootNode, [A11Y_ROWGROUP()]);

package/3rdparty/walkontable/src/selection/manager.js

@@ -208,7 +208,6 @@ class SelectionManager {
         borderInstance === null || borderInstance === void 0 || borderInstance.disappear();
         continue; // eslint-disable-line no-continue
       }
-
       if (className) {
         const elements = _classPrivateFieldGet(this, _scanner).setActiveSelection(selection).scan();
         elements.forEach(element => {

package/3rdparty/walkontable/src/selection/manager.mjs

@@ -204,7 +204,6 @@ export class SelectionManager {
         borderInstance === null || borderInstance === void 0 || borderInstance.disappear();
         continue; // eslint-disable-line no-continue
       }
-
       if (className) {
         const elements = _classPrivateFieldGet(this, _scanner).setActiveSelection(selection).scan();
         elements.forEach(element => {

package/3rdparty/walkontable/src/settings.js

@@ -36,6 +36,7 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
  * @property {Option} onBeforeStretchingColumnWidth Option `onBeforeStretchingColumnWidth`.
  * @property {Option} preventOverflow Option `preventOverflow`.
  * @property {Option} preventWheel Option `preventWheel`.
+ * @property {Option} renderAllColumns Option `renderAllColumns`.
  * @property {Option} renderAllRows Option `renderAllRows`.
  * @property {Option} rowHeaders Option `rowHeaders`.
  * @property {Option} rowHeight Option `,`.
@@ -80,6 +81,7 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
  * @template TValue.
  * @typedef { TValue | Array.<TValue> | (function(...*): TValue) } Option
  */
+
 /**
  * @class Settings
  */
@@ -218,6 +220,7 @@ class Settings {
       onBeforeHighlightingColumnHeader: sourceCol => sourceCol,
       onWindowResize: null,
       onContainerElementResize: null,
+      renderAllColumns: false,
       renderAllRows: false,
       groups: false,
       rowHeaderWidth: null,

package/3rdparty/walkontable/src/settings.mjs

@@ -33,6 +33,7 @@ import { objectEach } from "../../../helpers/object.mjs";
  * @property {Option} onBeforeStretchingColumnWidth Option `onBeforeStretchingColumnWidth`.
  * @property {Option} preventOverflow Option `preventOverflow`.
  * @property {Option} preventWheel Option `preventWheel`.
+ * @property {Option} renderAllColumns Option `renderAllColumns`.
  * @property {Option} renderAllRows Option `renderAllRows`.
  * @property {Option} rowHeaders Option `rowHeaders`.
  * @property {Option} rowHeight Option `,`.
@@ -214,6 +215,7 @@ export default class Settings {
       onBeforeHighlightingColumnHeader: sourceCol => sourceCol,
       onWindowResize: null,
       onContainerElementResize: null,
+      renderAllColumns: false,
       renderAllRows: false,
       groups: false,
       rowHeaderWidth: null,

package/3rdparty/walkontable/src/table.js

@@ -96,7 +96,6 @@ class Table {
     if (this.isMaster) {
       this.alignOverlaysWithTrimmingContainer(); // todo wow, It calls method from child class (MasterTable).
     }
-
     this.fixTableDomTree();
     this.rowFilter = null; // TODO refactoring, eliminate all (re)creations of this object, then updates state when needed.
     this.columnFilter = null; // TODO refactoring, eliminate all (re)creations of this object, then updates state when needed.

package/3rdparty/walkontable/src/table.mjs

@@ -92,7 +92,6 @@ class Table {
     if (this.isMaster) {
       this.alignOverlaysWithTrimmingContainer(); // todo wow, It calls method from child class (MasterTable).
     }
-
     this.fixTableDomTree();
     this.rowFilter = null; // TODO refactoring, eliminate all (re)creations of this object, then updates state when needed.
     this.columnFilter = null; // TODO refactoring, eliminate all (re)creations of this object, then updates state when needed.

package/3rdparty/walkontable/src/utils/column.js

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 var _element = require("./../../../../helpers/dom/element");
+var _columnStretching = require("./columnStretching");
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
@@ -29,8 +30,18 @@ class ColumnUtils {
      * @type {Map<number, number>}
      */
     _defineProperty(this, "headerWidths", new Map());
+    /**
+     * @type {ColumnStretching}
+     */
+    _defineProperty(this, "stretching", void 0);
     this.dataAccessObject = dataAccessObject;
     this.wtSettings = wtSettings;
+    this.stretching = new _columnStretching.ColumnStretching({
+      totalColumns: () => this.wtSettings.getSetting('totalColumns'),
+      stretchMode: () => this.wtSettings.getSetting('stretchH'),
+      stretchingColumnWidthFn: (stretchedWidth, column) => this.wtSettings.getSetting('onBeforeStretchingColumnWidth', stretchedWidth, column),
+      columnWidthFn: sourceCol => this.dataAccessObject.wtTable.getColumnWidth(sourceCol)
+    });
   }
 
   /**
@@ -50,13 +61,10 @@ class ColumnUtils {
    * @returns {number}
    */
   getStretchedColumnWidth(sourceIndex) {
-    const calculator = this.dataAccessObject.wtViewport.columnsRenderCalculator;
     let width = this.getWidth(sourceIndex);
-    if (calculator) {
-      const stretchedWidth = calculator.getStretchedColumnWidth(sourceIndex, width);
-      if (stretchedWidth) {
-        width = stretchedWidth;
-      }
+    const stretchedWidth = this.stretching.getStretchedColumnWidth(sourceIndex, width);
+    if (stretchedWidth) {
+      width = stretchedWidth;
     }
     return width;
   }
@@ -87,12 +95,9 @@ class ColumnUtils {
   }
 
   /**
-   * Calculates column header widths that can be retrieved from the cache.
+   * Refreshes the stretching column width by recalculating the widths of the columns.
    */
-  calculateWidths() {
-    const {
-      wtSettings
-    } = this;
+  refreshStretching() {
     const {
       wtTable,
       wtViewport,
@@ -100,8 +105,18 @@ class ColumnUtils {
     } = this.dataAccessObject;
     const mainHolder = cloneSource ? cloneSource.wtTable.holder : wtTable.holder;
     const scrollbarCompensation = mainHolder.offsetHeight < mainHolder.scrollHeight ? (0, _element.getScrollbarWidth)() : 0;
+    this.stretching.refreshStretching(wtViewport.getViewportWidth() - scrollbarCompensation);
+  }
+
+  /**
+   * Calculates column header widths that can be retrieved from the cache.
+   */
+  calculateWidths() {
+    const {
+      wtSettings
+    } = this;
     let rowHeaderWidthSetting = wtSettings.getSetting('rowHeaderWidth');
-    wtViewport.columnsRenderCalculator.refreshStretching(wtViewport.getViewportWidth() - scrollbarCompensation);
+    this.refreshStretching();
     rowHeaderWidthSetting = wtSettings.getSetting('onModifyRowHeaderWidth', rowHeaderWidthSetting);
     if (rowHeaderWidthSetting !== null && rowHeaderWidthSetting !== undefined) {
       const rowHeadersCount = wtSettings.getSetting('rowHeaders').length;

package/3rdparty/walkontable/src/utils/column.mjs

@@ -3,6 +3,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { getScrollbarWidth } from "./../../../../helpers/dom/element.mjs";
+import { ColumnStretching } from "./columnStretching.mjs";
 /**
  * Column utils class contains all necessary information about sizes of the columns.
  *
@@ -26,8 +27,18 @@ export default class ColumnUtils {
      * @type {Map<number, number>}
      */
     _defineProperty(this, "headerWidths", new Map());
+    /**
+     * @type {ColumnStretching}
+     */
+    _defineProperty(this, "stretching", void 0);
     this.dataAccessObject = dataAccessObject;
     this.wtSettings = wtSettings;
+    this.stretching = new ColumnStretching({
+      totalColumns: () => this.wtSettings.getSetting('totalColumns'),
+      stretchMode: () => this.wtSettings.getSetting('stretchH'),
+      stretchingColumnWidthFn: (stretchedWidth, column) => this.wtSettings.getSetting('onBeforeStretchingColumnWidth', stretchedWidth, column),
+      columnWidthFn: sourceCol => this.dataAccessObject.wtTable.getColumnWidth(sourceCol)
+    });
   }
 
   /**
@@ -47,13 +58,10 @@ export default class ColumnUtils {
    * @returns {number}
    */
   getStretchedColumnWidth(sourceIndex) {
-    const calculator = this.dataAccessObject.wtViewport.columnsRenderCalculator;
     let width = this.getWidth(sourceIndex);
-    if (calculator) {
-      const stretchedWidth = calculator.getStretchedColumnWidth(sourceIndex, width);
-      if (stretchedWidth) {
-        width = stretchedWidth;
-      }
+    const stretchedWidth = this.stretching.getStretchedColumnWidth(sourceIndex, width);
+    if (stretchedWidth) {
+      width = stretchedWidth;
     }
     return width;
   }
@@ -84,12 +92,9 @@ export default class ColumnUtils {
   }
 
   /**
-   * Calculates column header widths that can be retrieved from the cache.
+   * Refreshes the stretching column width by recalculating the widths of the columns.
    */
-  calculateWidths() {
-    const {
-      wtSettings
-    } = this;
+  refreshStretching() {
     const {
       wtTable,
       wtViewport,
@@ -97,8 +102,18 @@ export default class ColumnUtils {
     } = this.dataAccessObject;
     const mainHolder = cloneSource ? cloneSource.wtTable.holder : wtTable.holder;
     const scrollbarCompensation = mainHolder.offsetHeight < mainHolder.scrollHeight ? getScrollbarWidth() : 0;
+    this.stretching.refreshStretching(wtViewport.getViewportWidth() - scrollbarCompensation);
+  }
+
+  /**
+   * Calculates column header widths that can be retrieved from the cache.
+   */
+  calculateWidths() {
+    const {
+      wtSettings
+    } = this;
     let rowHeaderWidthSetting = wtSettings.getSetting('rowHeaderWidth');
-    wtViewport.columnsRenderCalculator.refreshStretching(wtViewport.getViewportWidth() - scrollbarCompensation);
+    this.refreshStretching();
     rowHeaderWidthSetting = wtSettings.getSetting('onModifyRowHeaderWidth', rowHeaderWidthSetting);
     if (rowHeaderWidthSetting !== null && rowHeaderWidthSetting !== undefined) {
       const rowHeadersCount = wtSettings.getSetting('rowHeaders').length;