handsontable 15.2.0 → 15.3.0-next-6f5f494-20250424

package/plugins/exportFile/types/csv.mjs

@@ -1,16 +1,37 @@
+import "core-js/modules/es.error.cause.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
+function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+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 { arrayEach, arrayMap } from "../../../helpers/array.mjs";
 import { stringify } from "../../../helpers/mixed.mjs";
 import BaseType from "./_base.mjs";
 const CHAR_CARRIAGE_RETURN = String.fromCharCode(13);
 const CHAR_DOUBLE_QUOTES = String.fromCharCode(34);
 const CHAR_LINE_FEED = String.fromCharCode(10);
+const CHAR_EQUAL = String.fromCharCode(61);
+const CHAR_PLUS = String.fromCharCode(43);
+const CHAR_MINUS = String.fromCharCode(45);
+const CHAR_AT = String.fromCharCode(64);
+const CHAR_TAB = String.fromCharCode(9);
 
 /**
  * @private
  */
+var _Csv_brand = /*#__PURE__*/new WeakSet();
 class Csv extends BaseType {
+  constructor() {
+    super(...arguments);
+    /**
+     * Sanitize value that may be interpreted as a formula in spreadsheet software.
+     * Following the OWASP recommendations: https://owasp.org/www-community/attacks/CSV_Injection.
+     *
+     * @param {string} value Cell value.
+     * @returns {string}
+     */
+    _classPrivateMethodInitSpec(this, _Csv_brand);
+  }
   /**
    * Default options for exporting CSV format.
    *
@@ -22,7 +43,8 @@ class Csv extends BaseType {
       fileExtension: 'csv',
       bom: true,
       columnDelimiter: ',',
-      rowDelimiter: '\r\n'
+      rowDelimiter: '\r\n',
+      sanitizeValues: false
     };
   }
 
@@ -40,7 +62,10 @@ class Csv extends BaseType {
     const hasRowHeaders = rowHeaders.length > 0;
     let result = options.bom ? String.fromCharCode(0xFEFF) : '';
     if (hasColumnHeaders) {
-      columnHeaders = arrayMap(columnHeaders, value => this._escapeCell(value, true));
+      columnHeaders = arrayMap(columnHeaders, value => this._escapeCell(value, {
+        force: true,
+        sanitizeValue: options.sanitizeValues
+      }));
       if (hasRowHeaders) {
         result += options.columnDelimiter;
       }
@@ -52,9 +77,15 @@ class Csv extends BaseType {
         result += options.rowDelimiter;
       }
       if (hasRowHeaders) {
-        result += this._escapeCell(rowHeaders[index]) + options.columnDelimiter;
+        result += this._escapeCell(rowHeaders[index], {
+          sanitizeValue: options.sanitizeValues
+        });
+        result += options.columnDelimiter;
       }
-      result += value.map(cellValue => this._escapeCell(cellValue)).join(options.columnDelimiter);
+      const escapedValue = value.map(cellValue => this._escapeCell(cellValue, {
+        sanitizeValue: options.sanitizeValues
+      })).join(options.columnDelimiter);
+      result += escapedValue;
     });
     return result;
   }
@@ -63,17 +94,51 @@ class Csv extends BaseType {
    * Escape cell value.
    *
    * @param {*} value Cell value.
-   * @param {boolean} [force=false] Indicates if cell value will be escaped forcefully.
+   * @param {object} options Options.
+   * @param {boolean} [options.force=false] Indicates if cell value will be escaped forcefully.
+   * @param {boolean|RegExp|Function} [options.sanitizeValue=false] Controls the sanitization of cell value.
    * @returns {string}
    */
   _escapeCell(value) {
-    let force = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    let escapedValue = stringify(value);
-    if (escapedValue !== '' && (force || escapedValue.indexOf(CHAR_CARRIAGE_RETURN) >= 0 || escapedValue.indexOf(CHAR_DOUBLE_QUOTES) >= 0 || escapedValue.indexOf(CHAR_LINE_FEED) >= 0 || escapedValue.indexOf(this.options.columnDelimiter) >= 0)) {
-      escapedValue = escapedValue.replace(new RegExp('"', 'g'), '""');
-      escapedValue = `"${escapedValue}"`;
+    let {
+      force = false,
+      sanitizeValue = false
+    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    let returnValue = stringify(value);
+    if (returnValue === '') {
+      return returnValue;
+    }
+    if (sanitizeValue) {
+      force = true;
+    }
+    if (sanitizeValue instanceof RegExp) {
+      returnValue = _assertClassBrand(_Csv_brand, this, _sanitizeValueWithRegExp).call(this, returnValue, sanitizeValue);
+    } else if (typeof sanitizeValue === 'function') {
+      returnValue = sanitizeValue(returnValue);
+    } else if (sanitizeValue) {
+      returnValue = _assertClassBrand(_Csv_brand, this, _sanitizeValueWithOWASP).call(this, returnValue);
+    }
+    if (force || returnValue.indexOf(CHAR_CARRIAGE_RETURN) >= 0 || returnValue.indexOf(CHAR_DOUBLE_QUOTES) >= 0 || returnValue.indexOf(CHAR_LINE_FEED) >= 0 || returnValue.indexOf(this.options.columnDelimiter) >= 0) {
+      returnValue = returnValue.replace(new RegExp('"', 'g'), '""');
+      returnValue = `"${returnValue}"`;
     }
-    return escapedValue;
+    return returnValue;
   }
 }
+function _sanitizeValueWithOWASP(value) {
+  if (value.startsWith(CHAR_EQUAL) || value.startsWith(CHAR_PLUS) || value.startsWith(CHAR_MINUS) || value.startsWith(CHAR_AT) || value.startsWith(CHAR_TAB) || value.startsWith(CHAR_CARRIAGE_RETURN)) {
+    return `'${value}`;
+  }
+  return value;
+}
+/**
+ * Sanitize value using regular expression.
+ *
+ * @param {string} value Cell value.
+ * @param {RegExp} regexp Regular expression to test against.
+ * @returns {string}
+ */
+function _sanitizeValueWithRegExp(value, regexp) {
+  return regexp.test(value) ? `'${value}` : value;
+}
 export default Csv;

package/plugins/filters/filters.js

@@ -562,38 +562,39 @@ class Filters extends _base.BasePlugin {
     let visibleVisualRows = [];
     const conditions = this.exportConditions();
     const allowFiltering = this.hot.runHooks('beforeFilter', conditions, _classPrivateFieldGet(_previousConditionStack, this));
-    if (allowFiltering !== false) {
-      if (needToFilter) {
-        const trimmedRows = [];
-        this.hot.batchExecution(() => {
-          this.filtersRowsMap.clear();
-          visibleVisualRows = (0, _array.arrayMap)(dataFilter.filter(), rowData => rowData.meta.visualRow);
-          const visibleVisualRowsAssertion = (0, _utils.createArrayAssertion)(visibleVisualRows);
-          (0, _number.rangeEach)(this.hot.countSourceRows() - 1, row => {
-            if (!visibleVisualRowsAssertion(row)) {
-              trimmedRows.push(row);
-            }
-          });
-          (0, _array.arrayEach)(trimmedRows, physicalRow => {
-            this.filtersRowsMap.setValueAtIndex(physicalRow, true);
-          });
-        }, true);
-        if (!navigableHeaders && !visibleVisualRows.length) {
-          this.hot.deselectCell();
-        }
-      } else {
+    if (allowFiltering !== false && needToFilter) {
+      const trimmedRows = [];
+      this.hot.batchExecution(() => {
         this.filtersRowsMap.clear();
+        visibleVisualRows = (0, _array.arrayMap)(dataFilter.filter(), rowData => rowData.meta.visualRow);
+        const visibleVisualRowsAssertion = (0, _utils.createArrayAssertion)(visibleVisualRows);
+        (0, _number.rangeEach)(this.hot.countSourceRows() - 1, row => {
+          if (!visibleVisualRowsAssertion(row)) {
+            trimmedRows.push(row);
+          }
+        });
+        (0, _array.arrayEach)(trimmedRows, physicalRow => {
+          this.filtersRowsMap.setValueAtIndex(physicalRow, true);
+        });
+      }, true);
+      if (!navigableHeaders && !visibleVisualRows.length) {
+        this.hot.deselectCell();
       }
       _classPrivateFieldSet(_previousConditionStack, this, this.exportConditions());
-      this.hot.runHooks('afterFilter', conditions);
-      this.hot.view.adjustElementsSize();
-      this.hot.render();
+    } else if (allowFiltering !== false && !needToFilter) {
+      _classPrivateFieldSet(_previousConditionStack, this, this.exportConditions());
+      this.filtersRowsMap.clear();
     } else {
       this.importConditions(_classPrivateFieldGet(_previousConditionStack, this));
     }
     if (this.hot.selection.isSelected()) {
       this.hot.selectCell(navigableHeaders ? -1 : 0, this.hot.getSelectedRangeLast().highlight.col);
     }
+    if (allowFiltering !== false) {
+      this.hot.runHooks('afterFilter', conditions);
+      this.hot.view.adjustElementsSize();
+      this.hot.render();
+    }
   }
 
   /**

package/plugins/filters/filters.mjs

@@ -556,38 +556,39 @@ export class Filters extends BasePlugin {
     let visibleVisualRows = [];
     const conditions = this.exportConditions();
     const allowFiltering = this.hot.runHooks('beforeFilter', conditions, _classPrivateFieldGet(_previousConditionStack, this));
-    if (allowFiltering !== false) {
-      if (needToFilter) {
-        const trimmedRows = [];
-        this.hot.batchExecution(() => {
-          this.filtersRowsMap.clear();
-          visibleVisualRows = arrayMap(dataFilter.filter(), rowData => rowData.meta.visualRow);
-          const visibleVisualRowsAssertion = createArrayAssertion(visibleVisualRows);
-          rangeEach(this.hot.countSourceRows() - 1, row => {
-            if (!visibleVisualRowsAssertion(row)) {
-              trimmedRows.push(row);
-            }
-          });
-          arrayEach(trimmedRows, physicalRow => {
-            this.filtersRowsMap.setValueAtIndex(physicalRow, true);
-          });
-        }, true);
-        if (!navigableHeaders && !visibleVisualRows.length) {
-          this.hot.deselectCell();
-        }
-      } else {
+    if (allowFiltering !== false && needToFilter) {
+      const trimmedRows = [];
+      this.hot.batchExecution(() => {
         this.filtersRowsMap.clear();
+        visibleVisualRows = arrayMap(dataFilter.filter(), rowData => rowData.meta.visualRow);
+        const visibleVisualRowsAssertion = createArrayAssertion(visibleVisualRows);
+        rangeEach(this.hot.countSourceRows() - 1, row => {
+          if (!visibleVisualRowsAssertion(row)) {
+            trimmedRows.push(row);
+          }
+        });
+        arrayEach(trimmedRows, physicalRow => {
+          this.filtersRowsMap.setValueAtIndex(physicalRow, true);
+        });
+      }, true);
+      if (!navigableHeaders && !visibleVisualRows.length) {
+        this.hot.deselectCell();
       }
       _classPrivateFieldSet(_previousConditionStack, this, this.exportConditions());
-      this.hot.runHooks('afterFilter', conditions);
-      this.hot.view.adjustElementsSize();
-      this.hot.render();
+    } else if (allowFiltering !== false && !needToFilter) {
+      _classPrivateFieldSet(_previousConditionStack, this, this.exportConditions());
+      this.filtersRowsMap.clear();
     } else {
       this.importConditions(_classPrivateFieldGet(_previousConditionStack, this));
     }
     if (this.hot.selection.isSelected()) {
       this.hot.selectCell(navigableHeaders ? -1 : 0, this.hot.getSelectedRangeLast().highlight.col);
     }
+    if (allowFiltering !== false) {
+      this.hot.runHooks('afterFilter', conditions);
+      this.hot.view.adjustElementsSize();
+      this.hot.render();
+    }
   }
 
   /**

package/plugins/filters/ui/multipleSelect.js

@@ -253,7 +253,13 @@ class MultipleSelectUI extends _base.BaseUI {
         beforeOnCellMouseUp: () => {
           _classPrivateFieldGet(_itemsBox, this).listen();
         },
-        colWidths: () => _classPrivateFieldGet(_itemsBox, this).container.scrollWidth - (0, _element.getScrollbarWidth)(rootDocument),
+        modifyColWidth: width => {
+          const minWidth = _classPrivateFieldGet(_itemsBox, this).container.scrollWidth - (0, _element.getScrollbarWidth)(rootDocument);
+          if (width !== undefined && width < minWidth) {
+            return minWidth;
+          }
+          return width;
+        },
         maxCols: 1,
         autoWrapCol: true,
         height: 110,

package/plugins/filters/ui/multipleSelect.mjs

@@ -248,7 +248,13 @@ export class MultipleSelectUI extends BaseUI {
         beforeOnCellMouseUp: () => {
           _classPrivateFieldGet(_itemsBox, this).listen();
         },
-        colWidths: () => _classPrivateFieldGet(_itemsBox, this).container.scrollWidth - getScrollbarWidth(rootDocument),
+        modifyColWidth: width => {
+          const minWidth = _classPrivateFieldGet(_itemsBox, this).container.scrollWidth - getScrollbarWidth(rootDocument);
+          if (width !== undefined && width < minWidth) {
+            return minWidth;
+          }
+          return width;
+        },
         maxCols: 1,
         autoWrapCol: true,
         height: 110,

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);
 }
 /**