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

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

@@ -0,0 +1,219 @@
+"use strict";
+
+exports.__esModule = true;
+require("core-js/modules/es.error.cause.js");
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+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); }
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
+var _totalTargetWidth = /*#__PURE__*/new WeakMap();
+var _totalColumns = /*#__PURE__*/new WeakMap();
+var _stretchingColumnWidthFn = /*#__PURE__*/new WeakMap();
+var _columnWidthFn = /*#__PURE__*/new WeakMap();
+var _stretchMode = /*#__PURE__*/new WeakMap();
+/**
+ * @typedef {object} ColumnStretchingOptions
+ * @property {number} totalColumns Total number of columns.
+ * @property {Function} columnWidthFn Function that returns the width of the column at a given index (in px).
+ * @property {'all' | 'last' | 'none'} stretchMode Stretch mode 'all', 'last' or 'none'.
+ * @property {Function} stretchingColumnWidthFn Function that returns the new width of the stretched column.
+ */
+/**
+ * @class ColumnStretching
+ */
+class ColumnStretching {
+  /**
+   * Default column width.
+   *
+   * @type {number}
+   */
+  static get DEFAULT_WIDTH() {
+    return 50;
+  }
+
+  /**
+   * @type {number}
+   */
+
+  /**
+   * @param {ColumnStretchingOptions} options Object with all options specified for column viewport calculation.
+   */
+  constructor(_ref) {
+    let {
+      totalColumns,
+      stretchMode,
+      stretchingColumnWidthFn,
+      columnWidthFn
+    } = _ref;
+    _defineProperty(this, "stretchAllRatio", 0);
+    /**
+     * @type {number}
+     */
+    _defineProperty(this, "stretchLastWidth", 0);
+    /**
+     * @type {number[]}
+     */
+    _defineProperty(this, "stretchAllColumnsWidth", []);
+    /**
+     * @type {number}
+     */
+    _classPrivateFieldInitSpec(this, _totalTargetWidth, {
+      writable: true,
+      value: 0
+    });
+    /**
+     * @type {boolean}
+     */
+    _defineProperty(this, "needVerifyLastColumnWidth", true);
+    /**
+     * The total number of columns.
+     *
+     * @type {function(): number}
+     */
+    _classPrivateFieldInitSpec(this, _totalColumns, {
+      writable: true,
+      value: () => 0
+    });
+    /**
+     * Function that returns the width of the stretched column at a given index (in px).
+     *
+     * @type {function(): number}
+     */
+    _classPrivateFieldInitSpec(this, _stretchingColumnWidthFn, {
+      writable: true,
+      value: width => width
+    });
+    /**
+     * Function that returns the width of the column at a given index (in px).
+     *
+     * @type {function(): number}
+     */
+    _classPrivateFieldInitSpec(this, _columnWidthFn, {
+      writable: true,
+      value: width => width
+    });
+    /**
+     * Stretch mode.
+     *
+     * @type {function(): 'all' | 'last' | 'none'}
+     */
+    _classPrivateFieldInitSpec(this, _stretchMode, {
+      writable: true,
+      value: () => 'none'
+    });
+    _classPrivateFieldSet(this, _totalColumns, totalColumns);
+    _classPrivateFieldSet(this, _stretchMode, stretchMode);
+    _classPrivateFieldSet(this, _stretchingColumnWidthFn, stretchingColumnWidthFn !== null && stretchingColumnWidthFn !== void 0 ? stretchingColumnWidthFn : _classPrivateFieldGet(this, _stretchingColumnWidthFn));
+    _classPrivateFieldSet(this, _columnWidthFn, columnWidthFn !== null && columnWidthFn !== void 0 ? columnWidthFn : _classPrivateFieldGet(this, _columnWidthFn));
+  }
+
+  /**
+   * Recalculate columns stretching.
+   *
+   * @param {number} totalWidth The total width of the table.
+   */
+  refreshStretching(totalWidth) {
+    if (_classPrivateFieldGet(this, _stretchMode).call(this) === 'none') {
+      return;
+    }
+    _classPrivateFieldSet(this, _totalTargetWidth, totalWidth);
+    let sumAll = 0;
+    for (let i = 0; i < _classPrivateFieldGet(this, _totalColumns).call(this); i++) {
+      const columnWidth = this._getColumnWidth(i);
+      const permanentColumnWidth = _classPrivateFieldGet(this, _stretchingColumnWidthFn).call(this, undefined, i);
+      if (typeof permanentColumnWidth === 'number') {
+        totalWidth -= permanentColumnWidth;
+      } else {
+        sumAll += columnWidth;
+      }
+    }
+    const remainingSize = totalWidth - sumAll;
+    if (_classPrivateFieldGet(this, _stretchMode).call(this) === 'all' && remainingSize > 0) {
+      this.stretchAllRatio = totalWidth / sumAll;
+      this.stretchAllColumnsWidth = [];
+      this.needVerifyLastColumnWidth = true;
+    } else if (_classPrivateFieldGet(this, _stretchMode).call(this) === 'last' && totalWidth !== Infinity) {
+      const columnWidth = this._getColumnWidth(_classPrivateFieldGet(this, _totalColumns).call(this) - 1);
+      const lastColumnWidth = remainingSize + columnWidth;
+      this.stretchLastWidth = lastColumnWidth >= 0 ? lastColumnWidth : columnWidth;
+    }
+  }
+
+  /**
+   * Get stretched column width based on stretchH (all or last) setting passed in handsontable instance.
+   *
+   * @param {number} column The visual column index.
+   * @param {number} baseWidth The default column width.
+   * @returns {number|null}
+   */
+  getStretchedColumnWidth(column, baseWidth) {
+    let result = null;
+    if (_classPrivateFieldGet(this, _stretchMode).call(this) === 'all' && this.stretchAllRatio !== 0) {
+      result = this._getStretchedAllColumnWidth(column, baseWidth);
+    } else if (_classPrivateFieldGet(this, _stretchMode).call(this) === 'last' && this.stretchLastWidth !== 0) {
+      result = this._getStretchedLastColumnWidth(column);
+    }
+    return result;
+  }
+
+  /**
+   * @param {number} column The visual column index.
+   * @param {number} baseWidth The default column width.
+   * @returns {number}
+   * @private
+   */
+  _getStretchedAllColumnWidth(column, baseWidth) {
+    let sumRatioWidth = 0;
+    if (!this.stretchAllColumnsWidth[column]) {
+      const stretchedWidth = Math.round(baseWidth * this.stretchAllRatio);
+      const newStretchedWidth = _classPrivateFieldGet(this, _stretchingColumnWidthFn).call(this, stretchedWidth, column);
+      if (newStretchedWidth === undefined) {
+        this.stretchAllColumnsWidth[column] = stretchedWidth;
+      } else {
+        this.stretchAllColumnsWidth[column] = isNaN(newStretchedWidth) ? this._getColumnWidth(column) : newStretchedWidth;
+      }
+    }
+    if (this.stretchAllColumnsWidth.length === _classPrivateFieldGet(this, _totalColumns).call(this) && this.needVerifyLastColumnWidth) {
+      this.needVerifyLastColumnWidth = false;
+      for (let i = 0; i < this.stretchAllColumnsWidth.length; i++) {
+        sumRatioWidth += this.stretchAllColumnsWidth[i];
+      }
+      if (sumRatioWidth !== _classPrivateFieldGet(this, _totalTargetWidth)) {
+        this.stretchAllColumnsWidth[this.stretchAllColumnsWidth.length - 1] += _classPrivateFieldGet(this, _totalTargetWidth) - sumRatioWidth;
+      }
+    }
+    return this.stretchAllColumnsWidth[column];
+  }
+
+  /**
+   * @param {number} column The visual column index.
+   * @returns {number|null}
+   * @private
+   */
+  _getStretchedLastColumnWidth(column) {
+    if (column === _classPrivateFieldGet(this, _totalColumns).call(this) - 1) {
+      return this.stretchLastWidth;
+    }
+    return null;
+  }
+
+  /**
+   * @param {number} column The visual column index.
+   * @returns {number}
+   * @private
+   */
+  _getColumnWidth(column) {
+    let width = _classPrivateFieldGet(this, _columnWidthFn).call(this, column);
+    if (isNaN(width)) {
+      width = ColumnStretching.DEFAULT_WIDTH;
+    }
+    return width;
+  }
+}
+exports.ColumnStretching = ColumnStretching;

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

