handsontable 0.0.0-next-44bc39b-20250312 → 0.0.0-next-19f5179-20250314

package/plugins/formulas/formulas.mjs

@@ -10,7 +10,6 @@ import "core-js/modules/es.set.symmetric-difference.v2.js";
 import "core-js/modules/es.set.union.v2.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.every.js";
-import "core-js/modules/esnext.iterator.find.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
@@ -27,8 +26,8 @@ import staticRegister from "../../utils/staticRegister.mjs";
 import { error, warn } from "../../helpers/console.mjs";
 import { isNumeric } from "../../helpers/number.mjs";
 import { isDefined, isUndefined } from "../../helpers/mixed.mjs";
-import { setupEngine, setupSheet, unregisterEngine, getRegisteredHotInstances } from "./engine/register.mjs";
-import { isEscapedFormulaExpression, unescapeFormulaExpression, isDate, isDateValid, getDateInHfFormat, getDateFromExcelDate, getDateInHotFormat, isFormula } from "./utils.mjs";
+import { getRegisteredHotInstances, setupEngine, setupSheet, unregisterEngine } from "./engine/register.mjs";
+import { getDateFromExcelDate, getDateInHfFormat, getDateInHotFormat, isDate, isDateValid, isFormula, unescapeFormulaExpression } from "./utils.mjs";
 import { getEngineSettingsWithOverrides, haveEngineSettingsChanged } from "./engine/settings.mjs";
 import { isArrayOfArrays } from "../../helpers/data.mjs";
 import { toUpperCaseFirst } from "../../helpers/string.mjs";
