handsontable 0.0.0-next-7936038-20230411 → 0.0.0-next-931651e-20230412

package/helpers/mixed.js

@@ -152,7 +152,7 @@ var domMessages = {
 function _injectProductInfo(key, element) {
   var hasValidType = !isEmpty(key);
   var isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  var hotVersion = "0.0.0-next-7936038-20230411";
+  var hotVersion = "0.0.0-next-931651e-20230412";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -142,7 +142,7 @@ var domMessages = {
 export function _injectProductInfo(key, element) {
   var hasValidType = !isEmpty(key);
   var isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  var hotVersion = "0.0.0-next-7936038-20230411";
+  var hotVersion = "0.0.0-next-931651e-20230412";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var 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-7936038-20230411",
+  "version": "0.0.0-next-931651e-20230412",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/formulas/engine/register.js

@@ -3,6 +3,8 @@
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.iterator.js");
+require("core-js/modules/es.array.slice.js");
+require("core-js/modules/es.object.freeze.js");
 exports.__esModule = true;
 exports.getRegisteredHotInstances = getRegisteredHotInstances;
 exports.registerCustomFunctions = registerCustomFunctions;
@@ -27,10 +29,14 @@ require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/es.function.name.js");
 var _staticRegister = _interopRequireDefault(require("../../../utils/staticRegister"));
 var _mixed = require("../../../helpers/mixed");
+var _templateLiteralTag = require("../../../helpers/templateLiteralTag");
 var _console = require("../../../helpers/console");
+var _object = require("../../../helpers/object");
 var _formulas = require("../formulas");
 var _settings = require("./settings");
+var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 /**
  * Prepares and returns the collection for the engine relationship with the HoT instances.
@@ -99,6 +105,9 @@ function setupEngine(hotInstance) {
         licenseKey: _settings.DEFAULT_LICENSE_KEY
       });
     }
+    if (engineConfigItem.getConfig().leapYear1900 !== _settings.DEFAULT_SETTINGS.leapYear1900 || (0, _object.isObjectEqual)(engineConfigItem.getConfig().nullDate, _settings.DEFAULT_SETTINGS.nullDate) === false) {
+      (0, _console.warn)((0, _templateLiteralTag.toSingleLine)(_templateObject || (_templateObject = _taggedTemplateLiteral(["If you use HyperFormula with Handsontable, keep the default `leapYear1900` and `nullDate` \n      settings. Otherwise, HyperFormula's dates may not sync correctly with Handsontable's dates."], ["If you use HyperFormula with Handsontable, keep the default \\`leapYear1900\\` and \\`nullDate\\` \n      settings. Otherwise, HyperFormula's dates may not sync correctly with Handsontable's dates."]))));
+    }
     return engineConfigItem;
   }
   return null;

package/plugins/formulas/engine/register.mjs

@@ -1,3 +1,10 @@
+import "core-js/modules/es.symbol.js";
+import "core-js/modules/es.symbol.description.js";
+import "core-js/modules/es.symbol.iterator.js";
+import "core-js/modules/es.array.slice.js";
+import "core-js/modules/es.object.freeze.js";
+var _templateObject;
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/es.map.js";
@@ -12,14 +19,13 @@ import "core-js/modules/es.array.splice.js";
 import "core-js/modules/es.array.index-of.js";
 import "core-js/modules/web.dom-collections.for-each.js";
 import "core-js/modules/es.function.name.js";
-import "core-js/modules/es.symbol.js";
-import "core-js/modules/es.symbol.description.js";
-import "core-js/modules/es.symbol.iterator.js";
 import staticRegister from "../../../utils/staticRegister.mjs";
 import { isUndefined } from "../../../helpers/mixed.mjs";
+import { toSingleLine } from "../../../helpers/templateLiteralTag.mjs";
 import { warn } from "../../../helpers/console.mjs";
+import { isObjectEqual } from "../../../helpers/object.mjs";
 import { PLUGIN_KEY } from "../formulas.mjs";
-import { DEFAULT_LICENSE_KEY, getEngineSettingsWithDefaultsAndOverrides } from "./settings.mjs";
+import { DEFAULT_LICENSE_KEY, DEFAULT_SETTINGS, getEngineSettingsWithDefaultsAndOverrides } from "./settings.mjs";
 /**
  * Prepares and returns the collection for the engine relationship with the HoT instances.
  *
@@ -87,6 +93,9 @@ export function setupEngine(hotInstance) {
         licenseKey: DEFAULT_LICENSE_KEY
       });
     }
+    if (engineConfigItem.getConfig().leapYear1900 !== DEFAULT_SETTINGS.leapYear1900 || isObjectEqual(engineConfigItem.getConfig().nullDate, DEFAULT_SETTINGS.nullDate) === false) {
+      warn(toSingleLine(_templateObject || (_templateObject = _taggedTemplateLiteral(["If you use HyperFormula with Handsontable, keep the default `leapYear1900` and `nullDate` \n      settings. Otherwise, HyperFormula's dates may not sync correctly with Handsontable's dates."], ["If you use HyperFormula with Handsontable, keep the default \\`leapYear1900\\` and \\`nullDate\\` \n      settings. Otherwise, HyperFormula's dates may not sync correctly with Handsontable's dates."]))));
+    }
     return engineConfigItem;
   }
   return null;

package/plugins/formulas/engine/settings.js

@@ -15,7 +15,7 @@ require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 exports.__esModule = true;
-exports.DEFAULT_LICENSE_KEY = void 0;
+exports.DEFAULT_SETTINGS = exports.DEFAULT_LICENSE_KEY = void 0;
 exports.getEngineSettingsOverrides = getEngineSettingsOverrides;
 exports.getEngineSettingsWithDefaultsAndOverrides = getEngineSettingsWithDefaultsAndOverrides;
 exports.getEngineSettingsWithOverrides = getEngineSettingsWithOverrides;
@@ -39,11 +39,11 @@ var DEFAULT_SETTINGS = {
   precisionEpsilon: 1e-13,
   precisionRounding: 14,
   smartRounding: true,
-  leapYear1900: true,
+  leapYear1900: false,
   nullDate: {
     year: 1899,
     month: 12,
-    day: 31
+    day: 30
   },
   nullYear: 30,
   dateFormats: ['DD/MM/YYYY', 'DD/MM/YY'],
@@ -63,6 +63,7 @@ var DEFAULT_SETTINGS = {
  * @param {object} hotSettings Handsontable settings object.
  * @returns {object} Object containing the overriding options.
  */
+exports.DEFAULT_SETTINGS = DEFAULT_SETTINGS;
 function getEngineSettingsOverrides(hotSettings) {
   var _hotSettings$PLUGIN_K, _hotSettings$PLUGIN_K2;
   return {

package/plugins/formulas/engine/settings.mjs

@@ -22,7 +22,7 @@ import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import { PLUGIN_KEY } from "../formulas.mjs";
 export var DEFAULT_LICENSE_KEY = 'internal-use-in-handsontable';
-var DEFAULT_SETTINGS = {
+export var DEFAULT_SETTINGS = {
   licenseKey: DEFAULT_LICENSE_KEY,
   useArrayArithmetic: true,
   useColumnIndex: false,
@@ -31,11 +31,11 @@ var DEFAULT_SETTINGS = {
   precisionEpsilon: 1e-13,
   precisionRounding: 14,
   smartRounding: true,
-  leapYear1900: true,
+  leapYear1900: false,
   nullDate: {
     year: 1899,
     month: 12,
-    day: 31
+    day: 30
   },
   nullYear: 30,
   dateFormats: ['DD/MM/YYYY', 'DD/MM/YY'],

package/plugins/formulas/formulas.js

@@ -11,7 +11,6 @@ require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/es.reflect.get.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.symbol.iterator.js");
-require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.regexp.exec.js");
@@ -28,6 +27,8 @@ require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.string.starts-with.js");
+require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.array.reverse.js");
@@ -298,6 +299,13 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
         return _this8.onAfterRemoveCol.apply(_this8, arguments);
       });
 
+      // TODO: Actions related to overwriting dates from HOT format to HF default format are done as callback to this
+      // hook, because some hooks, such as `afterLoadData` doesn't have information about composed cell properties.
+      // Another hooks are triggered to late for setting HF's engine data needed for some actions.
+      this.addHook('afterCellMetaReset', function () {
+        return _this8.onAfterCellMetaReset.apply(_this8, arguments);
+      });
+
       // Handling undo actions on data just using HyperFormula's UndoRedo mechanism
       this.addHook('beforeUndo', function (action) {
         // TODO: Move action isn't handled by HyperFormula.
@@ -666,6 +674,16 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
         (0, _console.warn)("Not possible to set cell data at ".concat(JSON.stringify(address)));
         return;
       }
+      var cellMeta = this.hot.getCellMeta(row, column);
+      if ((0, _utils.isDate)(newValue, cellMeta.type)) {
+        if ((0, _utils.isDateValid)(newValue, cellMeta.dateFormat)) {
+          // Rewriting date in HOT format to HF format.
+          newValue = (0, _utils.getDateInHfFormat)(newValue, cellMeta.dateFormat);
+        } else if ((0, _utils.isFormula)(newValue) === false) {
+          // Escaping value from date parsing using "'" sign (HF feature).
+          newValue = "'".concat(newValue);
+        }
+      }
       return this.engine.setCellContents(address, newValue);
     }
 
@@ -689,7 +707,12 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
           col: this.hot.toPhysicalColumn(visualColumn),
           sheet: this.sheetId
         };
-        var cellValue = this.engine.getCellValue(address);
+        var cellMeta = this.hot.getCellMeta(visualRow, visualColumn);
+        var cellValue = this.engine.getCellValue(address); // Date as an integer (Excel-like date).
+
+        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
         return _typeof(cellValue) === 'object' && cellValue !== null ? cellValue.value : cellValue;
@@ -730,7 +753,33 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
       if (this.engine.isItPossibleToSetCellContents(engineTargetRange) === false) {
         return false;
       }
-      return this.engine.getFillRangeData(engineSourceRange, engineTargetRange);
+      var fillRangeData = this.engine.getFillRangeData(engineSourceRange, engineTargetRange);
+      var _engineSourceRange$st = engineSourceRange.start,
+        sourceStartRow = _engineSourceRange$st.row,
+        sourceStartColumn = _engineSourceRange$st.col;
+      var _engineSourceRange$en = engineSourceRange.end,
+        sourceEndRow = _engineSourceRange$en.row,
+        sourceEndColumn = _engineSourceRange$en.col;
+      var populationRowLength = sourceEndRow - sourceStartRow + 1;
+      var populationColumnLength = sourceEndColumn - sourceStartColumn + 1;
+      for (var populatedRowIndex = 0; populatedRowIndex < fillRangeData.length; populatedRowIndex += 1) {
+        for (var populatedColumnIndex = 0; populatedColumnIndex < fillRangeData[populatedRowIndex].length; populatedColumnIndex += 1) {
+          var populatedValue = fillRangeData[populatedRowIndex][populatedColumnIndex];
+          var sourceRow = populatedRowIndex % populationRowLength;
+          var sourceColumn = populatedColumnIndex % populationColumnLength;
+          var sourceCellMeta = this.hot.getCellMeta(sourceRow, sourceColumn);
+          if ((0, _utils.isDate)(populatedValue, sourceCellMeta.type)) {
+            if (populatedValue.startsWith('\'')) {
+              // Populating values on HOT side without apostrophe.
+              fillRangeData[populatedRowIndex][populatedColumnIndex] = populatedValue.slice(1);
+            } else if (this.isFormulaCellType(sourceRow, sourceColumn, this.sheetId) === false) {
+              // Populating date in proper format, coming from the source cell.
+              fillRangeData[populatedRowIndex][populatedColumnIndex] = (0, _utils.getDateInHotFormat)(populatedValue, sourceCellMeta.dateFormat);
+            }
+          }
+        }
+      }
+      return fillRangeData;
     }
 
     /**
@@ -754,6 +803,40 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
       _classPrivateFieldSet(this, _hotWasInitializedWithEmptyData, (0, _mixed.isUndefined)(this.hot.getSettings().data));
     }
 
+    /**
+     * Callback to `afterCellMetaReset` hook which is triggered after setting cell meta.
+     *
+     * @private
+     */
+  }, {
+    key: "onAfterCellMetaReset",
+    value: function onAfterCellMetaReset() {
+      var _this14 = this;
+      var sourceDataArray = this.hot.getSourceDataArray();
+      var valueChanged = false;
+      sourceDataArray.forEach(function (rowData, rowIndex) {
+        rowData.forEach(function (cellValue, columnIndex) {
+          var cellMeta = _this14.hot.getCellMeta(rowIndex, columnIndex);
+          var 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 (_this14.isFormulaCellType(rowIndex, columnIndex) === false) {
+              // Escaping value from date parsing using "'" sign (HF feature).
+              sourceDataArray[rowIndex][columnIndex] = "'".concat(cellValue);
+            }
+          }
+        });
+      });
+      if (valueChanged === true) {
+        _classPrivateFieldSet(this, _internalOperationPending, true);
+        this.engine.setSheetContent(this.sheetId, sourceDataArray);
+        _classPrivateFieldSet(this, _internalOperationPending, false);
+      }
+    }
+
     /**
      * `afterLoadData` hook callback.
      *
@@ -774,7 +857,7 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
         var sourceDataArray = this.hot.getSourceDataArray();
         if (this.engine.isItPossibleToReplaceSheetContent(this.sheetId, sourceDataArray)) {
           _classPrivateFieldSet(this, _internalOperationPending, true);
-          var dependentCells = this.engine.setSheetContent(this.sheetId, this.hot.getSourceDataArray());
+          var dependentCells = this.engine.setSheetContent(this.sheetId, sourceDataArray);
           this.renderDependentSheets(dependentCells);
           _classPrivateFieldSet(this, _internalOperationPending, false);
         }
@@ -819,7 +902,11 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
         col: this.toPhysicalColumnPosition(column),
         sheet: this.sheetId
       };
-      var cellValue = this.engine.getCellValue(address);
+      var cellValue = this.engine.getCellValue(address); // Date as an integer (Excel like date).
+      var cellMeta = this.hot.getCellMeta(row, column);
+      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
       var value = _typeof(cellValue) === 'object' && cellValue !== null ? cellValue.value : cellValue;
@@ -882,7 +969,7 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onAfterSetDataAtCell",
     value: function onAfterSetDataAtCell(changes, source) {
-      var _this14 = this;
+      var _this15 = this;
       if (isBlockedSource(source)) {
         return;
       }
@@ -894,16 +981,16 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
             row = _ref10[0],
             prop = _ref10[1],
             newValue = _ref10[3];
-          var column = _this14.hot.propToCol(prop);
-          var physicalRow = _this14.hot.toPhysicalRow(row);
-          var physicalColumn = _this14.hot.toPhysicalColumn(column);
+          var column = _this15.hot.propToCol(prop);
+          var physicalRow = _this15.hot.toPhysicalRow(row);
+          var physicalColumn = _this15.hot.toPhysicalColumn(column);
           var address = {
             row: physicalRow,
             col: physicalColumn,
-            sheet: _this14.sheetId
+            sheet: _this15.sheetId
           };
           if (physicalRow !== null && physicalColumn !== null) {
-            _this14.syncChangeWithEngine(row, column, newValue);
+            _this15.syncChangeWithEngine(row, column, newValue);
           } else {
             outOfBoundsChanges.push([row, column, newValue]);
           }
@@ -916,16 +1003,16 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
         // Workaround for rows/columns being created two times (by HOT and the engine).
         // (unfortunately, this requires an extra re-render)
         this.hot.addHookOnce('afterChange', function () {
-          var outOfBoundsDependentCells = _this14.engine.batch(function () {
+          var outOfBoundsDependentCells = _this15.engine.batch(function () {
             outOfBoundsChanges.forEach(function (_ref11) {
               var _ref12 = _slicedToArray(_ref11, 3),
                 row = _ref12[0],
                 column = _ref12[1],
                 newValue = _ref12[2];
-              _this14.syncChangeWithEngine(row, column, newValue);
+              _this15.syncChangeWithEngine(row, column, newValue);
             });
           });
-          _this14.renderDependentSheets(outOfBoundsDependentCells, true);
+          _this15.renderDependentSheets(outOfBoundsDependentCells, true);
         });
       }
       this.renderDependentSheets(dependentCells);
@@ -943,7 +1030,7 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onAfterSetSourceDataAtCell",
     value: function onAfterSetSourceDataAtCell(changes, source) {
-      var _this15 = this;
+      var _this16 = this;
       if (isBlockedSource(source)) {
         return;
       }
@@ -954,23 +1041,23 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
           row = _ref14[0],
           prop = _ref14[1],
           newValue = _ref14[3];
-        var column = _this15.hot.propToCol(prop);
+        var column = _this16.hot.propToCol(prop);
         if (!(0, _number.isNumeric)(column)) {
           return;
         }
         var address = {
           row: row,
-          col: _this15.toPhysicalColumnPosition(column),
-          sheet: _this15.sheetId
+          col: _this16.toPhysicalColumnPosition(column),
+          sheet: _this16.sheetId
         };
-        if (!_this15.engine.isItPossibleToSetCellContents(address)) {
+        if (!_this16.engine.isItPossibleToSetCellContents(address)) {
           (0, _console.warn)("Not possible to set source cell data at ".concat(JSON.stringify(address)));
           return;
         }
         changedCells.push({
           address: address
         });
-        dependentCells.push.apply(dependentCells, _toConsumableArray(_this15.engine.setCellContents(address, newValue)));
+        dependentCells.push.apply(dependentCells, _toConsumableArray(_this16.engine.setCellContents(address, newValue)));
       });
       this.renderDependentSheets(dependentCells);
       this.validateDependentCells(dependentCells, changedCells);
@@ -1020,9 +1107,9 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onBeforeRemoveRow",
     value: function onBeforeRemoveRow(row, amount, physicalRows) {
-      var _this16 = this;
+      var _this17 = this;
       var possible = physicalRows.every(function (physicalRow) {
-        return _this16.engine.isItPossibleToRemoveRows(_this16.sheetId, [physicalRow, 1]);
+        return _this17.engine.isItPossibleToRemoveRows(_this17.sheetId, [physicalRow, 1]);
       });
       return possible === false ? false : void 0;
     }
@@ -1039,9 +1126,9 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onBeforeRemoveCol",
     value: function onBeforeRemoveCol(col, amount, physicalColumns) {
-      var _this17 = this;
+      var _this18 = this;
       var possible = physicalColumns.every(function (physicalColumn) {
-        return _this17.engine.isItPossibleToRemoveColumns(_this17.sheetId, [physicalColumn, 1]);
+        return _this18.engine.isItPossibleToRemoveColumns(_this18.sheetId, [physicalColumn, 1]);
       });
       return possible === false ? false : void 0;
     }
@@ -1097,14 +1184,14 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onAfterRemoveRow",
     value: function onAfterRemoveRow(row, amount, physicalRows, source) {
-      var _this18 = this;
+      var _this19 = this;
       if (isBlockedSource(source)) {
         return;
       }
       var descendingPhysicalRows = physicalRows.sort().reverse();
       var changes = this.engine.batch(function () {
         descendingPhysicalRows.forEach(function (physicalRow) {
-          _this18.engine.removeRows(_this18.sheetId, [physicalRow, 1]);
+          _this19.engine.removeRows(_this19.sheetId, [physicalRow, 1]);
         });
       });
       this.renderDependentSheets(changes);
@@ -1123,14 +1210,14 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onAfterRemoveCol",
     value: function onAfterRemoveCol(col, amount, physicalColumns, source) {
-      var _this19 = this;
+      var _this20 = this;
       if (isBlockedSource(source)) {
         return;
       }
       var descendingPhysicalColumns = physicalColumns.sort().reverse();
       var changes = this.engine.batch(function () {
         descendingPhysicalColumns.forEach(function (physicalColumn) {
-          _this19.engine.removeColumns(_this19.sheetId, [physicalColumn, 1]);
+          _this20.engine.removeColumns(_this20.sheetId, [physicalColumn, 1]);
         });
       });
       this.renderDependentSheets(changes);
@@ -1149,16 +1236,16 @@ var Formulas = /*#__PURE__*/function (_BasePlugin) {
     key: "onAfterDetachChild",
     value: function onAfterDetachChild(parent, element, finalElementRowIndex) {
       var _element$__children,
-        _this20 = this;
+        _this21 = this;
       _classPrivateFieldSet(this, _internalOperationPending, true);
       var rowsData = this.hot.getSourceDataArray(finalElementRowIndex, 0, finalElementRowIndex + (((_element$__children = element.__children) === null || _element$__children === void 0 ? void 0 : _element$__children.length) || 0), this.hot.countSourceCols());
       _classPrivateFieldSet(this, _internalOperationPending, false);
       rowsData.forEach(function (row, relativeRowIndex) {
         row.forEach(function (value, colIndex) {
-          _this20.engine.setCellContents({
+          _this21.engine.setCellContents({
             col: colIndex,
             row: finalElementRowIndex + relativeRowIndex,
-            sheet: _this20.sheetId
+            sheet: _this21.sheetId
           }, [[value]]);
         });
       });