@@ -0,0 +1,215 @@
+import "core-js/modules/es.error.cause.js";
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+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); }
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
+var _totalTargetWidth = /*#__PURE__*/new WeakMap();
+var _totalColumns = /*#__PURE__*/new WeakMap();
+var _stretchingColumnWidthFn = /*#__PURE__*/new WeakMap();
+var _columnWidthFn = /*#__PURE__*/new WeakMap();
+var _stretchMode = /*#__PURE__*/new WeakMap();
+/**
+ * @typedef {object} ColumnStretchingOptions
+ * @property {number} totalColumns Total number of columns.
+ * @property {Function} columnWidthFn Function that returns the width of the column at a given index (in px).
+ * @property {'all' | 'last' | 'none'} stretchMode Stretch mode 'all', 'last' or 'none'.
+ * @property {Function} stretchingColumnWidthFn Function that returns the new width of the stretched column.
+ */
+/**
+ * @class ColumnStretching
+ */
+export class ColumnStretching {
+  /**
+   * Default column width.
+   *
+   * @type {number}
+   */
+  static get DEFAULT_WIDTH() {
+    return 50;
+  }
+
+  /**
+   * @type {number}
+   */
+
+  /**
+   * @param {ColumnStretchingOptions} options Object with all options specified for column viewport calculation.
+   */
+  constructor(_ref) {
+    let {
+      totalColumns,
+      stretchMode,
+      stretchingColumnWidthFn,
+      columnWidthFn
+    } = _ref;
+    _defineProperty(this, "stretchAllRatio", 0);
+    /**
+     * @type {number}
+     */
+    _defineProperty(this, "stretchLastWidth", 0);
+    /**
+     * @type {number[]}
+     */
+    _defineProperty(this, "stretchAllColumnsWidth", []);
+    /**
+     * @type {number}
+     */
+    _classPrivateFieldInitSpec(this, _totalTargetWidth, {
+      writable: true,
+      value: 0
+    });
+    /**
+     * @type {boolean}
+     */
+    _defineProperty(this, "needVerifyLastColumnWidth", true);
+    /**
+     * The total number of columns.
+     *
+     * @type {function(): number}
+     */
+    _classPrivateFieldInitSpec(this, _totalColumns, {
+      writable: true,
+      value: () => 0
+    });
+    /**
+     * Function that returns the width of the stretched column at a given index (in px).
+     *
+     * @type {function(): number}
+     */
+    _classPrivateFieldInitSpec(this, _stretchingColumnWidthFn, {
+      writable: true,
+      value: width => width
+    });
+    /**
+     * Function that returns the width of the column at a given index (in px).
+     *
+     * @type {function(): number}
+     */
+    _classPrivateFieldInitSpec(this, _columnWidthFn, {
+      writable: true,
+      value: width => width
+    });
+    /**
+     * Stretch mode.
+     *
+     * @type {function(): 'all' | 'last' | 'none'}
+     */
+    _classPrivateFieldInitSpec(this, _stretchMode, {
+      writable: true,
+      value: () => 'none'
+    });
+    _classPrivateFieldSet(this, _totalColumns, totalColumns);
+    _classPrivateFieldSet(this, _stretchMode, stretchMode);
+    _classPrivateFieldSet(this, _stretchingColumnWidthFn, stretchingColumnWidthFn !== null && stretchingColumnWidthFn !== void 0 ? stretchingColumnWidthFn : _classPrivateFieldGet(this, _stretchingColumnWidthFn));
+    _classPrivateFieldSet(this, _columnWidthFn, columnWidthFn !== null && columnWidthFn !== void 0 ? columnWidthFn : _classPrivateFieldGet(this, _columnWidthFn));
+  }
+
+  /**
+   * Recalculate columns stretching.
+   *
+   * @param {number} totalWidth The total width of the table.
+   */
+  refreshStretching(totalWidth) {
+    if (_classPrivateFieldGet(this, _stretchMode).call(this) === 'none') {
+      return;
+    }
+    _classPrivateFieldSet(this, _totalTargetWidth, totalWidth);
+    let sumAll = 0;
+    for (let i = 0; i < _classPrivateFieldGet(this, _totalColumns).call(this); i++) {
+      const columnWidth = this._getColumnWidth(i);
+      const permanentColumnWidth = _classPrivateFieldGet(this, _stretchingColumnWidthFn).call(this, undefined, i);
+      if (typeof permanentColumnWidth === 'number') {
+        totalWidth -= permanentColumnWidth;
+      } else {
+        sumAll += columnWidth;
+      }
+    }
+    const remainingSize = totalWidth - sumAll;
+    if (_classPrivateFieldGet(this, _stretchMode).call(this) === 'all' && remainingSize > 0) {
+      this.stretchAllRatio = totalWidth / sumAll;
+      this.stretchAllColumnsWidth = [];
+      this.needVerifyLastColumnWidth = true;
+    } else if (_classPrivateFieldGet(this, _stretchMode).call(this) === 'last' && totalWidth !== Infinity) {
+      const columnWidth = this._getColumnWidth(_classPrivateFieldGet(this, _totalColumns).call(this) - 1);
+      const lastColumnWidth = remainingSize + columnWidth;
+      this.stretchLastWidth = lastColumnWidth >= 0 ? lastColumnWidth : columnWidth;
+    }
+  }
+
+  /**
+   * Get stretched column width based on stretchH (all or last) setting passed in handsontable instance.
+   *
+   * @param {number} column The visual column index.
+   * @param {number} baseWidth The default column width.
+   * @returns {number|null}
+   */
+  getStretchedColumnWidth(column, baseWidth) {
+    let result = null;
+    if (_classPrivateFieldGet(this, _stretchMode).call(this) === 'all' && this.stretchAllRatio !== 0) {
+      result = this._getStretchedAllColumnWidth(column, baseWidth);
+    } else if (_classPrivateFieldGet(this, _stretchMode).call(this) === 'last' && this.stretchLastWidth !== 0) {
+      result = this._getStretchedLastColumnWidth(column);
+    }
+    return result;
+  }
+
+  /**
+   * @param {number} column The visual column index.
+   * @param {number} baseWidth The default column width.
+   * @returns {number}
+   * @private
+   */
+  _getStretchedAllColumnWidth(column, baseWidth) {
+    let sumRatioWidth = 0;
+    if (!this.stretchAllColumnsWidth[column]) {
+      const stretchedWidth = Math.round(baseWidth * this.stretchAllRatio);
+      const newStretchedWidth = _classPrivateFieldGet(this, _stretchingColumnWidthFn).call(this, stretchedWidth, column);
+      if (newStretchedWidth === undefined) {
+        this.stretchAllColumnsWidth[column] = stretchedWidth;
+      } else {
+        this.stretchAllColumnsWidth[column] = isNaN(newStretchedWidth) ? this._getColumnWidth(column) : newStretchedWidth;
+      }
+    }
+    if (this.stretchAllColumnsWidth.length === _classPrivateFieldGet(this, _totalColumns).call(this) && this.needVerifyLastColumnWidth) {
+      this.needVerifyLastColumnWidth = false;
+      for (let i = 0; i < this.stretchAllColumnsWidth.length; i++) {
+        sumRatioWidth += this.stretchAllColumnsWidth[i];
+      }
+      if (sumRatioWidth !== _classPrivateFieldGet(this, _totalTargetWidth)) {
+        this.stretchAllColumnsWidth[this.stretchAllColumnsWidth.length - 1] += _classPrivateFieldGet(this, _totalTargetWidth) - sumRatioWidth;
+      }
+    }
+    return this.stretchAllColumnsWidth[column];
+  }
+
+  /**
+   * @param {number} column The visual column index.
+   * @returns {number|null}
+   * @private
+   */
+  _getStretchedLastColumnWidth(column) {
+    if (column === _classPrivateFieldGet(this, _totalColumns).call(this) - 1) {
+      return this.stretchLastWidth;
+    }
+    return null;
+  }
+
+  /**
+   * @param {number} column The visual column index.
+   * @returns {number}
+   * @private
+   */
+  _getColumnWidth(column) {
+    let width = _classPrivateFieldGet(this, _columnWidthFn).call(this, column);
+    if (isNaN(width)) {
+      width = ColumnStretching.DEFAULT_WIDTH;
+    }
+    return width;
+  }
+}

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

