handsontable 14.4.0-next-1ffa7bc-20240606 → 14.5.0-next-ede811d-20240717

package/plugins/autoColumnSize/autoColumnSize.mjs

@@ -1,23 +1,15 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
-import "core-js/modules/esnext.set.difference.v2.js";
-import "core-js/modules/esnext.set.intersection.v2.js";
-import "core-js/modules/esnext.set.is-disjoint-from.v2.js";
-import "core-js/modules/esnext.set.is-subset-of.v2.js";
-import "core-js/modules/esnext.set.is-superset-of.v2.js";
-import "core-js/modules/esnext.set.symmetric-difference.v2.js";
-import "core-js/modules/esnext.set.union.v2.js";
-function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
-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 _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
+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 _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 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 { BasePlugin } from "../base/index.mjs";
-import { arrayEach, arrayFilter, arrayReduce, arrayMap } from "../../helpers/array.mjs";
 import { cancelAnimationFrame, requestAnimationFrame } from "../../helpers/feature.mjs";
 import GhostTable from "../../utils/ghostTable.mjs";
 import Hooks from "../../pluginHooks.mjs";
@@ -27,7 +19,6 @@ import SamplesGenerator from "../../utils/samplesGenerator.mjs";
 import { isPercentValue } from "../../helpers/string.mjs";
 import { ViewportColumnsCalculator } from "../../3rdparty/walkontable/src/index.mjs";
 import { PhysicalIndexToValueMap as IndexToValueMap } from "../../translations/index.mjs";
-import { isDefined } from "../../helpers/mixed.mjs";
 Hooks.getSingleton().register('modifyAutoColumnSizeSeed');
 export const PLUGIN_KEY = 'autoColumnSize';
 export const PLUGIN_PRIORITY = 10;
@@ -131,6 +122,7 @@ const COLUMN_SIZE_MAP_NAME = 'autoColumnSize';
  */
 /* eslint-enable jsdoc/require-description-complete-sentence */
 var _cachedColumnHeaders = /*#__PURE__*/new WeakMap();
+var _visualColumnsToRefresh = /*#__PURE__*/new WeakMap();
 var _AutoColumnSize_brand = /*#__PURE__*/new WeakSet();
 export class AutoColumnSize extends BasePlugin {
   static get PLUGIN_KEY() {
@@ -159,7 +151,9 @@ export class AutoColumnSize extends BasePlugin {
   constructor(hotInstance) {
     super(hotInstance);
     /**
-     * On before view render listener.
+     * Calculates specific columns width (overwrite cache values).
+     *
+     * @param {number[]} visualColumns List of visual columns to calculate.
      */
     _classPrivateMethodInitSpec(this, _AutoColumnSize_brand);
     _defineProperty(this, "ghostTable", new GhostTable(this.hot));
@@ -190,13 +184,6 @@ export class AutoColumnSize extends BasePlugin {
         bundleSeed
       };
     }));
-    /**
-     * `true` only if the first calculation was performed.
-     *
-     * @private
-     * @type {boolean}
-     */
-    _defineProperty(this, "firstCalculation", true);
     /**
      * `true` if the size calculation is in progress.
      *
@@ -223,6 +210,12 @@ export class AutoColumnSize extends BasePlugin {
      * @type {Array}
      */
     _classPrivateFieldInitSpec(this, _cachedColumnHeaders, []);
+    /**
+     * An array of column indexes whose width will be recalculated.
+     *
+     * @type {number[]}
+     */
+    _classPrivateFieldInitSpec(this, _visualColumnsToRefresh, []);
     this.hot.columnIndexMapper.registerMap(COLUMN_SIZE_MAP_NAME, this.columnWidthsMap);
 
     // Leave the listener active to allow auto-sizing the columns when the plugin is disabled.
@@ -259,11 +252,21 @@ export class AutoColumnSize extends BasePlugin {
       }
       return _assertClassBrand(_AutoColumnSize_brand, _this, _onAfterLoadData).call(_this, ...args);
     });