@@ -70,13 +69,9 @@ export class Formulas extends BasePlugin {
     super(...arguments);
     _this = this;
     /**
-     * The hook allows to translate the formula value to calculated value before it goes to the
-     * validator function.
+     * Update sheetName and sheetId properties.
      *
-     * @param {*} value The cell value to validate.
-     * @param {number} visualRow The visual row index.
-     * @param {number|string} prop The visual column index or property name of the column.
-     * @returns {*} Returns value to validate.
+     * @param {string} [sheetName] The new sheet name.
      */
     _classPrivateMethodInitSpec(this, _Formulas_brand);
     /**
@@ -143,6 +138,12 @@ export class Formulas extends BasePlugin {
      * @type {HyperFormula|null}
      */
     _defineProperty(this, "engine", null);
+    /**
+     * HyperFormula's sheet id.
+     *
+     * @type {number|null}
+     */
+    _defineProperty(this, "sheetId", null);
     /**
      * HyperFormula's sheet name.
      *
@@ -177,15 +178,6 @@ export class Formulas extends BasePlugin {
   static get SETTING_KEYS() {
     return [PLUGIN_KEY, ...SETTING_KEYS];
   }
-  /**
-   * HyperFormula's sheet id.
-   *
-   * @type {number|null}
-   */
-  get sheetId() {
-    return this.sheetName === null ? null : this.engine.getSheetId(this.sheetName);
-  }
-
   /**
    * Checks if the plugin is enabled in the handsontable settings. This method is executed in {@link Hooks#beforeInit}
    * hook and if it returns `true` then the {@link Formulas#enablePlugin} method is called.
@@ -216,7 +208,7 @@ export class Formulas extends BasePlugin {
     if (this.sheetName !== null && !this.engine.doesSheetExist(this.sheetName)) {
       const newSheetName = this.addSheet(this.sheetName, this.hot.getSourceDataArray());
       if (newSheetName !== false) {
-        this.sheetName = newSheetName;
+        _assertClassBrand(_Formulas_brand, this, _updateSheetNameAndSheetId).call(this, newSheetName);
       }
     }
     this.addHook('beforeLoadData', function () {
@@ -447,7 +439,8 @@ export class Formulas extends BasePlugin {
       if (sheetName && this.engine.doesSheetExist(sheetName)) {
         this.switchSheet(this.sheetName);
       } else {
-        this.sheetName = this.addSheet(sheetName !== null && sheetName !== void 0 ? sheetName : undefined, this.hot.getSourceDataArray());
+        const newSheetName = this.addSheet(sheetName !== null && sheetName !== void 0 ? sheetName : undefined, this.hot.getSourceDataArray());
+        _assertClassBrand(_Formulas_brand, this, _updateSheetNameAndSheetId).call(this, newSheetName);
       }
     }
     super.updatePlugin(newSettings);
@@ -467,7 +460,6 @@ export class Formulas extends BasePlugin {
     this.engine = null;
     super.destroy();
   }
-
   /**
    * Add a sheet to the shared HyperFormula instance.
    *
@@ -510,7 +502,7 @@ export class Formulas extends BasePlugin {
       error(`The sheet named \`${sheetName}\` does not exist, switch aborted.`);
       return;
     }
-    this.sheetName = sheetName;
+    _assertClassBrand(_Formulas_brand, this, _updateSheetNameAndSheetId).call(this, sheetName);
     const serialized = this.engine.getSheetSerialized(this.sheetId);
     if (serialized.length > 0) {
       this.hot.loadData(serialized, `${toUpperCaseFirst(PLUGIN_KEY)}.switchSheet`);
@@ -670,6 +662,20 @@ export class Formulas extends BasePlugin {
     }
     return this.engine.setCellContents(address, newValue);
   }
+
+  /**
+   * The hook allows to translate the formula value to calculated value before it goes to the
+   * validator function.
+   *
+   * @param {*} value The cell value to validate.
+   * @param {number} visualRow The visual row index.
+   * @param {number|string} prop The visual column index or property name of the column.
+   * @returns {*} Returns value to validate.
+   */
+}
+function _updateSheetNameAndSheetId(sheetName) {
+  this.sheetName = sheetName;
+  this.sheetId = this.engine.getSheetId(this.sheetName);
 }
 function _onBeforeValidate(value, visualRow, prop) {
   const visualColumn = this.hot.propToCol(prop);
@@ -798,29 +804,33 @@ function _onBeforeLoadData(sourceData, initialLoad) {
  * Callback to `afterCellMetaReset` hook which is triggered after setting cell meta.
  */
 function _onAfterCellMetaReset() {
+  if (_classPrivateFieldGet(_hotWasInitializedWithEmptyData, this)) {
+    this.switchSheet(this.sheetName);
+    return;
+  }
   const sourceDataArray = this.hot.getSourceDataArray();
-  let valueChanged = false;
   sourceDataArray.forEach((rowData, rowIndex) => {
     rowData.forEach((cellValue, columnIndex) => {
-      const cellMeta = this.hot.getCellMeta(rowIndex, columnIndex);
+      const cellMeta = this.hot.getCellMeta(rowIndex, columnIndex, {
+        skipMetaExtension: true
+      });
       const dateFormat = cellMeta.dateFormat;
       if (isDate(cellValue, cellMeta.type)) {
-        valueChanged = true;
         if (isDateValid(cellValue, dateFormat)) {
           // Rewriting date in HOT format to HF format.
           sourceDataArray[rowIndex][columnIndex] = getDateInHfFormat(cellValue, dateFormat);
-        } else if (this.isFormulaCellType(rowIndex, columnIndex) === false) {
+        } else if (!cellValue.startsWith('=')) {
           // Escaping value from date parsing using "'" sign (HF feature).
           sourceDataArray[rowIndex][columnIndex] = `'${cellValue}`;
         }
       }
     });
   });
-  if (valueChanged === true) {
-    _classPrivateFieldSet(_internalOperationPending, this, true);
-    this.engine.setSheetContent(this.sheetId, sourceDataArray);
-    _classPrivateFieldSet(_internalOperationPending, this, false);
-  }
+  _classPrivateFieldSet(_internalOperationPending, this, true);
+  const dependentCells = this.engine.setSheetContent(this.sheetId, sourceDataArray);
+  this.indexSyncer.setupSyncEndpoint(this.engine, this.sheetId);
+  this.renderDependentSheets(dependentCells);
+  _classPrivateFieldSet(_internalOperationPending, this, false);
 }
 /**
  * `afterLoadData` hook callback.
@@ -834,7 +844,12 @@ function _onAfterLoadData(sourceData, initialLoad) {
   if (source.includes(toUpperCaseFirst(PLUGIN_KEY))) {
     return;
   }
-  this.sheetName = setupSheet(this.engine, this.hot.getSettings()[PLUGIN_KEY].sheetName);
+  const sheetName = setupSheet(this.engine, this.hot.getSettings()[PLUGIN_KEY].sheetName);
+  _assertClassBrand(_Formulas_brand, this, _updateSheetNameAndSheetId).call(this, sheetName);
+  if (source === 'updateSettings') {
+    // For performance reasons, the initialization will be done in afterCellMetaReset hook
+    return;
+  }
   if (!_classPrivateFieldGet(_hotWasInitializedWithEmptyData, this)) {
     const sourceDataArray = this.hot.getSourceDataArray();
     if (this.engine.isItPossibleToReplaceSheetContent(this.sheetId, sourceDataArray)) {
@@ -865,17 +880,10 @@ function _onModifyData(physicalRow, visualColumn, valueHolder, ioMode) {
   if (visualRow === null || visualColumn === null) {
     return;
   }
-
-  // `column` is here as visual index because of inconsistencies related to hook execution in `src/dataMap`.
-  const isFormulaCellType = this.isFormulaCellType(visualRow, visualColumn);
-  if (!isFormulaCellType) {
-    const cellType = this.getCellType(visualRow, visualColumn);
-    if (cellType !== 'ARRAY') {
-      if (isEscapedFormulaExpression(valueHolder.value)) {
-        valueHolder.value = unescapeFormulaExpression(valueHolder.value);
-      }
-      return;
-    }
+  const cellType = this.getCellType(visualRow, visualColumn);
+  if (cellType === 'VALUE' || cellType === 'EMPTY') {
+    valueHolder.value = unescapeFormulaExpression(valueHolder.value);
+    return;
   }
   const address = {
     row: this.rowAxisSyncer.getHfIndexFromVisualIndex(visualRow),
@@ -884,21 +892,15 @@ function _onModifyData(physicalRow, visualColumn, valueHolder, ioMode) {
   };
   let cellValue = this.engine.getCellValue(address); // Date as an integer (Excel like date).
 
-  // TODO: Workaround. We use HOT's `getCellsMeta` method instead of HOT's `getCellMeta` method. Getting cell meta
-  // using the second method lead to execution of the `cells` method. Using the `getDataAtCell` (which may be useful)
-  // in a callback to the `cells` method leads to triggering the `modifyData` hook. Thus, the `onModifyData` callback
-  // is executed once again and it cause creation of an infinite loop.
-  let cellMeta = this.hot.getCellsMeta().find(singleCellMeta => singleCellMeta.visualRow === visualRow && singleCellMeta.visualCol === visualColumn);
-  if (cellMeta === undefined) {
-    cellMeta = {};
-  }
+  const cellMeta = this.hot.getCellMeta(visualRow, visualColumn, {
+    skipMetaExtension: true
+  });
   if (cellMeta.type === 'date' && isNumeric(cellValue)) {
     cellValue = getDateFromExcelDate(cellValue, cellMeta.dateFormat);
   }
 
   // If `cellValue` is an object it is expected to be an error
-  const value = typeof cellValue === 'object' && cellValue !== null ? cellValue.value : cellValue;
-  valueHolder.value = value;
+  valueHolder.value = typeof cellValue === 'object' && cellValue !== null ? cellValue.value : cellValue;
 }
 /**
  * `modifySourceData` hook callback.
@@ -918,14 +920,9 @@ function _onModifySourceData(row, columnOrProp, valueHolder, ioMode) {
   if (visualRow === null || visualColumn === null) {
     return;
   }
-
-  // `column` is here as visual index because of inconsistencies related to hook execution in `src/dataMap`.
-  const isFormulaCellType = this.isFormulaCellType(visualRow, visualColumn);
-  if (!isFormulaCellType) {
-    const cellType = this.getCellType(visualRow, visualColumn);
-    if (cellType !== 'ARRAY') {
-      return;
-    }
+  const cellType = this.getCellType(visualRow, visualColumn);
+  if (cellType === 'VALUE' || cellType === 'EMPTY') {
+    return;
   }
   const dimensions = this.engine.getSheetDimensions(this.engine.getSheetId(this.sheetName));
 
@@ -1234,7 +1231,7 @@ function _onEngineSheetAdded(addedSheetDisplayName) {
  * @param {string} newDisplayName The new name of the sheet.
  */
 function _onEngineSheetRenamed(oldDisplayName, newDisplayName) {
-  this.sheetName = newDisplayName;
+  _assertClassBrand(_Formulas_brand, this, _updateSheetNameAndSheetId).call(this, newDisplayName);
   this.hot.runHooks('afterSheetRenamed', oldDisplayName, newDisplayName);
 }
 /**

package/plugins/formulas/indexSyncer/axisSyncer.js

@@ -118,7 +118,11 @@ class AxisSyncer {
   getHfIndexFromVisualIndex(visualIndex) {
     const indexesSequence = _classPrivateFieldGet(_indexMapper, this).getIndexesSequence();
     const notTrimmedIndexes = _classPrivateFieldGet(_indexMapper, this).getNotTrimmedIndexes();
-    return indexesSequence.indexOf(notTrimmedIndexes[visualIndex]);
+
+    // Optimization:
+    // notTrimmedIndexes is a subset of indexesSequence,
+    // so for every x indexesSequence.indexOf(x) is always >= notTrimmedIndexes.indexOf(x)
+    return indexesSequence.indexOf(notTrimmedIndexes[visualIndex], visualIndex);
   }
 
   /**

package/plugins/formulas/indexSyncer/axisSyncer.mjs

@@ -115,7 +115,11 @@ class AxisSyncer {
   getHfIndexFromVisualIndex(visualIndex) {
     const indexesSequence = _classPrivateFieldGet(_indexMapper, this).getIndexesSequence();
     const notTrimmedIndexes = _classPrivateFieldGet(_indexMapper, this).getNotTrimmedIndexes();
-    return indexesSequence.indexOf(notTrimmedIndexes[visualIndex]);
+
+    // Optimization:
+    // notTrimmedIndexes is a subset of indexesSequence,
+    // so for every x indexesSequence.indexOf(x) is always >= notTrimmedIndexes.indexOf(x)
+    return indexesSequence.indexOf(notTrimmedIndexes[visualIndex], visualIndex);
   }
 
   /**

package/styles/handsontable.css

@@ -25,8 +25,8 @@
  * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM
  * USE OR INABILITY TO USE THIS SOFTWARE.
  *
- * Version: 0.0.0-next-44bc39b-20250312
- * Release date: 20/02/2025 (built at 12/03/2025 14:34:52)
+ * Version: 0.0.0-next-19f5179-20250314
+ * Release date: 20/02/2025 (built at 14/03/2025 08:46:43)
  */
 .ht-wrapper:not([class*=ht-theme]) {
   --ht-gap-size: 4px;
@@ -2145,7 +2145,6 @@
   cursor: row-resize;
   background: none;
   opacity: 0;
-  transition: opacity 0.2s ease-in-out;
 }
 .handsontable .manualRowResizer::before, .handsontable .manualRowResizer::after {
   content: "";
@@ -2172,7 +2171,7 @@
   left: 0;
   bottom: 0;
   height: 0;
-  margin-top: 4px;
+  margin-top: 5px;
   display: none;
   border-bottom: 1px solid var(--ht-accent-color);
   border-top: none;