@@ -255,15 +255,15 @@ class Viewport {
       wtSettings,
       wtTable
     } = this;
-    let height;
+    if (wtSettings.getSetting('renderAllRows') && calculationType === _calculator.RENDER_TYPE) {
+      return new _calculator.RenderAllRowsCalculator({
+        totalRows: wtSettings.getSetting('totalRows')
+      });
+    }
+    let height = this.getViewportHeight();
     let scrollbarHeight;
     let fixedRowsHeight;
     this.rowHeaderWidth = NaN;
-    if (wtSettings.getSetting('renderAllRows') && calculationType === _calculator.RENDER_TYPE) {
-      height = Infinity;
-    } else {
-      height = this.getViewportHeight();
-    }
     let pos = this.dataAccessObject.topScrollPosition - this.dataAccessObject.topParentOffset;
     const fixedRowsTop = wtSettings.getSetting('fixedRowsTop');
     const fixedRowsBottom = wtSettings.getSetting('fixedRowsBottom');
@@ -308,6 +308,11 @@ class Viewport {
       wtSettings,
       wtTable
     } = this;
+    if (wtSettings.getSetting('renderAllColumns') && calculationType === _calculator.RENDER_TYPE) {
+      return new _calculator.RenderAllColumnsCalculator({
+        totalColumns: wtSettings.getSetting('totalColumns')
+      });
+    }
     let width = this.getViewportWidth();
     let pos = Math.abs(this.dataAccessObject.inlineStartScrollPosition) - this.dataAccessObject.inlineStartParentOffset;
     this.columnHeaderHeight = NaN;
