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

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-44bc39b-20250312";
+  const hotVersion = "0.0.0-next-19f5179-20250314";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-44bc39b-20250312";
+  const hotVersion = "0.0.0-next-19f5179-20250314";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-44bc39b-20250312",
+  "version": "0.0.0-next-19f5179-20250314",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/autoColumnSize/autoColumnSize.js

@@ -129,6 +129,7 @@ const COLUMN_SIZE_MAP_NAME = 'autoColumnSize';
  * :::
  */
 /* eslint-enable jsdoc/require-description-complete-sentence */
+var _isInitialized = /*#__PURE__*/new WeakMap();
 var _cachedColumnHeaders = /*#__PURE__*/new WeakMap();
 var _visualColumnsToRefresh = /*#__PURE__*/new WeakMap();
 var _AutoColumnSize_brand = /*#__PURE__*/new WeakSet();
@@ -218,6 +219,12 @@ class AutoColumnSize extends _base.BasePlugin {
      * @type {PhysicalIndexToValueMap}
      */
     _defineProperty(this, "columnWidthsMap", new _translations.PhysicalIndexToValueMap());
+    /**
+     * `true` value indicates that the #onInit() function has been already called.
+     *
+     * @type {boolean}
+     */
+    _classPrivateFieldInitSpec(this, _isInitialized, false);
     /**
      * Cached column header names. It is used to diff current column headers with previous state and detect which
      * columns width should be updated.
@@ -356,17 +363,11 @@ class AutoColumnSize extends _base.BasePlugin {
         physicalColumn = visualColumn;
       }
       if (overwriteCache || this.columnWidthsMap.getValueAtIndex(physicalColumn) === null && !this.hot._getColWidthFromSettings(physicalColumn)) {
-        const samples = this.samplesGenerator.generateColumnSamples(visualColumn, rowsRange);
-        samples.forEach((sample, column) => this.ghostTable.addColumn(column, sample));
+        _assertClassBrand(_AutoColumnSize_brand, this, _fillGhostTableWithSamples).call(this, visualColumn, rowsRange);
       }
     });
     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);
+      _assertClassBrand(_AutoColumnSize_brand, this, _updateColumnWidthsMapBasedOnGhostTable).call(this);
       this.measuredColumns = columnsRange.to + 1;
       this.ghostTable.clean();
     }
@@ -577,20 +578,36 @@ function _calculateSpecificColumnsWidth(visualColumns) {
       return;
     }
     if (!this.hot._getColWidthFromSettings(physicalColumn)) {
-      const samples = this.samplesGenerator.generateColumnSamples(visualColumn, rowsRange);
-      samples.forEach((sample, column) => this.ghostTable.addColumn(column, sample));
+      _assertClassBrand(_AutoColumnSize_brand, this, _fillGhostTableWithSamples).call(this, visualColumn, rowsRange);
     }
   });
   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);
+    _assertClassBrand(_AutoColumnSize_brand, this, _updateColumnWidthsMapBasedOnGhostTable).call(this);
     this.ghostTable.clean();
   }
 }
+/**
+ * Processes a single column for width calculation.
+ *
+ * @param {number} visualColumn Visual column index.
+ * @param {object} rowsRange Range of rows to process.
+ */
+function _fillGhostTableWithSamples(visualColumn, rowsRange) {
+  const samples = this.samplesGenerator.generateColumnSamples(visualColumn, rowsRange);
+  samples.forEach((sample, column) => this.ghostTable.addColumn(column, sample));
+}
+/**
+ * Updates the column widths map with calculated widths from the ghost table.
+ *
+ */
+function _updateColumnWidthsMapBasedOnGhostTable() {
+  this.hot.batchExecution(() => {
+    this.ghostTable.getWidths((visualColumn, width) => {
+      const physicalColumn = this.hot.toPhysicalColumn(visualColumn);
+      this.columnWidthsMap.setValueAtIndex(physicalColumn, width);
+    });
+  }, true);
+}
 function _onBeforeRender() {
   this.calculateVisibleColumnsWidth();
   if (!this.inProgress) {
@@ -647,6 +664,7 @@ function _onBeforeColumnResize(size, column, isDblClick) {
 function _onInit() {
   _classPrivateFieldSet(_cachedColumnHeaders, this, this.hot.getColHeader());
   this.recalculateAllColumnsWidth();
+  _classPrivateFieldSet(_isInitialized, this, true);
 }
 /**
  * After formulas values updated listener.
@@ -654,6 +672,9 @@ function _onInit() {
  * @param {Array} changes An array of modified data.
  */
 function _onAfterFormulasValuesUpdate(changes) {
+  if (!_classPrivateFieldGet(_isInitialized, this)) {
+    return;
+  }
   const changedColumns = changes.reduce((acc, change) => {
     var _change$address;
     const physicalColumn = (_change$address = change.address) === null || _change$address === void 0 ? void 0 : _change$address.col;

package/plugins/autoColumnSize/autoColumnSize.mjs

@@ -125,6 +125,7 @@ const COLUMN_SIZE_MAP_NAME = 'autoColumnSize';
  * :::
  */
 /* eslint-enable jsdoc/require-description-complete-sentence */
+var _isInitialized = /*#__PURE__*/new WeakMap();
 var _cachedColumnHeaders = /*#__PURE__*/new WeakMap();
 var _visualColumnsToRefresh = /*#__PURE__*/new WeakMap();
 var _AutoColumnSize_brand = /*#__PURE__*/new WeakSet();
@@ -214,6 +215,12 @@ export class AutoColumnSize extends BasePlugin {
      * @type {PhysicalIndexToValueMap}
      */
     _defineProperty(this, "columnWidthsMap", new IndexToValueMap());
+    /**
+     * `true` value indicates that the #onInit() function has been already called.
+     *
+     * @type {boolean}
+     */
+    _classPrivateFieldInitSpec(this, _isInitialized, false);
     /**
      * Cached column header names. It is used to diff current column headers with previous state and detect which
      * columns width should be updated.
@@ -352,17 +359,11 @@ export class AutoColumnSize extends BasePlugin {
         physicalColumn = visualColumn;
       }
       if (overwriteCache || this.columnWidthsMap.getValueAtIndex(physicalColumn) === null && !this.hot._getColWidthFromSettings(physicalColumn)) {
-        const samples = this.samplesGenerator.generateColumnSamples(visualColumn, rowsRange);
-        samples.forEach((sample, column) => this.ghostTable.addColumn(column, sample));
+        _assertClassBrand(_AutoColumnSize_brand, this, _fillGhostTableWithSamples).call(this, visualColumn, rowsRange);
       }
     });
     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);
+      _assertClassBrand(_AutoColumnSize_brand, this, _updateColumnWidthsMapBasedOnGhostTable).call(this);
       this.measuredColumns = columnsRange.to + 1;
       this.ghostTable.clean();
     }
@@ -572,20 +573,36 @@ function _calculateSpecificColumnsWidth(visualColumns) {
       return;
     }
     if (!this.hot._getColWidthFromSettings(physicalColumn)) {
-      const samples = this.samplesGenerator.generateColumnSamples(visualColumn, rowsRange);
-      samples.forEach((sample, column) => this.ghostTable.addColumn(column, sample));
+      _assertClassBrand(_AutoColumnSize_brand, this, _fillGhostTableWithSamples).call(this, visualColumn, rowsRange);
     }
   });
   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);
+    _assertClassBrand(_AutoColumnSize_brand, this, _updateColumnWidthsMapBasedOnGhostTable).call(this);
     this.ghostTable.clean();
   }
 }
+/**
+ * Processes a single column for width calculation.
+ *
+ * @param {number} visualColumn Visual column index.
+ * @param {object} rowsRange Range of rows to process.
+ */
+function _fillGhostTableWithSamples(visualColumn, rowsRange) {
+  const samples = this.samplesGenerator.generateColumnSamples(visualColumn, rowsRange);
+  samples.forEach((sample, column) => this.ghostTable.addColumn(column, sample));
+}
+/**
+ * Updates the column widths map with calculated widths from the ghost table.
+ *
+ */
+function _updateColumnWidthsMapBasedOnGhostTable() {
+  this.hot.batchExecution(() => {
+    this.ghostTable.getWidths((visualColumn, width) => {
+      const physicalColumn = this.hot.toPhysicalColumn(visualColumn);
+      this.columnWidthsMap.setValueAtIndex(physicalColumn, width);
+    });
+  }, true);
+}
 function _onBeforeRender() {
   this.calculateVisibleColumnsWidth();
   if (!this.inProgress) {
@@ -642,6 +659,7 @@ function _onBeforeColumnResize(size, column, isDblClick) {
 function _onInit() {
   _classPrivateFieldSet(_cachedColumnHeaders, this, this.hot.getColHeader());
   this.recalculateAllColumnsWidth();
+  _classPrivateFieldSet(_isInitialized, this, true);
 }
 /**
  * After formulas values updated listener.
@@ -649,6 +667,9 @@ function _onInit() {
  * @param {Array} changes An array of modified data.
  */
 function _onAfterFormulasValuesUpdate(changes) {
+  if (!_classPrivateFieldGet(_isInitialized, this)) {
+    return;
+  }
   const changedColumns = changes.reduce((acc, change) => {
     var _change$address;
     const physicalColumn = (_change$address = change.address) === null || _change$address === void 0 ? void 0 : _change$address.col;

package/plugins/autoRowSize/autoRowSize.js

@@ -113,6 +113,7 @@ const ROW_WIDTHS_MAP_NAME = 'autoRowSize';
  */
 /* eslint-enable jsdoc/require-description-complete-sentence */
 var _visualRowsToRefresh = /*#__PURE__*/new WeakMap();
+var _isInitialized = /*#__PURE__*/new WeakMap();
 var _AutoRowSize_brand = /*#__PURE__*/new WeakSet();
 class AutoRowSize extends _base.BasePlugin {
   static get PLUGIN_KEY() {
@@ -215,6 +216,12 @@ class AutoRowSize extends _base.BasePlugin {
      * @type {number[]}
      */
     _classPrivateFieldInitSpec(this, _visualRowsToRefresh, []);
+    /**
+     * `true` value indicates that the #onInit() function has been already called.
+     *
+     * @type {boolean}
+     */
+    _classPrivateFieldInitSpec(this, _isInitialized, false);
     this.hot.rowIndexMapper.registerMap(ROW_WIDTHS_MAP_NAME, this.rowHeightsMap);
 
     // Leave the listener active to allow auto-sizing the rows when the plugin is disabled.
@@ -645,6 +652,7 @@ function _onBeforeChange(changes) {
  */
 function _onInit() {
   this.recalculateAllRowsHeight();
+  _classPrivateFieldSet(_isInitialized, this, true);
 }
 /**
  * After formulas values updated listener.
@@ -652,6 +660,9 @@ function _onInit() {
  * @param {Array} changes An array of modified data.
  */
 function _onAfterFormulasValuesUpdate(changes) {
+  if (!_classPrivateFieldGet(_isInitialized, this)) {
+    return;
+  }
   const changedRows = changes.reduce((acc, change) => {
     var _change$address;
     const physicalRow = (_change$address = change.address) === null || _change$address === void 0 ? void 0 : _change$address.row;

package/plugins/autoRowSize/autoRowSize.mjs

@@ -109,6 +109,7 @@ const ROW_WIDTHS_MAP_NAME = 'autoRowSize';
  */
 /* eslint-enable jsdoc/require-description-complete-sentence */
 var _visualRowsToRefresh = /*#__PURE__*/new WeakMap();
+var _isInitialized = /*#__PURE__*/new WeakMap();
 var _AutoRowSize_brand = /*#__PURE__*/new WeakSet();
 export class AutoRowSize extends BasePlugin {
   static get PLUGIN_KEY() {
@@ -211,6 +212,12 @@ export class AutoRowSize extends BasePlugin {
      * @type {number[]}
      */
     _classPrivateFieldInitSpec(this, _visualRowsToRefresh, []);
+    /**
+     * `true` value indicates that the #onInit() function has been already called.
+     *
+     * @type {boolean}
+     */
+    _classPrivateFieldInitSpec(this, _isInitialized, false);
     this.hot.rowIndexMapper.registerMap(ROW_WIDTHS_MAP_NAME, this.rowHeightsMap);
 
     // Leave the listener active to allow auto-sizing the rows when the plugin is disabled.
@@ -640,6 +647,7 @@ function _onBeforeChange(changes) {
  */
 function _onInit() {
   this.recalculateAllRowsHeight();
+  _classPrivateFieldSet(_isInitialized, this, true);
 }
 /**
  * After formulas values updated listener.
@@ -647,6 +655,9 @@ function _onInit() {
  * @param {Array} changes An array of modified data.
  */
 function _onAfterFormulasValuesUpdate(changes) {
+  if (!_classPrivateFieldGet(_isInitialized, this)) {
+    return;
+  }
   const changedRows = changes.reduce((acc, change) => {
     var _change$address;
     const physicalRow = (_change$address = change.address) === null || _change$address === void 0 ? void 0 : _change$address.row;

package/plugins/formulas/formulas.d.ts

@@ -32,7 +32,7 @@ export class Formulas extends BasePlugin {
 
   engine: HyperFormula | null;
   sheetName: string | null;
-  get sheetId(): number | null;
+  sheetId: number | null;
 
   isEnabled(): boolean;
   addSheet(sheetName?: string | null, sheetData?: CellValue[][]): string | boolean;

package/plugins/formulas/formulas.js

@@ -13,7 +13,6 @@ require("core-js/modules/es.set.symmetric-difference.v2.js");
 require("core-js/modules/es.set.union.v2.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.every.js");
-require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _base = require("../base");
@@ -74,13 +73,9 @@ class Formulas extends _base.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);
     /**
@@ -147,6 +142,12 @@ class Formulas extends _base.BasePlugin {
      * @type {HyperFormula|null}
      */
     _defineProperty(this, "engine", null);
+    /**
+     * HyperFormula's sheet id.
+     *
+     * @type {number|null}
+     */
+    _defineProperty(this, "sheetId", null);
     /**
      * HyperFormula's sheet name.
      *
@@ -181,15 +182,6 @@ class Formulas extends _base.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.
@@ -220,7 +212,7 @@ class Formulas extends _base.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 () {
@@ -451,7 +443,8 @@ class Formulas extends _base.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);
@@ -471,7 +464,6 @@ class Formulas extends _base.BasePlugin {
     this.engine = null;
     super.destroy();
   }
-
   /**
    * Add a sheet to the shared HyperFormula instance.
    *
@@ -514,7 +506,7 @@ class Formulas extends _base.BasePlugin {
       (0, _console.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, `${(0, _string.toUpperCaseFirst)(PLUGIN_KEY)}.switchSheet`);
@@ -674,8 +666,22 @@ class Formulas extends _base.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.
+   */
 }
 exports.Formulas = Formulas;
+function _updateSheetNameAndSheetId(sheetName) {
+  this.sheetName = sheetName;
+  this.sheetId = this.engine.getSheetId(this.sheetName);
+}
 function _onBeforeValidate(value, visualRow, prop) {
   const visualColumn = this.hot.propToCol(prop);
   if (this.isFormulaCellType(visualRow, visualColumn)) {
@@ -803,29 +809,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 ((0, _utils.isDate)(cellValue, cellMeta.type)) {
-        valueChanged = true;
         if ((0, _utils.isDateValid)(cellValue, dateFormat)) {
           // Rewriting date in HOT format to HF format.
           sourceDataArray[rowIndex][columnIndex] = (0, _utils.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.
@@ -839,7 +849,12 @@ function _onAfterLoadData(sourceData, initialLoad) {
   if (source.includes((0, _string.toUpperCaseFirst)(PLUGIN_KEY))) {
     return;
   }
-  this.sheetName = (0, _register.setupSheet)(this.engine, this.hot.getSettings()[PLUGIN_KEY].sheetName);
+  const sheetName = (0, _register.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)) {
@@ -870,17 +885,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 ((0, _utils.isEscapedFormulaExpression)(valueHolder.value)) {
-        valueHolder.value = (0, _utils.unescapeFormulaExpression)(valueHolder.value);
-      }
-      return;
-    }
+  const cellType = this.getCellType(visualRow, visualColumn);
+  if (cellType === 'VALUE' || cellType === 'EMPTY') {
+    valueHolder.value = (0, _utils.unescapeFormulaExpression)(valueHolder.value);
+    return;
   }
   const address = {
     row: this.rowAxisSyncer.getHfIndexFromVisualIndex(visualRow),
@@ -889,21 +897,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' && (0, _number.isNumeric)(cellValue)) {
     cellValue = (0, _utils.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.
@@ -923,14 +925,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));
 
@@ -1239,7 +1236,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);
 }
 /**