handsontable 14.5.0-next-ede811d-20240717 → 14.5.0-next-7541a88-20240725

package/3rdparty/walkontable/src/calculator/viewportColumns.mjs

@@ -1,87 +1,59 @@
 import "core-js/modules/es.error.cause.js";
-import "core-js/modules/es.array.at.js";
 import "core-js/modules/es.array.push.js";
-function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
-function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 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); }
-function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
-function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
-function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
-import { RENDER_TYPE, FULLY_VISIBLE_TYPE } from "./constants.mjs";
+import { ViewportBaseCalculator } from "./viewportBase.mjs";
+export const DEFAULT_WIDTH = 50;
+
 /**
  * @typedef {object} ViewportColumnsCalculatorOptions
+ * @property {Map<string, ViewportBaseCalculator>} calculationTypes The calculation types to be performed.
  * @property {number} viewportWidth Width of the viewport.
  * @property {number} scrollOffset Current horizontal scroll position of the viewport.
  * @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 {Function} overrideFn Function that changes calculated this.startRow, this.endRow (used by
- *   MergeCells plugin).
- * @property {string} calculationType String which describes types of calculation which will be performed.
+ * @property {Function} overrideFn Function that allows to adjust the `startRow` and `endRow` parameters.
  * @property {string} inlineStartOffset Inline-start offset of the parent container.
- * @property {string} stretchMode Stretch mode 'all' or 'last'.
- * @property {Function} stretchingColumnWidthFn Function that returns the new width of the stretched column.
  */
 /**
- * Calculates indexes of columns to render OR columns that are visible.
- * To redo the calculation, you need to create a new calculator.
+ * Calculates indexes of columns to render OR columns that are visible OR partially visible in the viewport.
  *
  * @class ViewportColumnsCalculator
  */