@@ -327,10 +332,6 @@ class Viewport {
       columnWidthFn: sourceCol => wtTable.getColumnWidth(sourceCol),
       overrideFn: wtSettings.getSettingPure('viewportColumnCalculatorOverride'),
       calculationType,
-      stretchMode: wtSettings.getSetting('stretchH'),
-      stretchingColumnWidthFn: (stretchedWidth, column) => {
-        return wtSettings.getSetting('onBeforeStretchingColumnWidth', stretchedWidth, column);
-      },
       inlineStartOffset: this.dataAccessObject.inlineStartParentOffset
     });
   }
@@ -345,22 +346,26 @@ class Viewport {
    */
   createRenderCalculators() {
     let fastDraw = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    let runFastDraw = fastDraw;
-    if (runFastDraw) {
+    const {
+      wtSettings
+    } = this;
+    if (fastDraw && !wtSettings.getSetting('renderAllRows')) {
       const proposedRowsVisibleCalculator = this.createRowsCalculator(_calculator.FULLY_VISIBLE_TYPE);
+      fastDraw = this.areAllProposedVisibleRowsAlreadyRendered(proposedRowsVisibleCalculator);
+    }
+    if (fastDraw && !wtSettings.getSetting('renderAllColumns')) {
       const proposedColumnsVisibleCalculator = this.createColumnsCalculator(_calculator.FULLY_VISIBLE_TYPE);
-      if (!(this.areAllProposedVisibleRowsAlreadyRendered(proposedRowsVisibleCalculator) && this.areAllProposedVisibleColumnsAlreadyRendered(proposedColumnsVisibleCalculator))) {
-        runFastDraw = false;
-      }
+      fastDraw = this.areAllProposedVisibleColumnsAlreadyRendered(proposedColumnsVisibleCalculator);
     }
-    if (!runFastDraw) {
+    if (!fastDraw) {
       this.rowsRenderCalculator = this.createRowsCalculator(_calculator.RENDER_TYPE);
       this.columnsRenderCalculator = this.createColumnsCalculator(_calculator.RENDER_TYPE);
     }
+
     // delete temporarily to make sure that renderers always use rowsRenderCalculator, not rowsVisibleCalculator
     this.rowsVisibleCalculator = null;
     this.columnsVisibleCalculator = null;
-    return runFastDraw;
+    return fastDraw;
   }
 
   /**

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

@@ -1,6 +1,6 @@
 import { getScrollbarWidth, getStyle, offset, outerHeight, outerWidth } from "../../../helpers/dom/element.mjs";
 import { objectEach } from "../../../helpers/object.mjs";
-import { RENDER_TYPE, FULLY_VISIBLE_TYPE, ViewportColumnsCalculator, ViewportRowsCalculator } from "./calculator/index.mjs";
+import { RENDER_TYPE, FULLY_VISIBLE_TYPE, RenderAllColumnsCalculator, RenderAllRowsCalculator, ViewportColumnsCalculator, ViewportRowsCalculator } from "./calculator/index.mjs";
 /**
  * @class Viewport
  */
@@ -252,15 +252,15 @@ class Viewport {
       wtSettings,
       wtTable
     } = this;
-    let height;
+    if (wtSettings.getSetting('renderAllRows') && calculationType === RENDER_TYPE) {
+      return new RenderAllRowsCalculator({
+        totalRows: wtSettings.getSetting('totalRows')
+      });
+    }
+    let height = this.getViewportHeight();
     let scrollbarHeight;
     let fixedRowsHeight;
     this.rowHeaderWidth = NaN;
-    if (wtSettings.getSetting('renderAllRows') && calculationType === RENDER_TYPE) {
-      height = Infinity;
-    } else {
-      height = this.getViewportHeight();
-    }
     let pos = this.dataAccessObject.topScrollPosition - this.dataAccessObject.topParentOffset;
     const fixedRowsTop = wtSettings.getSetting('fixedRowsTop');
     const fixedRowsBottom = wtSettings.getSetting('fixedRowsBottom');
@@ -305,6 +305,11 @@ class Viewport {
       wtSettings,
       wtTable
     } = this;
+    if (wtSettings.getSetting('renderAllColumns') && calculationType === RENDER_TYPE) {
+      return new RenderAllColumnsCalculator({
+        totalColumns: wtSettings.getSetting('totalColumns')
+      });
+    }
     let width = this.getViewportWidth();
     let pos = Math.abs(this.dataAccessObject.inlineStartScrollPosition) - this.dataAccessObject.inlineStartParentOffset;
     this.columnHeaderHeight = NaN;
@@ -324,10 +329,6 @@ class Viewport {
       columnWidthFn: sourceCol => wtTable.getColumnWidth(sourceCol),
       overrideFn: wtSettings.getSettingPure('viewportColumnCalculatorOverride'),
       calculationType,
-      stretchMode: wtSettings.getSetting('stretchH'),
-      stretchingColumnWidthFn: (stretchedWidth, column) => {
-        return wtSettings.getSetting('onBeforeStretchingColumnWidth', stretchedWidth, column);
-      },
       inlineStartOffset: this.dataAccessObject.inlineStartParentOffset
     });
   }
@@ -342,22 +343,26 @@ class Viewport {
    */
   createRenderCalculators() {
     let fastDraw = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    let runFastDraw = fastDraw;
-    if (runFastDraw) {
+    const {
+      wtSettings
+    } = this;
+    if (fastDraw && !wtSettings.getSetting('renderAllRows')) {
       const proposedRowsVisibleCalculator = this.createRowsCalculator(FULLY_VISIBLE_TYPE);
+      fastDraw = this.areAllProposedVisibleRowsAlreadyRendered(proposedRowsVisibleCalculator);
+    }
+    if (fastDraw && !wtSettings.getSetting('renderAllColumns')) {
       const proposedColumnsVisibleCalculator = this.createColumnsCalculator(FULLY_VISIBLE_TYPE);
-      if (!(this.areAllProposedVisibleRowsAlreadyRendered(proposedRowsVisibleCalculator) && this.areAllProposedVisibleColumnsAlreadyRendered(proposedColumnsVisibleCalculator))) {
-        runFastDraw = false;
-      }
+      fastDraw = this.areAllProposedVisibleColumnsAlreadyRendered(proposedColumnsVisibleCalculator);
     }
-    if (!runFastDraw) {
+    if (!fastDraw) {
       this.rowsRenderCalculator = this.createRowsCalculator(RENDER_TYPE);
       this.columnsRenderCalculator = this.createColumnsCalculator(RENDER_TYPE);
     }
+
     // delete temporarily to make sure that renderers always use rowsRenderCalculator, not rowsVisibleCalculator
     this.rowsVisibleCalculator = null;
     this.columnsVisibleCalculator = null;
-    return runFastDraw;
+    return fastDraw;
   }
 
   /**

package/base.js

@@ -15,7 +15,9 @@ exports.CellRange = _src.CellRange;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // FIXME: Bug in eslint-plugin-import: https://github.com/benmosher/eslint-plugin-import/issues/1883
 /* eslint-disable import/named */
+
 /* eslint-enable import/named */
+
 // register default mandatory cell type for the Base package
 (0, _registry2.registerCellType)(_textType.TextCellType);
 
@@ -43,8 +45,8 @@ Handsontable.hooks = _pluginHooks.default.getSingleton();
 Handsontable.CellCoords = _src.CellCoords;
 Handsontable.CellRange = _src.CellRange;
 Handsontable.packageName = 'handsontable';
-Handsontable.buildDate = "08/12/2023 08:37:33";
-Handsontable.version = "0.0.0-next-3d099da-20231208";
+Handsontable.buildDate = "11/12/2023 13:18:24";
+Handsontable.version = "0.0.0-next-51d3397-20231211";
 Handsontable.languages = {
   dictionaryKeys: _registry.dictionaryKeys,
   getLanguageDictionary: _registry.getLanguageDictionary,

package/base.mjs

@@ -35,8 +35,8 @@ Handsontable.hooks = Hooks.getSingleton();
 Handsontable.CellCoords = CellCoords;
 Handsontable.CellRange = CellRange;
 Handsontable.packageName = 'handsontable';
-Handsontable.buildDate = "08/12/2023 08:37:39";
-Handsontable.version = "0.0.0-next-3d099da-20231208";
+Handsontable.buildDate = "11/12/2023 13:18:31";
+Handsontable.version = "0.0.0-next-51d3397-20231211";
 Handsontable.languages = {
   dictionaryKeys,
   getLanguageDictionary,