handsontable 14.6.1 → 15.0.0-next-fdd4480-20241205

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

@@ -16,12 +16,10 @@ import { objectEach } from "../../../helpers/object.mjs";
  * @property {Option} currentRowClassName Option `currentRowClassName`.
  * @property {Option} data Option `data`.
  * @property {Option} defaultColumnWidth Option `defaultColumnWidth`.
- * @property {Option} defaultRowHeight Option `defaultRowHeight`.
  * @property {Option} externalRowCalculator Option `externalRowCalculator`.
  * @property {Option} fixedColumnsStart Option `fixedColumnsStart`.
  * @property {Option} fixedRowsBottom Option `fixedRowsBottom`.
  * @property {Option} fixedRowsTop Option `fixedRowsTop`.
- * @property {Option} freezeOverlays Option `freezeOverlays`.
  * @property {Option} groups Option `groups`.
  * @property {Option} hideBorderOnMouseDownOver Option `hideBorderOnMouseDownOver`.
  * @property {Option} isRtl Option `isRtl`.
@@ -30,7 +28,6 @@ import { objectEach } from "../../../helpers/object.mjs";
  * @property {Option} onBeforeHighlightingColumnHeader Option `onBeforeHighlightingColumnHeader`.
  * @property {Option} onBeforeHighlightingRowHeader Option `onBeforeHighlightingRowHeader`.
  * @property {Option} onBeforeRemoveCellClassNames Option `onBeforeRemoveCellClassNames`.
- * @property {Option} onBeforeStretchingColumnWidth Option `onBeforeStretchingColumnWidth`.
  * @property {Option} preventOverflow Option `preventOverflow`.
  * @property {Option} preventWheel Option `preventWheel`.
  * @property {Option} renderAllColumns Option `renderAllColumns`.
@@ -41,7 +38,6 @@ import { objectEach } from "../../../helpers/object.mjs";
  * @property {Option} shouldRenderBottomOverlay Option `shouldRenderBottomOverlay`.
  * @property {Option} shouldRenderInlineStartOverlay Option `shouldRenderInlineStartOverlay`.
  * @property {Option} shouldRenderTopOverlay Option `shouldRenderTopOverlay`.
- * @property {Option} stretchH Option `stretchH`.
  * @property {Option} table Option `table`.
  * @property {Option} totalColumns Option `totalColumns`.
  * @property {Option} totalRows Option `totalRows`.
@@ -63,6 +59,8 @@ import { objectEach } from "../../../helpers/object.mjs";
  * @property {?Option} onCellMouseUp Option `onCellMouseUp`.
  * @property {?Option} onDraw Option `onDraw`.
  * @property {?Option} onModifyGetCellCoords Option `onModifyGetCellCoords`.
+ * @property {?Option} onModifyGetCoordsElement Option `onModifyGetCoordsElement`.
+ * @property {?Option} onModifyGetCoords Option `onModifyGetCoords`.
  * @property {?Option} onModifyRowHeaderWidth Option `onModifyRowHeaderWidth`.
  * @property {?Option} onBeforeViewportScrollHorizontally Option `onBeforeViewportScrollHorizontally`.
  * @property {?Option} onBeforeViewportScrollVertically Option `onBeforeViewportScrollVertically`.
@@ -73,6 +71,8 @@ import { objectEach } from "../../../helpers/object.mjs";
  * @property {?Option} selections Option `selections`.
  * @property {?Option} viewportColumnCalculatorOverride Option `viewportColumnCalculatorOverride`.
  * @property {?Option} viewportRowCalculatorOverride Option `viewportRowCalculatorOverride`.