-    this.addHook('beforeChangeRender', changes => _assertClassBrand(_AutoColumnSize_brand, this, _onBeforeChange).call(this, changes));
-    this.addHook('afterFormulasValuesUpdate', changes => _assertClassBrand(_AutoColumnSize_brand, this, _onAfterFormulasValuesUpdate).call(this, changes));
-    this.addHook('beforeViewRender', force => _assertClassBrand(_AutoColumnSize_brand, this, _onBeforeViewRender).call(this, force));
+    this.addHook('beforeChangeRender', function () {
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
+      }
+      return _assertClassBrand(_AutoColumnSize_brand, _this, _onBeforeChange).call(_this, ...args);
+    });
+    this.addHook('afterFormulasValuesUpdate', function () {
+      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+        args[_key3] = arguments[_key3];
+      }
+      return _assertClassBrand(_AutoColumnSize_brand, _this, _onAfterFormulasValuesUpdate).call(_this, ...args);
+    });
+    this.addHook('beforeRender', () => _assertClassBrand(_AutoColumnSize_brand, this, _onBeforeRender).call(this));
     this.addHook('modifyColWidth', (width, col) => this.getColumnWidth(col, width));
-    this.addHook('afterInit', () => _assertClassBrand(_AutoColumnSize_brand, this, _onAfterInit).call(this));
+    this.addHook('init', () => _assertClassBrand(_AutoColumnSize_brand, this, _onInit).call(this));
     super.enablePlugin();
   }
 