-var _options = /*#__PURE__*/new WeakMap();
-export class ViewportColumnsCalculator {
-  /**
-   * Default column width.
-   *
-   * @type {number}
-   */
-  static get DEFAULT_WIDTH() {
-    return 50;
-  }
-
-  /**
-   * Number of rendered/visible columns.
-   *
-   * @type {number}
-   */
-
+export class ViewportColumnsCalculator extends ViewportBaseCalculator {
   /**
    * @param {ViewportColumnsCalculatorOptions} options Object with all options specified for column viewport calculation.
    */
-  constructor(options) {
-    _defineProperty(this, "count", 0);
-    /**
-     * Index of the first rendered/visible column (can be overwritten using overrideFn).
-     *
-     * @type {number|null}
-     */
-    _defineProperty(this, "startColumn", null);
-    /**
-     * Index of the last rendered/visible column (can be overwritten using overrideFn).
-     *
-     * @type {null}
-     */
-    _defineProperty(this, "endColumn", null);
-    /**
-     * Position of the first rendered/visible column (in px).
-     *
-     * @type {number|null}
-     */
-    _defineProperty(this, "startPosition", null);
-    /**
-     * Determines if the viewport is visible in the trimming container.
-     *
-     * @type {boolean}
-     */
-    _defineProperty(this, "isVisibleInTrimmingContainer", false);
-    /**
-     * The calculator options.
-     *
-     * @type {ViewportColumnsCalculatorOptions}
-     */
-    _classPrivateFieldInitSpec(this, _options, void 0);
-    _classPrivateFieldSet(_options, this, options);
+  constructor(_ref) {
+    let {
+      calculationTypes,
+      viewportWidth,
+      scrollOffset,
+      totalColumns,
+      columnWidthFn,
+      overrideFn,
+      inlineStartOffset
+    } = _ref;
+    super(calculationTypes);
+    _defineProperty(this, "viewportWidth", 0);
+    _defineProperty(this, "scrollOffset", 0);
+    _defineProperty(this, "zeroBasedScrollOffset", 0);
+    _defineProperty(this, "totalColumns", 0);
+    _defineProperty(this, "columnWidthFn", null);
+    _defineProperty(this, "columnWidth", 0);
+    _defineProperty(this, "overrideFn", null);
+    _defineProperty(this, "inlineStartOffset", 0);
+    _defineProperty(this, "totalCalculatedWidth", 0);
+    _defineProperty(this, "startPositions", []);
+    _defineProperty(this, "needReverse", true);
+    this.viewportWidth = viewportWidth;
+    this.scrollOffset = scrollOffset;
+    this.zeroBasedScrollOffset = Math.max(scrollOffset, 0);
+    this.totalColumns = totalColumns;
+    this.columnWidthFn = columnWidthFn;
+    this.overrideFn = overrideFn;
+    this.inlineStartOffset = inlineStartOffset;
     this.calculate();
   }
 
@@ -89,96 +61,30 @@ export class ViewportColumnsCalculator {
    * Calculates viewport.
    */
   calculate() {
-    const {
-      calculationType,
-      overrideFn,
-      scrollOffset,
-      totalColumns,
-      viewportWidth
-    } = _classPrivateFieldGet(_options, this);
-    const zeroBasedScrollOffset = Math.max(_classPrivateFieldGet(_options, this).scrollOffset, 0);
-    // +1 pixel for row header width compensation for horizontal scroll > 0
-    const compensatedViewportWidth = zeroBasedScrollOffset > 0 ? viewportWidth + 1 : viewportWidth;
-    let sum = 0;
-    let needReverse = true;
-    const startPositions = [];
-    let columnWidth;
-    let firstVisibleColumnWidth = 0;
-    let lastVisibleColumnWidth = 0;
-    for (let i = 0; i < totalColumns; i++) {
-      columnWidth = this._getColumnWidth(i);
-      if (sum <= zeroBasedScrollOffset && calculationType !== FULLY_VISIBLE_TYPE) {
-        this.startColumn = i;
-        firstVisibleColumnWidth = columnWidth;
-      }
-      if (sum >= zeroBasedScrollOffset && sum + (calculationType === FULLY_VISIBLE_TYPE ? columnWidth : 0) <= zeroBasedScrollOffset + compensatedViewportWidth) {
-        if (this.startColumn === null || this.startColumn === undefined) {
-          this.startColumn = i;
-          firstVisibleColumnWidth = columnWidth;
-        }
-        this.endColumn = i;
-      }
-      startPositions.push(sum);
-      sum += columnWidth;
-      lastVisibleColumnWidth = columnWidth;
-      if (calculationType !== FULLY_VISIBLE_TYPE) {
-        this.endColumn = i;
-      }
-      if (sum >= zeroBasedScrollOffset + viewportWidth) {
-        needReverse = false;
+    this._initialize(this);
+    for (let column = 0; column < this.totalColumns; column++) {
+      this.columnWidth = this.getColumnWidth(column);
+      this._process(column, this);
+      this.startPositions.push(this.totalCalculatedWidth);
+      this.totalCalculatedWidth += this.columnWidth;
+      if (this.totalCalculatedWidth >= this.zeroBasedScrollOffset + this.viewportWidth) {
+        this.needReverse = false;
         break;
       }
     }
-    const mostRightScrollOffset = scrollOffset + viewportWidth - compensatedViewportWidth;
-    const inlineEndColumnOffset = calculationType === FULLY_VISIBLE_TYPE ? 0 : lastVisibleColumnWidth;
-    const inlineStartColumnOffset = calculationType === FULLY_VISIBLE_TYPE ? firstVisibleColumnWidth : 0;
-    if (
-    // the table is to the left of the viewport
-    mostRightScrollOffset < -1 * _classPrivateFieldGet(_options, this).inlineStartOffset || scrollOffset > startPositions.at(-1) + inlineEndColumnOffset ||
-    // the table is to the right of the viewport
-    -1 * _classPrivateFieldGet(_options, this).scrollOffset - _classPrivateFieldGet(_options, this).viewportWidth > -1 * inlineStartColumnOffset) {
-      this.isVisibleInTrimmingContainer = false;
-    } else {
-      this.isVisibleInTrimmingContainer = true;
-    }
-    if (this.endColumn === totalColumns - 1 && needReverse) {
-      this.startColumn = this.endColumn;
-      while (this.startColumn > 0) {
-        const viewportSum = startPositions[this.endColumn] + columnWidth - startPositions[this.startColumn - 1];
-        if (viewportSum <= viewportWidth || calculationType !== FULLY_VISIBLE_TYPE) {
-          this.startColumn -= 1;
-        }
-        if (viewportSum > viewportWidth) {
-          break;
-        }
-      }
-    }
-    if (calculationType === RENDER_TYPE && this.startColumn !== null && overrideFn) {
-      overrideFn(this);
-    }
-    this.startPosition = startPositions[this.startColumn];
-    if (this.startPosition === undefined) {
-      this.startPosition = null;
-    }
-
-    // If totalColumns exceeded its total columns size set endColumn to the latest item
-    if (totalColumns < this.endColumn) {
-      this.endColumn = totalColumns - 1;
-    }
-    if (this.startColumn !== null) {
-      this.count = this.endColumn - this.startColumn + 1;
-    }
+    this._finalize(this);
   }
 
   /**
-   * @param {number} column The visual column index.
+   * Gets the column width at the specified column index.
+   *
+   * @param {number} column Column index.
    * @returns {number}
-   * @private
    */
-  _getColumnWidth(column) {
-    let width = _classPrivateFieldGet(_options, this).columnWidthFn(column);
+  getColumnWidth(column) {
+    const width = this.columnWidthFn(column);
     if (isNaN(width)) {
-      width = ViewportColumnsCalculator.DEFAULT_WIDTH;
+      return DEFAULT_WIDTH;
     }
     return width;
   }

package/3rdparty/walkontable/src/calculator/viewportRows.js

@@ -2,86 +2,63 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.array.at.js");
 require("core-js/modules/es.array.push.js");
-var _constants = require("./constants");
-function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
-function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+var _viewportBase = require("./viewportBase");
 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); }
-function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
-function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
-function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
+const DEFAULT_HEIGHT = exports.DEFAULT_HEIGHT = 23;
+
 /**
  * @typedef {object} ViewportRowsCalculatorOptions
+ * @property {Map<string, ViewportBaseCalculator>} calculationTypes The calculation types to be performed.
  * @property {number} viewportHeight Height of the viewport.
  * @property {number} scrollOffset Current vertical scroll position of the viewport.
  * @property {number} totalRows Total number of rows.
  * @property {Function} rowHeightFn Function that returns the height of the row at a given index (in px).
- * @property {Function} overrideFn Function that changes calculated this.startRow, this.endRow (used by MergeCells plugin).
- * @property {string} calculationType String which describes types of calculation which will be performed.
+ * @property {Function} overrideFn Function that allows to adjust the `startRow` and `endRow` parameters.
  * @property {number} horizontalScrollbarHeight The scrollbar height.
  */
 /**
- * Calculates indexes of rows to render OR rows that are visible.
- * To redo the calculation, you need to create a new calculator.
+ * Calculates indexes of rows to render OR rows that are visible OR partially visible in the viewport.
  *
  * @class ViewportRowsCalculator
  */
-var _options = /*#__PURE__*/new WeakMap();
-class ViewportRowsCalculator {
-  /**
-   * Default row height.
-   *
-   * @type {number}
-   */
-  static get DEFAULT_HEIGHT() {
-    return 23;
-  }
-
-  /**
-   * Number of rendered/visible rows.
-   *
-   * @type {number}
-   */
-
+class ViewportRowsCalculator extends _viewportBase.ViewportBaseCalculator {
   /**
    * @param {ViewportRowsCalculatorOptions} options Object with all options specified for row viewport calculation.
    */
-  constructor(options) {
-    _defineProperty(this, "count", 0);
-    /**
-     * Index of the first rendered/visible row (can be overwritten using overrideFn).
-     *
-     * @type {number|null}
-     */
-    _defineProperty(this, "startRow", null);
-    /**
-     * Index of the last rendered/visible row (can be overwritten using overrideFn).
-     *
-     * @type {null}
-     */
-    _defineProperty(this, "endRow", null);
-    /**
-     * Position of the first rendered/visible row (in px).
-     *
-     * @type {number|null}
-     */
-    _defineProperty(this, "startPosition", null);
-    /**
-     * Determines if the viewport is visible in the trimming container.
-     *
-     * @type {boolean}
-     */
-    _defineProperty(this, "isVisibleInTrimmingContainer", false);
-    /**
-     * The calculator options.
-     *
-     * @type {ViewportRowsCalculatorOptions}
-     */
-    _classPrivateFieldInitSpec(this, _options, void 0);
-    _classPrivateFieldSet(_options, this, options);
+  constructor(_ref) {
+    let {
+      calculationTypes,
+      viewportHeight,
+      scrollOffset,
+      totalRows,
+      rowHeightFn,
+      overrideFn,
+      horizontalScrollbarHeight
+    } = _ref;
+    super(calculationTypes);
+    _defineProperty(this, "viewportHeight", 0);
+    _defineProperty(this, "scrollOffset", 0);
+    _defineProperty(this, "zeroBasedScrollOffset", 0);
+    _defineProperty(this, "totalRows", 0);
+    _defineProperty(this, "rowHeightFn", null);
+    _defineProperty(this, "rowHeight", 0);
+    _defineProperty(this, "overrideFn", null);
+    _defineProperty(this, "horizontalScrollbarHeight", 0);
+    _defineProperty(this, "innerViewportHeight", 0);
+    _defineProperty(this, "totalCalculatedHeight", 0);
+    _defineProperty(this, "startPositions", []);
+    _defineProperty(this, "needReverse", true);
+    this.viewportHeight = viewportHeight;
+    this.scrollOffset = scrollOffset;
+    this.zeroBasedScrollOffset = Math.max(scrollOffset, 0);
+    this.totalRows = totalRows;
+    this.rowHeightFn = rowHeightFn;
+    this.overrideFn = overrideFn;
+    this.horizontalScrollbarHeight = horizontalScrollbarHeight !== null && horizontalScrollbarHeight !== void 0 ? horizontalScrollbarHeight : 0;
+    this.innerViewportHeight = this.zeroBasedScrollOffset + this.viewportHeight - this.horizontalScrollbarHeight;
     this.calculate();
   }
 
@@ -89,91 +66,32 @@ class ViewportRowsCalculator {
    * Calculates viewport.
    */
   calculate() {
-    const {
-      calculationType,
-      overrideFn,
-      rowHeightFn,
-      scrollOffset,
-      totalRows,
-      viewportHeight
-    } = _classPrivateFieldGet(_options, this);
-    const zeroBasedScrollOffset = Math.max(_classPrivateFieldGet(_options, this).scrollOffset, 0);
-    const horizontalScrollbarHeight = _classPrivateFieldGet(_options, this).horizontalScrollbarHeight || 0;
-    const innerViewportHeight = zeroBasedScrollOffset + viewportHeight - horizontalScrollbarHeight;
-    let sum = 0;
-    let needReverse = true;
-    const startPositions = [];
-    let rowHeight;
-    let firstVisibleRowHeight = 0;
-    let lastVisibleRowHeight = 0;
-
-    // Calculate the number (start and end index) of rows needed
-    for (let i = 0; i < totalRows; i++) {
-      rowHeight = rowHeightFn(i);
-      if (isNaN(rowHeight)) {
-        rowHeight = ViewportRowsCalculator.DEFAULT_HEIGHT;
-      }
-      if (sum <= zeroBasedScrollOffset && calculationType !== _constants.FULLY_VISIBLE_TYPE) {
-        this.startRow = i;
-        firstVisibleRowHeight = rowHeight;
-      }
-      if (sum >= zeroBasedScrollOffset && sum + (calculationType === _constants.FULLY_VISIBLE_TYPE ? rowHeight : 0) <= innerViewportHeight) {
-        if (this.startRow === null) {
-          this.startRow = i;
-          firstVisibleRowHeight = rowHeight;
-        }
-        this.endRow = i;
-      }
-      startPositions.push(sum);
-      sum += rowHeight;
-      lastVisibleRowHeight = rowHeight;
-      if (calculationType !== _constants.FULLY_VISIBLE_TYPE) {
-        this.endRow = i;
-      }
-      if (sum >= innerViewportHeight) {
-        needReverse = false;
+    this._initialize(this);
+    for (let row = 0; row < this.totalRows; row++) {
+      this.rowHeight = this.getRowHeight(row);
+      this._process(row, this);
+      this.startPositions.push(this.totalCalculatedHeight);
+      this.totalCalculatedHeight += this.rowHeight;
+      if (this.totalCalculatedHeight >= this.innerViewportHeight) {
+        this.needReverse = false;
         break;
       }
     }
-    const mostBottomScrollOffset = scrollOffset + viewportHeight - horizontalScrollbarHeight;
-    const topRowOffset = calculationType === _constants.FULLY_VISIBLE_TYPE ? firstVisibleRowHeight : 0;
-    const bottomRowOffset = calculationType === _constants.FULLY_VISIBLE_TYPE ? 0 : lastVisibleRowHeight;
-    if (mostBottomScrollOffset < topRowOffset || scrollOffset > startPositions.at(-1) + bottomRowOffset) {
-      this.isVisibleInTrimmingContainer = false;
-    } else {
-      this.isVisibleInTrimmingContainer = true;
-    }
-
-    // If the estimation has reached the last row and there is still some space available in the viewport,
-    // we need to render in reverse in order to fill the whole viewport with rows
-    if (this.endRow === totalRows - 1 && needReverse) {
-      this.startRow = this.endRow;
-      while (this.startRow > 0) {
-        // rowHeight is the height of the last row
-        const viewportSum = startPositions[this.endRow] + rowHeight - startPositions[this.startRow - 1];
-        if (viewportSum <= viewportHeight - horizontalScrollbarHeight || calculationType !== _constants.FULLY_VISIBLE_TYPE) {
-          this.startRow -= 1;
-        }
-        if (viewportSum >= viewportHeight - horizontalScrollbarHeight) {
-          break;
-        }
-      }
-    }
-    if (calculationType === _constants.RENDER_TYPE && this.startRow !== null && overrideFn) {
-      overrideFn(this);
-    }
-    this.startPosition = startPositions[this.startRow];
-    if (this.startPosition === undefined) {
-      this.startPosition = null;
-    }
+    this._finalize(this);
+  }
 
-    // If totalRows exceeded its total rows size set endRow to the latest item
-    if (totalRows < this.endRow) {
-      this.endRow = totalRows - 1;
-    }
-    if (this.startRow !== null) {
-      this.count = this.endRow - this.startRow + 1;
+  /**
+   * Gets the row height at the specified row index.
+   *
+   * @param {number} row Row index.
+   * @returns {number}
+   */
+  getRowHeight(row) {
+    const rowHeight = this.rowHeightFn(row);
+    if (isNaN(rowHeight)) {
+      return DEFAULT_HEIGHT;
     }
+    return rowHeight;
   }
 }
 exports.ViewportRowsCalculator = ViewportRowsCalculator;