+ * @property {?Option} viewportColumnRenderingThreshold Option `viewportColumnRenderingThreshold`.
+ * @property {?Option} viewportRowRenderingThreshold Option `viewportRowRenderingThreshold`.
  */
 /**
  * @template TValue.
@@ -128,8 +128,6 @@ export default class Settings {
       isDataViewInstance: true,
       // presentation mode
       externalRowCalculator: false,
-      stretchH: 'none',
-      // values: all, last, none
       currentRowClassName: null,
       currentColumnClassName: null,
       preventOverflow() {
@@ -138,7 +136,6 @@ export default class Settings {
       preventWheel: false,
       // data source
       data: undefined,
-      freezeOverlays: false,
       // Number of renderable columns for the left overlay.
       fixedColumnsStart: 0,
       // Number of renderable rows for the top overlay.
@@ -182,12 +179,13 @@ export default class Settings {
       rowHeightByOverlayName() {
         // return undefined means use default size for the rendered cell content
       },
-      defaultRowHeight: 23,
       defaultColumnWidth: 50,
       selections: null,
       hideBorderOnMouseDownOver: false,
       viewportRowCalculatorOverride: null,
       viewportColumnCalculatorOverride: null,
+      viewportRowRenderingThreshold: null,
+      viewportColumnRenderingThreshold: null,
       // callbacks
       onCellMouseDown: null,
       onCellContextMenu: null,
@@ -212,9 +210,10 @@ export default class Settings {
       //
       onBeforeTouchScroll: null,
       onAfterMomentumScroll: null,
-      onBeforeStretchingColumnWidth: width => width,
       onModifyRowHeaderWidth: null,
       onModifyGetCellCoords: null,
+      onModifyGetCoordsElement: null,
+      onModifyGetCoords: null,
       onBeforeHighlightingRowHeader: sourceRow => sourceRow,
       onBeforeHighlightingColumnHeader: sourceCol => sourceCol,
       onWindowResize: null,

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

@@ -61,7 +61,7 @@ class MasterTable extends _table.default {
         } else {
           trimmingElementParent.appendChild(cloneNode);
         }
-        const cloneHeight = parseInt((0, _element.getComputedStyle)(cloneNode, rootWindow).height, 10);
+        const cloneHeight = parseInt(rootWindow.getComputedStyle(cloneNode).height, 10);
         trimmingElementParent.removeChild(cloneNode);
         if (cloneHeight === 0) {
           height = 0;

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

@@ -1,4 +1,4 @@
-import { getStyle, getComputedStyle, getTrimmingContainer, isVisible } from "./../../../../helpers/dom/element.mjs";
+import { getStyle, getTrimmingContainer, isVisible } from "./../../../../helpers/dom/element.mjs";
 import Table from "../table.mjs";
 import calculatedRows from "./mixin/calculatedRows.mjs";
 import calculatedColumns from "./mixin/calculatedColumns.mjs";
@@ -57,7 +57,7 @@ class MasterTable extends Table {
         } else {
           trimmingElementParent.appendChild(cloneNode);
         }
-        const cloneHeight = parseInt(getComputedStyle(cloneNode, rootWindow).height, 10);
+        const cloneHeight = parseInt(rootWindow.getComputedStyle(cloneNode).height, 10);
         trimmingElementParent.removeChild(cloneNode);
         if (cloneHeight === 0) {
           height = 0;

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

@@ -3,6 +3,8 @@
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 var _element = require("../../../helpers/dom/element");
 var _function = require("../../../helpers/function");
 var _column = _interopRequireDefault(require("./filter/column"));
@@ -115,7 +117,8 @@ class Table {
       TBODY: this.TBODY,
       rowUtils: this.rowUtils,
       columnUtils: this.columnUtils,
-      cellRenderer: this.wtSettings.getSettingPure('cellRenderer')
+      cellRenderer: this.wtSettings.getSettingPure('cellRenderer'),
+      stylesHandler: this.dataAccessObject.stylesHandler
     });
   }
 
@@ -296,10 +299,7 @@ class Table {
         }
         this.resetOversizedRows();
         this.tableRenderer.setActiveOverlayName(this.name).setViewportSize(this.getRenderedRowsCount(), this.getRenderedColumnsCount()).setFilters(this.rowFilter, this.columnFilter).render();
-        let workspaceWidth;
         if (this.isMaster) {
-          workspaceWidth = this.dataAccessObject.workspaceWidth;
-          wtViewport.containerWidth = null;
           this.markOversizedColumnHeaders();
         }
         this.adjustColumnHeaderHeights();
@@ -312,19 +312,6 @@ class Table {
           }
           wtOverlays.refresh(false);
           wtOverlays.applyToDOM();
-          const hiderWidth = (0, _element.outerWidth)(this.hider);
-          const tableWidth = (0, _element.outerWidth)(this.TABLE);
-          if (hiderWidth !== 0 && tableWidth !== hiderWidth) {
-            // Recalculate the column widths, if width changes made in the overlays removed the scrollbar, thus changing the viewport width.
-            this.columnUtils.calculateWidths();
-            this.tableRenderer.renderer.colGroup.render();
-          }
-          if (workspaceWidth !== wtViewport.getWorkspaceWidth()) {
-            // workspace width changed though to shown/hidden vertical scrollbar. Let's reapply stretching
-            wtViewport.containerWidth = null;
-            this.columnUtils.calculateWidths();
-            this.tableRenderer.renderer.colGroup.render();
-          }
           this.wtSettings.getSetting('onDraw', true);
         } else if (this.is(_overlay.CLONE_BOTTOM)) {
           this.dataAccessObject.cloneSource.wtOverlays.adjustElementsSize();
@@ -367,7 +354,7 @@ class Table {
   markIfOversizedColumnHeader(col) {
     const sourceColIndex = this.columnFilter.renderedToSource(col);
     let level = this.wtSettings.getSetting('columnHeaders').length;
-    const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
+    const defaultRowHeight = this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     let previousColHeaderHeight;
     let currentHeader;
     let currentHeaderHeight;
@@ -466,7 +453,7 @@ class Table {
   getCell(coords) {
     let row = coords.row;
     let column = coords.col;
-    const hookResult = this.wtSettings.getSetting('onModifyGetCellCoords', row, column);
+    const hookResult = this.wtSettings.getSetting('onModifyGetCellCoords', row, column, !this.isMaster, 'render');
     if (hookResult && Array.isArray(hookResult)) {
       [row, column] = hookResult;
     }
@@ -519,9 +506,8 @@ class Table {
       } else {
         return parentElement.childNodes[renderedRowIndex];
       }
-    } else {
-      return false;
     }
+    return false;
   }
 
   /**
@@ -631,6 +617,10 @@ class Table {
     } else {
       col = this.columnFilter.visibleRowHeadedColumnToSourceColumn(col);
     }
+    const hookResult = this.wtSettings.getSetting('onModifyGetCoordsElement', row, col);
+    if (hookResult && Array.isArray(hookResult)) {
+      [row, col] = hookResult;
+    }
     return this.wot.createCellCoords(row, col);
   }
 
@@ -642,10 +632,14 @@ class Table {
       return;
     }
     let rowCount = this.TBODY.childNodes.length;
-    const expectedTableHeight = rowCount * this.wtSettings.getSetting('defaultRowHeight');
+    const expectedTableHeight = rowCount * this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     const actualTableHeight = (0, _element.innerHeight)(this.TBODY) - 1;
+    const borderBoxSizing = this.wot.stylesHandler.areCellsBorderBox();
+    const rowHeightFn = borderBoxSizing ? _element.outerHeight : _element.innerHeight;
+    const borderCompensation = borderBoxSizing ? 0 : 1;
+    const firstRowBorderCompensation = borderBoxSizing ? 1 : 0;
     let previousRowHeight;
-    let rowInnerHeight;
+    let rowCurrentHeight;
     let sourceRowIndex;
     let currentTr;
     let rowHeader;
@@ -659,14 +653,17 @@ class Table {
       previousRowHeight = this.getRowHeight(sourceRowIndex);
       currentTr = this.getTrForRow(sourceRowIndex);
       rowHeader = currentTr.querySelector('th');
+      const topBorderCompensation = sourceRowIndex === 0 ? firstRowBorderCompensation : 0;
       if (rowHeader) {
-        rowInnerHeight = (0, _element.innerHeight)(rowHeader);
+        rowCurrentHeight = rowHeightFn(rowHeader);
       } else {
-        rowInnerHeight = (0, _element.innerHeight)(currentTr) - 1;
+        rowCurrentHeight = rowHeightFn(currentTr) - borderCompensation;
       }
-      if (!previousRowHeight && this.wtSettings.getSetting('defaultRowHeight') < rowInnerHeight || previousRowHeight < rowInnerHeight) {
-        rowInnerHeight += 1;
-        this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowInnerHeight;
+      if (!previousRowHeight && this.dataAccessObject.stylesHandler.getDefaultRowHeight() < rowCurrentHeight - topBorderCompensation || previousRowHeight < rowCurrentHeight) {
+        if (!borderBoxSizing) {
+          rowCurrentHeight += 1;
+        }
+        this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowCurrentHeight;
       }
     }
   }
@@ -910,14 +907,6 @@ class Table {
     return this.columnUtils.getWidth(sourceColumn);
   }
 
-  /**
-   * @param {number} sourceColumn The physical column index.
-   * @returns {number}
-   */
-  getStretchedColumnWidth(sourceColumn) {
-    return this.columnUtils.getStretchedColumnWidth(sourceColumn);
-  }
-
   /**
    * Checks if the table has defined size. It returns `true` when the table has width and height
    * set bigger than `0px`.

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

@@ -1,5 +1,7 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -111,7 +113,8 @@ class Table {
       TBODY: this.TBODY,
       rowUtils: this.rowUtils,
       columnUtils: this.columnUtils,
-      cellRenderer: this.wtSettings.getSettingPure('cellRenderer')
+      cellRenderer: this.wtSettings.getSettingPure('cellRenderer'),
+      stylesHandler: this.dataAccessObject.stylesHandler
     });
   }
 
@@ -292,10 +295,7 @@ class Table {
         }
         this.resetOversizedRows();
         this.tableRenderer.setActiveOverlayName(this.name).setViewportSize(this.getRenderedRowsCount(), this.getRenderedColumnsCount()).setFilters(this.rowFilter, this.columnFilter).render();
-        let workspaceWidth;
         if (this.isMaster) {
-          workspaceWidth = this.dataAccessObject.workspaceWidth;
-          wtViewport.containerWidth = null;
           this.markOversizedColumnHeaders();
         }
         this.adjustColumnHeaderHeights();
@@ -308,19 +308,6 @@ class Table {
           }
           wtOverlays.refresh(false);
           wtOverlays.applyToDOM();
-          const hiderWidth = outerWidth(this.hider);
-          const tableWidth = outerWidth(this.TABLE);
-          if (hiderWidth !== 0 && tableWidth !== hiderWidth) {
-            // Recalculate the column widths, if width changes made in the overlays removed the scrollbar, thus changing the viewport width.
-            this.columnUtils.calculateWidths();
-            this.tableRenderer.renderer.colGroup.render();
-          }
-          if (workspaceWidth !== wtViewport.getWorkspaceWidth()) {
-            // workspace width changed though to shown/hidden vertical scrollbar. Let's reapply stretching
-            wtViewport.containerWidth = null;
-            this.columnUtils.calculateWidths();
-            this.tableRenderer.renderer.colGroup.render();
-          }
           this.wtSettings.getSetting('onDraw', true);
         } else if (this.is(CLONE_BOTTOM)) {
           this.dataAccessObject.cloneSource.wtOverlays.adjustElementsSize();
@@ -363,7 +350,7 @@ class Table {
   markIfOversizedColumnHeader(col) {
     const sourceColIndex = this.columnFilter.renderedToSource(col);
     let level = this.wtSettings.getSetting('columnHeaders').length;
-    const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
+    const defaultRowHeight = this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     let previousColHeaderHeight;
     let currentHeader;
     let currentHeaderHeight;
@@ -462,7 +449,7 @@ class Table {
   getCell(coords) {
     let row = coords.row;
     let column = coords.col;
-    const hookResult = this.wtSettings.getSetting('onModifyGetCellCoords', row, column);
+    const hookResult = this.wtSettings.getSetting('onModifyGetCellCoords', row, column, !this.isMaster, 'render');
     if (hookResult && Array.isArray(hookResult)) {
       [row, column] = hookResult;
     }
@@ -515,9 +502,8 @@ class Table {
       } else {
         return parentElement.childNodes[renderedRowIndex];
       }
-    } else {
-      return false;
     }
+    return false;
   }
 
   /**
@@ -627,6 +613,10 @@ class Table {
     } else {
       col = this.columnFilter.visibleRowHeadedColumnToSourceColumn(col);
     }
+    const hookResult = this.wtSettings.getSetting('onModifyGetCoordsElement', row, col);
+    if (hookResult && Array.isArray(hookResult)) {
+      [row, col] = hookResult;
+    }
     return this.wot.createCellCoords(row, col);
   }
 
@@ -638,10 +628,14 @@ class Table {
       return;
     }
     let rowCount = this.TBODY.childNodes.length;
-    const expectedTableHeight = rowCount * this.wtSettings.getSetting('defaultRowHeight');
+    const expectedTableHeight = rowCount * this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     const actualTableHeight = innerHeight(this.TBODY) - 1;
+    const borderBoxSizing = this.wot.stylesHandler.areCellsBorderBox();
+    const rowHeightFn = borderBoxSizing ? outerHeight : innerHeight;
+    const borderCompensation = borderBoxSizing ? 0 : 1;
+    const firstRowBorderCompensation = borderBoxSizing ? 1 : 0;
     let previousRowHeight;
-    let rowInnerHeight;
+    let rowCurrentHeight;
     let sourceRowIndex;
     let currentTr;
     let rowHeader;
@@ -655,14 +649,17 @@ class Table {
       previousRowHeight = this.getRowHeight(sourceRowIndex);
       currentTr = this.getTrForRow(sourceRowIndex);
       rowHeader = currentTr.querySelector('th');
+      const topBorderCompensation = sourceRowIndex === 0 ? firstRowBorderCompensation : 0;
       if (rowHeader) {
-        rowInnerHeight = innerHeight(rowHeader);
+        rowCurrentHeight = rowHeightFn(rowHeader);
       } else {
-        rowInnerHeight = innerHeight(currentTr) - 1;
+        rowCurrentHeight = rowHeightFn(currentTr) - borderCompensation;
       }
-      if (!previousRowHeight && this.wtSettings.getSetting('defaultRowHeight') < rowInnerHeight || previousRowHeight < rowInnerHeight) {
-        rowInnerHeight += 1;
-        this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowInnerHeight;
+      if (!previousRowHeight && this.dataAccessObject.stylesHandler.getDefaultRowHeight() < rowCurrentHeight - topBorderCompensation || previousRowHeight < rowCurrentHeight) {
+        if (!borderBoxSizing) {
+          rowCurrentHeight += 1;
+        }
+        this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowCurrentHeight;
       }
     }
   }
@@ -906,14 +903,6 @@ class Table {
     return this.columnUtils.getWidth(sourceColumn);
   }
 
-  /**
-   * @param {number} sourceColumn The physical column index.
-   * @returns {number}
-   */
-  getStretchedColumnWidth(sourceColumn) {
-    return this.columnUtils.getStretchedColumnWidth(sourceColumn);
-  }
-
   /**
    * Checks if the table has defined size. It returns `true` when the table has width and height
    * set bigger than `0px`.

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

@@ -66,6 +66,7 @@
  * @property {Walkontable} cloneSource CloneSource.
  * @property {Walkontable} wot Wot.
  * @property {number} parentTableOffset ParentTableOffset.
+ * @property {StylesHandler} stylesHandler StylesHandler.
  * @property {number|null} startColumnRendered StartColumnRendered.
  * @property {number|null} startColumnVisible StartColumnVisible.
  * @property {number|null} endColumnRendered EndColumnRendered.

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

@@ -66,6 +66,7 @@
  * @property {Walkontable} cloneSource CloneSource.
  * @property {Walkontable} wot Wot.
  * @property {number} parentTableOffset ParentTableOffset.
+ * @property {StylesHandler} stylesHandler StylesHandler.
  * @property {number|null} startColumnRendered StartColumnRendered.
  * @property {number|null} startColumnVisible StartColumnVisible.
  * @property {number|null} endColumnRendered EndColumnRendered.

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

@@ -2,8 +2,6 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
-var _element = require("./../../../../helpers/dom/element");
-var _columnStretching = require("./columnStretching");
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -30,18 +28,8 @@ 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)
-    });
   }
 
   /**
@@ -55,21 +43,6 @@ class ColumnUtils {
     return width;
   }
 
-  /**
-   * Returns stretched column width based on passed source index.
-   *
-   * @param {number} sourceIndex Column source index.
-   * @returns {number}
-   */
-  getStretchedColumnWidth(sourceIndex) {
-    let width = this.getWidth(sourceIndex);
-    const stretchedWidth = this.stretching.getStretchedColumnWidth(sourceIndex, width);
-    if (stretchedWidth) {
-      width = stretchedWidth;
-    }
-    return width;
-  }
-
   /**
    * Returns column header height based on passed header level.
    *
@@ -77,7 +50,7 @@ class ColumnUtils {
    * @returns {number}
    */
   getHeaderHeight(level) {
-    let height = this.wtSettings.getSetting('defaultRowHeight');
+    let height = this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     const oversizedHeight = this.dataAccessObject.wtViewport.oversizedColumnHeaders[level];
     if (oversizedHeight !== undefined) {
       height = height ? Math.max(height, oversizedHeight) : oversizedHeight;
@@ -95,20 +68,6 @@ class ColumnUtils {
     return this.headerWidths.get(this.dataAccessObject.wtTable.columnFilter.sourceToRendered(sourceIndex));
   }
 
-  /**
-   * Refreshes the stretching column width by recalculating the widths of the columns.
-   */
-  refreshStretching() {
-    const {
-      wtTable,
-      wtViewport,
-      cloneSource
-    } = 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.
    */
@@ -117,7 +76,6 @@ class ColumnUtils {
       wtSettings
     } = this;
     let rowHeaderWidthSetting = wtSettings.getSetting('rowHeaderWidth');
-    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

@@ -2,8 +2,6 @@ import "core-js/modules/es.error.cause.js";
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { getScrollbarWidth } from "./../../../../helpers/dom/element.mjs";
-import { ColumnStretching } from "./columnStretching.mjs";
 /**
  * Column utils class contains all necessary information about sizes of the columns.
  *
@@ -27,18 +25,8 @@ 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)
-    });
   }
 
   /**
@@ -52,21 +40,6 @@ export default class ColumnUtils {
     return width;
   }
 
-  /**
-   * Returns stretched column width based on passed source index.
-   *
-   * @param {number} sourceIndex Column source index.
-   * @returns {number}
-   */
-  getStretchedColumnWidth(sourceIndex) {
-    let width = this.getWidth(sourceIndex);
-    const stretchedWidth = this.stretching.getStretchedColumnWidth(sourceIndex, width);
-    if (stretchedWidth) {
-      width = stretchedWidth;
-    }
-    return width;
-  }
-
   /**
    * Returns column header height based on passed header level.
    *
@@ -74,7 +47,7 @@ export default class ColumnUtils {
    * @returns {number}
    */
   getHeaderHeight(level) {
-    let height = this.wtSettings.getSetting('defaultRowHeight');
+    let height = this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     const oversizedHeight = this.dataAccessObject.wtViewport.oversizedColumnHeaders[level];
     if (oversizedHeight !== undefined) {
       height = height ? Math.max(height, oversizedHeight) : oversizedHeight;
@@ -92,20 +65,6 @@ export default class ColumnUtils {
     return this.headerWidths.get(this.dataAccessObject.wtTable.columnFilter.sourceToRendered(sourceIndex));
   }
 
-  /**
-   * Refreshes the stretching column width by recalculating the widths of the columns.
-   */
-  refreshStretching() {
-    const {
-      wtTable,
-      wtViewport,
-      cloneSource
-    } = 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.
    */
@@ -114,7 +73,6 @@ export default class ColumnUtils {
       wtSettings
     } = this;
     let rowHeaderWidthSetting = wtSettings.getSetting('rowHeaderWidth');
-    this.refreshStretching();
     rowHeaderWidthSetting = wtSettings.getSetting('onModifyRowHeaderWidth', rowHeaderWidthSetting);
     if (rowHeaderWidthSetting !== null && rowHeaderWidthSetting !== undefined) {
       const rowHeadersCount = wtSettings.getSetting('rowHeaders').length;