@@ -271,11 +274,7 @@ export class AutoColumnSize extends BasePlugin {
    * Updates the plugin's state. This method is executed when {@link Core#updateSettings} is invoked.
    */
   updatePlugin() {
-    const changedColumns = this.findColumnsWhereHeaderWasChanged();
-    if (changedColumns.length) {
-      this.clearCache(changedColumns);
-      this.calculateVisibleColumnsWidth();
-    }
+    _classPrivateFieldSet(_visualColumnsToRefresh, this, this.findColumnsWhereHeaderWasChanged());
     super.updatePlugin();
   }
 
@@ -291,25 +290,23 @@ export class AutoColumnSize extends BasePlugin {
   }
 
   /**
-   * Calculates visible columns width.
+   * Calculates widths for visible columns in the viewport only.
    */
   calculateVisibleColumnsWidth() {
-    const rowsCount = this.hot.countRows();
-
     // Keep last column widths unchanged for situation when all rows was deleted or trimmed (pro #6)
-    if (!rowsCount) {
+    if (!this.hot.countRows()) {
       return;
     }
-    const force = this.hot.renderCall;
     const firstVisibleColumn = this.getFirstVisibleColumn();
     const lastVisibleColumn = this.getLastVisibleColumn();
     if (firstVisibleColumn === -1 || lastVisibleColumn === -1) {
       return;
     }
+    const overwriteCache = this.hot.renderCall;
     this.calculateColumnsWidth({
       from: firstVisibleColumn,
       to: lastVisibleColumn
-    }, undefined, force);
+    }, undefined, overwriteCache);
   }
 
   /**
@@ -317,7 +314,7 @@ export class AutoColumnSize extends BasePlugin {
    *
    * @param {number|object} colRange Visual column index or an object with `from` and `to` visual indexes as a range.
    * @param {number|object} rowRange Visual row index or an object with `from` and `to` visual indexes as a range.
-   * @param {boolean} [force=false] If `true` the calculation will be processed regardless of whether the width exists in the cache.
+   * @param {boolean} [overwriteCache=false] If `true` the calculation will be processed regardless of whether the width exists in the cache.
    */
   calculateColumnsWidth() {
     let colRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
@@ -328,8 +325,7 @@ export class AutoColumnSize extends BasePlugin {
       from: 0,
       to: this.hot.countRows() - 1
     };
-    let force = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    // eslint-disable-line max-len
+    let overwriteCache = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     const columnsRange = typeof colRange === 'number' ? {
       from: colRange,
       to: colRange
@@ -343,12 +339,9 @@ export class AutoColumnSize extends BasePlugin {
       if (physicalColumn === null) {
         physicalColumn = visualColumn;
       }
-      if (force || this.columnWidthsMap.getValueAtIndex(physicalColumn) === null && !this.hot._getColWidthFromSettings(physicalColumn)) {
+      if (overwriteCache || this.columnWidthsMap.getValueAtIndex(physicalColumn) === null && !this.hot._getColWidthFromSettings(physicalColumn)) {
         const samples = this.samplesGenerator.generateColumnSamples(visualColumn, rowsRange);
-        arrayEach(samples, _ref => {
-          let [column, sample] = _ref;
-          return this.ghostTable.addColumn(column, sample);
-        });
+        samples.forEach((sample, column) => this.ghostTable.addColumn(column, sample));
       }
     });
     if (this.ghostTable.columns.length) {
@@ -368,12 +361,14 @@ export class AutoColumnSize extends BasePlugin {
    * To retrieve width for specified column use {@link AutoColumnSize#getColumnWidth} method.
    *
    * @param {object|number} rowRange Row index or an object with `from` and `to` properties which define row range.
+   * @param {boolean} [overwriteCache] If `true` the calculation will be processed regardless of whether the width exists in the cache.
    */
   calculateAllColumnsWidth() {
     let rowRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
       from: 0,
       to: this.hot.countRows() - 1
     };
+    let overwriteCache = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     let current = 0;
     const length = this.hot.countCols() - 1;
     let timer = null;
@@ -388,7 +383,7 @@ export class AutoColumnSize extends BasePlugin {
       this.calculateColumnsWidth({
         from: current,
         to: Math.min(current + AutoColumnSize.CALCULATION_STEP, length)
-      }, rowRange);
+      }, rowRange, overwriteCache);
       current = current + AutoColumnSize.CALCULATION_STEP + 1;
       if (current < length) {
         timer = requestAnimationFrame(loop);
@@ -403,12 +398,11 @@ export class AutoColumnSize extends BasePlugin {
     const syncLimit = this.getSyncCalculationLimit();
 
     // sync
-    if (this.firstCalculation && syncLimit >= 0) {
+    if (syncLimit >= 0) {
       this.calculateColumnsWidth({
         from: 0,
         to: syncLimit
-      }, rowRange);
-      this.firstCalculation = false;
+      }, rowRange, overwriteCache);
       current = syncLimit + 1;
     }
     // async
@@ -418,7 +412,6 @@ export class AutoColumnSize extends BasePlugin {
       this.inProgress = false;
     }
   }
-
   /**
    * Sets the sampling options.
    *
@@ -440,9 +433,11 @@ export class AutoColumnSize extends BasePlugin {
    * Recalculates all columns width (overwrite cache values).
    */
   recalculateAllColumnsWidth() {
-    if (this.hot.view && this.hot.view._wt.wtTable.isVisible()) {
-      this.clearCache();
-      this.calculateAllColumnsWidth();
+    if (this.hot.view.isVisible()) {
+      this.calculateAllColumnsWidth({
+        from: 0,
+        to: this.hot.countRows() - 1
+      }, true);
     }
   }
 
@@ -477,8 +472,7 @@ export class AutoColumnSize extends BasePlugin {
    * @param {boolean} [keepMinimum=true] If `true` then returned value won't be smaller then 50 (default column width).
    * @returns {number}
    */
-  getColumnWidth(column) {
-    let defaultWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+  getColumnWidth(column, defaultWidth) {
     let keepMinimum = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     let width = defaultWidth;
     if (width === undefined) {
@@ -496,23 +490,8 @@ export class AutoColumnSize extends BasePlugin {
    * @returns {number} Returns visual column index, -1 if table is not rendered or if there are no columns to base the the calculations on.
    */
   getFirstVisibleColumn() {
-    const wot = this.hot.view._wt;
-    if (wot.wtViewport.columnsVisibleCalculator) {
-      // Fist fully visible column is stored as renderable index.
-      const firstFullyVisibleColumn = wot.wtTable.getFirstVisibleColumn();
-      if (firstFullyVisibleColumn !== -1) {
-        return this.hot.columnIndexMapper.getVisualFromRenderableIndex(firstFullyVisibleColumn);
-      }
-    }
-    if (wot.wtViewport.columnsRenderCalculator) {
-      const firstRenderedColumn = wot.wtTable.getFirstRenderedColumn();
-
-      // There are no rendered column.
-      if (firstRenderedColumn !== -1) {
-        return this.hot.columnIndexMapper.getVisualFromRenderableIndex(firstRenderedColumn);
-      }
-    }
-    return -1;
+    var _this$hot$view$getFir;
+    return (_this$hot$view$getFir = this.hot.view.getFirstRenderedVisibleColumn()) !== null && _this$hot$view$getFir !== void 0 ? _this$hot$view$getFir : -1;
   }
 
   /**
@@ -521,38 +500,22 @@ export class AutoColumnSize extends BasePlugin {
    * @returns {number} Returns visual column index or -1 if table is not rendered.
    */
   getLastVisibleColumn() {
-    const wot = this.hot.view._wt;
-    if (wot.wtViewport.columnsVisibleCalculator) {
-      // Last fully visible column is stored as renderable index.
-      const lastFullyVisibleColumn = wot.wtTable.getLastVisibleColumn();
-      if (lastFullyVisibleColumn !== -1) {
-        return this.hot.columnIndexMapper.getVisualFromRenderableIndex(lastFullyVisibleColumn);
-      }
-    }
-    if (wot.wtViewport.columnsRenderCalculator) {
-      // Last fully visible column is stored as renderable index.
-      const lastRenderedColumn = wot.wtTable.getLastRenderedColumn();
-
-      // There are no rendered columns.
-      if (lastRenderedColumn !== -1) {
-        return this.hot.columnIndexMapper.getVisualFromRenderableIndex(lastRenderedColumn);
-      }
-    }
-    return -1;
+    var _this$hot$view$getLas;
+    return (_this$hot$view$getLas = this.hot.view.getLastRenderedVisibleColumn()) !== null && _this$hot$view$getLas !== void 0 ? _this$hot$view$getLas : -1;
   }
 
   /**
    * Collects all columns which titles has been changed in comparison to the previous state.
    *
    * @private
-   * @returns {Array} It returns an array of physical column indexes.
+   * @returns {Array} It returns an array of visual column indexes.
    */
   findColumnsWhereHeaderWasChanged() {
     const columnHeaders = this.hot.getColHeader();
-    const changedColumns = arrayReduce(columnHeaders, (acc, columnTitle, physicalColumn) => {
+    const changedColumns = columnHeaders.reduce((acc, columnTitle, physicalColumn) => {
       const cachedColumnsLength = _classPrivateFieldGet(_cachedColumnHeaders, this).length;
       if (cachedColumnsLength - 1 < physicalColumn || _classPrivateFieldGet(_cachedColumnHeaders, this)[physicalColumn] !== columnTitle) {
-        acc.push(physicalColumn);
+        acc.push(this.hot.toVisualColumn(physicalColumn));
       }
       if (cachedColumnsLength - 1 < physicalColumn) {
         _classPrivateFieldGet(_cachedColumnHeaders, this).push(columnTitle);
@@ -568,13 +531,12 @@ export class AutoColumnSize extends BasePlugin {
    * Clears cache of calculated column widths. If you want to clear only selected columns pass an array with their indexes.
    * Otherwise whole cache will be cleared.
    *
-   * @param {number[]} [columns] List of physical column indexes to clear.
+   * @param {number[]} [physicalColumns] List of physical column indexes to clear.
    */
-  clearCache() {
-    let columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    if (columns.length) {
+  clearCache(physicalColumns) {
+    if (Array.isArray(physicalColumns)) {
       this.hot.batchExecution(() => {
-        arrayEach(columns, physicalIndex => {
+        physicalColumns.forEach(physicalIndex => {
           this.columnWidthsMap.setValueAtIndex(physicalIndex, null);
         });
       }, true);
@@ -589,8 +551,13 @@ export class AutoColumnSize extends BasePlugin {
    * @returns {boolean}
    */
   isNeedRecalculate() {
-    return !!arrayFilter(this.columnWidthsMap.getValues().slice(0, this.measuredColumns), item => item === null).length;
+    return !!this.columnWidthsMap.getValues().slice(0, this.measuredColumns).filter(item => item === null).length;
   }
+
+  /**
+   * On before view render listener.
+   */
+
   /**
    * Destroys the plugin instance.
    */
@@ -599,25 +566,47 @@ export class AutoColumnSize extends BasePlugin {
     super.destroy();
   }
 }
-function _onBeforeViewRender() {
+function _calculateSpecificColumnsWidth(visualColumns) {
+  const rowsRange = {
+    from: 0,
+    to: this.hot.countRows() - 1
+  };
+  visualColumns.forEach(visualColumn => {
+    const physicalColumn = this.hot.toPhysicalColumn(visualColumn);
+    if (physicalColumn === null) {
+      return;
+    }
+    if (!this.hot._getColWidthFromSettings(physicalColumn)) {
+      const samples = this.samplesGenerator.generateColumnSamples(visualColumn, rowsRange);
+      samples.forEach((sample, column) => this.ghostTable.addColumn(column, sample));
+    }
+  });
+  if (this.ghostTable.columns.length) {
+    this.hot.batchExecution(() => {
+      this.ghostTable.getWidths((visualColumn, width) => {
+        const physicalColumn = this.hot.toPhysicalColumn(visualColumn);
+        this.columnWidthsMap.setValueAtIndex(physicalColumn, width);
+      });
+    }, true);
+    this.ghostTable.clean();
+  }
+}
+function _onBeforeRender() {
   this.calculateVisibleColumnsWidth();
-  if (this.isNeedRecalculate() && !this.inProgress) {
-    this.calculateAllColumnsWidth();
+  if (!this.inProgress) {
+    _assertClassBrand(_AutoColumnSize_brand, this, _calculateSpecificColumnsWidth).call(this, _classPrivateFieldGet(_visualColumnsToRefresh, this));
+    _classPrivateFieldSet(_visualColumnsToRefresh, this, []);
   }
 }
 /**
  * On after load data listener.
+ *
+ * @param {Array} sourceData Source data.
+ * @param {boolean} isFirstLoad `true` if this is the first load.
  */
-function _onAfterLoadData() {
-  if (this.hot.view) {
+function _onAfterLoadData(sourceData, isFirstLoad) {
+  if (!isFirstLoad) {
     this.recalculateAllColumnsWidth();
-  } else {
-    // first load - initialization
-    setTimeout(() => {
-      if (this.hot) {
-        this.recalculateAllColumnsWidth();
-      }
-    }, 0);
   }
 }
 /**
@@ -626,11 +615,15 @@ function _onAfterLoadData() {
  * @param {Array} changes An array of modified data.
  */
 function _onBeforeChange(changes) {
-  const changedColumns = arrayMap(changes, _ref2 => {
-    let [, columnProperty] = _ref2;
-    return this.hot.toPhysicalColumn(this.hot.propToCol(columnProperty));
-  });
-  this.clearCache(Array.from(new Set(changedColumns)));
+  const changedColumns = changes.reduce((acc, _ref) => {
+    let [, columnProperty] = _ref;
+    const visualColumn = this.hot.propToCol(columnProperty);
+    if (Number.isInteger(visualColumn) && acc.indexOf(visualColumn) === -1) {
+      acc.push(visualColumn);
+    }
+    return acc;
+  }, []);
+  _classPrivateFieldGet(_visualColumnsToRefresh, this).push(...changedColumns);
 }
 /**
  * On before column resize listener.
@@ -651,8 +644,9 @@ function _onBeforeColumnResize(size, column, isDblClick) {
 /**
  * On after Handsontable init fill plugin with all necessary values.
  */
-function _onAfterInit() {
+function _onInit() {
   _classPrivateFieldSet(_cachedColumnHeaders, this, this.hot.getColHeader());
+  this.recalculateAllColumnsWidth();
 }
 /**
  * After formulas values updated listener.
@@ -660,10 +654,16 @@ function _onAfterInit() {
  * @param {Array} changes An array of modified data.
  */
 function _onAfterFormulasValuesUpdate(changes) {
-  const filteredChanges = arrayFilter(changes, change => {
+  const changedColumns = changes.reduce((acc, change) => {
     var _change$address;
-    return isDefined((_change$address = change.address) === null || _change$address === void 0 ? void 0 : _change$address.col);
-  });
-  const changedColumns = arrayMap(filteredChanges, change => change.address.col);
-  this.clearCache(Array.from(new Set(changedColumns)));
+    const physicalColumn = (_change$address = change.address) === null || _change$address === void 0 ? void 0 : _change$address.col;
+    if (Number.isInteger(physicalColumn)) {
+      const visualColumn = this.hot.toVisualColumn(physicalColumn);
+      if (acc.indexOf(visualColumn) === -1) {
+        acc.push(visualColumn);
+      }
+    }
+    return acc;
+  }, []);
+  _classPrivateFieldGet(_visualColumnsToRefresh, this).push(...changedColumns);
 }

package/plugins/autoRowSize/autoRowSize.d.ts

@@ -15,6 +15,7 @@ export class AutoRowSize extends BasePlugin {
   measuredRows: number;
 
   isEnabled(): boolean;
+  calculateVisibleRowsHeight(): void;
   calculateRowsHeight(rowRange?: number | { from: number, to: number }, colRange?: number | { from: number, to: number }, force?: boolean): void;
   calculateAllRowsHeight(colRange?: number | { from: number, to: number }): void;
   recalculateAllRowsHeight(): void;
@@ -23,7 +24,7 @@ export class AutoRowSize extends BasePlugin {
   getColumnHeaderHeight(): number;
   getFirstVisibleRow(): number;
   getLastVisibleRow(): number;
-  clearCache(): void;
+  clearCache(physicalRows?: number[]): void;
   clearCacheByRange(range: number | { from: number, to: number }): void;
   isNeedRecalculate(): boolean;
 }