handsontable 0.0.0-next-d4ae6d7-20221205 → 0.0.0-next-21b8f14-20221206

package/base.js

@@ -46,8 +46,8 @@ Handsontable.hooks = _pluginHooks.default.getSingleton();
 Handsontable.CellCoords = _src.CellCoords;
 Handsontable.CellRange = _src.CellRange;
 Handsontable.packageName = 'handsontable';
-Handsontable.buildDate = "05/12/2022 10:27:14";
-Handsontable.version = "0.0.0-next-d4ae6d7-20221205";
+Handsontable.buildDate = "06/12/2022 11:15:03";
+Handsontable.version = "0.0.0-next-21b8f14-20221206";
 Handsontable.languages = {
   dictionaryKeys: _registry.dictionaryKeys,
   getLanguageDictionary: _registry.getLanguageDictionary,

package/base.mjs

@@ -35,8 +35,8 @@ Handsontable.hooks = Hooks.getSingleton();
 Handsontable.CellCoords = CellCoords;
 Handsontable.CellRange = CellRange;
 Handsontable.packageName = 'handsontable';
-Handsontable.buildDate = "05/12/2022 10:27:28";
-Handsontable.version = "0.0.0-next-d4ae6d7-20221205";
+Handsontable.buildDate = "06/12/2022 11:15:18";
+Handsontable.version = "0.0.0-next-21b8f14-20221206";
 Handsontable.languages = {
   dictionaryKeys: dictionaryKeys,
   getLanguageDictionary: getLanguageDictionary,

package/core.js

@@ -90,7 +90,7 @@ var deprecationWarns = new Set();
  *
  * ::: only-for react
  * To use these methods, associate a Handsontable instance with your instance
- * of the [`HotTable` component](@/guides/getting-started/installation.md#hottable-component),
+ * of the [`HotTable` component](@/guides/getting-started/installation.md#use-the-hottable-component),
  * by using React's `ref` feature (read more on the [Instance methods](@/guides/getting-started/react-methods.md) page).
  * :::
  *
@@ -527,6 +527,7 @@ function Core(rootElement, userSettings) {
             rowDelta = _datamap$createRow.delta,
             startRowPhysicalIndex = _datamap$createRow.startPhysicalIndex;
           if (rowDelta) {
+            metaManager.createRow(startRowPhysicalIndex, amount);
             var currentSelectedRange = selection.selectedRange.current();
             var currentFromRange = currentSelectedRange === null || currentSelectedRange === void 0 ? void 0 : currentSelectedRange.from;
             var currentFromRow = currentFromRange === null || currentFromRange === void 0 ? void 0 : currentFromRange.row;
@@ -582,6 +583,7 @@ function Core(rootElement, userSettings) {
             colDelta = _datamap$createCol.delta,
             startColumnPhysicalIndex = _datamap$createCol.startPhysicalIndex;
           if (colDelta) {
+            metaManager.createColumn(startColumnPhysicalIndex, amount);
             if (Array.isArray(tableMeta.colHeaders)) {
               var spliceArray = [instance.toVisualColumn(startColumnPhysicalIndex), 0];
               spliceArray.length += colDelta; // inserts empty (undefined) elements at the end of an array
@@ -644,6 +646,7 @@ function Core(rootElement, userSettings) {
               if (!wasRemoved) {
                 return;
               }
+              metaManager.removeRow(instance.toPhysicalRow(calcIndex), groupAmount);
               var totalRows = instance.countRows();
               var fixedRowsTop = tableMeta.fixedRowsTop;
               if (fixedRowsTop >= calcIndex + 1) {
@@ -689,6 +692,7 @@ function Core(rootElement, userSettings) {
               if (!wasRemoved) {
                 return;
               }
+              metaManager.removeColumn(physicalColumnIndex, groupAmount);
               var fixedColumnsStart = tableMeta.fixedColumnsStart;
               if (fixedColumnsStart >= calcIndex + 1) {
                 tableMeta.fixedColumnsStart -= Math.min(groupAmount, fixedColumnsStart - calcIndex);
@@ -1270,7 +1274,9 @@ function Core(rootElement, userSettings) {
               source: source
             }),
             numberOfCreatedRows = _datamap$createRow2.delta;
-          if (numberOfCreatedRows === 0) {
+          if (numberOfCreatedRows >= 1) {
+            metaManager.createRow(null, numberOfCreatedRows);
+          } else {
             skipThisChange = true;
             break;
           }
@@ -1282,7 +1288,9 @@ function Core(rootElement, userSettings) {
               source: source
             }),
             numberOfCreatedColumns = _datamap$createCol2.delta;
-          if (numberOfCreatedColumns === 0) {
+          if (numberOfCreatedColumns >= 1) {
+            metaManager.createColumn(null, numberOfCreatedColumns);
+          } else {
             skipThisChange = true;
             break;
           }
@@ -2107,7 +2115,6 @@ function Core(rootElement, userSettings) {
       dataSource: dataSource,
       internalSource: 'updateData',
       source: source,
-      metaManager: metaManager,
       firstRun: firstRun
     });
   };
@@ -2150,7 +2157,6 @@ function Core(rootElement, userSettings) {
       dataSource: dataSource,
       internalSource: 'loadData',
       source: source,
-      metaManager: metaManager,
       firstRun: firstRun
     });
   };

package/core.mjs

@@ -85,7 +85,7 @@ var deprecationWarns = new Set();
  *
  * ::: only-for react
  * To use these methods, associate a Handsontable instance with your instance
- * of the [`HotTable` component](@/guides/getting-started/installation.md#hottable-component),
+ * of the [`HotTable` component](@/guides/getting-started/installation.md#use-the-hottable-component),
  * by using React's `ref` feature (read more on the [Instance methods](@/guides/getting-started/react-methods.md) page).
  * :::
  *
@@ -522,6 +522,7 @@ export default function Core(rootElement, userSettings) {
             rowDelta = _datamap$createRow.delta,
             startRowPhysicalIndex = _datamap$createRow.startPhysicalIndex;
           if (rowDelta) {
+            metaManager.createRow(startRowPhysicalIndex, amount);
             var currentSelectedRange = selection.selectedRange.current();
             var currentFromRange = currentSelectedRange === null || currentSelectedRange === void 0 ? void 0 : currentSelectedRange.from;
             var currentFromRow = currentFromRange === null || currentFromRange === void 0 ? void 0 : currentFromRange.row;
@@ -577,6 +578,7 @@ export default function Core(rootElement, userSettings) {
             colDelta = _datamap$createCol.delta,
             startColumnPhysicalIndex = _datamap$createCol.startPhysicalIndex;
           if (colDelta) {
+            metaManager.createColumn(startColumnPhysicalIndex, amount);
             if (Array.isArray(tableMeta.colHeaders)) {
               var spliceArray = [instance.toVisualColumn(startColumnPhysicalIndex), 0];
               spliceArray.length += colDelta; // inserts empty (undefined) elements at the end of an array
@@ -639,6 +641,7 @@ export default function Core(rootElement, userSettings) {
               if (!wasRemoved) {
                 return;
               }
+              metaManager.removeRow(instance.toPhysicalRow(calcIndex), groupAmount);
               var totalRows = instance.countRows();
               var fixedRowsTop = tableMeta.fixedRowsTop;
               if (fixedRowsTop >= calcIndex + 1) {
@@ -684,6 +687,7 @@ export default function Core(rootElement, userSettings) {
               if (!wasRemoved) {
                 return;
               }
+              metaManager.removeColumn(physicalColumnIndex, groupAmount);
               var fixedColumnsStart = tableMeta.fixedColumnsStart;
               if (fixedColumnsStart >= calcIndex + 1) {
                 tableMeta.fixedColumnsStart -= Math.min(groupAmount, fixedColumnsStart - calcIndex);
@@ -1265,7 +1269,9 @@ export default function Core(rootElement, userSettings) {
               source: source
             }),
             numberOfCreatedRows = _datamap$createRow2.delta;
-          if (numberOfCreatedRows === 0) {
+          if (numberOfCreatedRows >= 1) {
+            metaManager.createRow(null, numberOfCreatedRows);
+          } else {
             skipThisChange = true;
             break;
           }
@@ -1277,7 +1283,9 @@ export default function Core(rootElement, userSettings) {
               source: source
             }),
             numberOfCreatedColumns = _datamap$createCol2.delta;
-          if (numberOfCreatedColumns === 0) {
+          if (numberOfCreatedColumns >= 1) {
+            metaManager.createColumn(null, numberOfCreatedColumns);
+          } else {
             skipThisChange = true;
             break;
           }
@@ -2102,7 +2110,6 @@ export default function Core(rootElement, userSettings) {
       dataSource: dataSource,
       internalSource: 'updateData',
       source: source,
-      metaManager: metaManager,
       firstRun: firstRun
     });
   };
@@ -2145,7 +2152,6 @@ export default function Core(rootElement, userSettings) {
       dataSource: dataSource,
       internalSource: 'loadData',
       source: source,
-      metaManager: metaManager,
       firstRun: firstRun
     });
   };

package/dataMap/dataMap.js

@@ -18,8 +18,8 @@ require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.array.splice.js");
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.array.slice.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/es.array.concat.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.index-of.js");
 var _SheetClip = require("../3rdparty/SheetClip");
@@ -72,9 +72,9 @@ var DataMap = /*#__PURE__*/function () {
   /**
    * @param {object} instance Instance of Handsontable.
    * @param {Array} data Array of arrays or array of objects containing data.
-   * @param {MetaManager} metaManager The meta manager instance.
+   * @param {TableMeta} tableMeta The table meta instance.
    */
-  function DataMap(instance, data, metaManager) {
+  function DataMap(instance, data, tableMeta) {
     _classCallCheck(this, DataMap);
     /**
      * Instance of {@link Handsontable}.
@@ -84,12 +84,12 @@ var DataMap = /*#__PURE__*/function () {
      */
     this.instance = instance;
     /**
-     * Instance of {@link MetaManager}.
+     * Instance of {@link TableMeta}.
      *
      * @private
-     * @type {MetaManager}
+     * @type {TableMeta}
      */
-    this.metaManager = metaManager;
+    this.tableMeta = tableMeta;
     /**
      * Reference to the original dataset.
      *
@@ -127,7 +127,7 @@ var DataMap = /*#__PURE__*/function () {
       if (typeof schema === 'undefined') {
         throw new Error('trying to create `columns` definition but you didn\'t provide `schema` nor `data`');
       }
-      var columns = this.instance.getSettings().columns;
+      var columns = this.tableMeta.columns;
       var i;
       this.colToPropCache = [];
       this.propToColCache = new Map();
@@ -140,7 +140,7 @@ var DataMap = /*#__PURE__*/function () {
           columnsLen = schemaLen > 0 ? schemaLen : this.countFirstRowKeys();
           columnsAsFunc = true;
         } else {
-          var maxCols = this.instance.getSettings().maxCols;
+          var maxCols = this.tableMeta.maxCols;
           columnsLen = Math.min(maxCols, columns.length);
         }
         for (i = 0; i < columnsLen; i++) {
@@ -262,7 +262,7 @@ var DataMap = /*#__PURE__*/function () {
   }, {
     key: "getSchema",
     value: function getSchema() {
-      var schema = this.instance.getSettings().dataSchema;
+      var schema = this.tableMeta.dataSchema;
       if (schema) {
         if (typeof schema === 'function') {
           return schema();
@@ -324,17 +324,15 @@ var DataMap = /*#__PURE__*/function () {
       }
       var continueProcess = this.instance.runHooks('beforeCreateRow', rowIndex, amount, source);
       if (continueProcess === false || physicalRowIndex === null) {
-        return {
-          delta: 0
-        };
+        return 0;
       }
-      var maxRows = this.instance.getSettings().maxRows;
+      var maxRows = this.tableMeta.maxRows;
       var columnCount = this.getSchema().length;
       var rowsToAdd = [];
       var _loop = function _loop() {
         var row = null;
         if (_this2.instance.dataType === 'array') {
-          if (_this2.instance.getSettings().dataSchema) {
+          if (_this2.tableMeta.dataSchema) {
             // Clone template array
             row = (0, _object.deepClone)(_this2.getSchema());
           } else {
@@ -345,7 +343,7 @@ var DataMap = /*#__PURE__*/function () {
             });
           }
         } else if (_this2.instance.dataType === 'function') {
-          row = _this2.instance.getSettings().dataSchema(rowIndex + numberOfCreatedRows);
+          row = _this2.tableMeta.dataSchema(rowIndex + numberOfCreatedRows);
         } else {
           row = {};
           (0, _object.deepExtend)(row, _this2.getSchema());
@@ -368,14 +366,6 @@ var DataMap = /*#__PURE__*/function () {
       if (this.instance.countSourceRows() === rowsToAdd.length) {
         this.instance.columnIndexMapper.initToLength(this.instance.getInitialColumnCount());
       }
-      if (numberOfCreatedRows > 0) {
-        if (index === void 0 || index === null) {
-          // Creates the meta rows at the end of the rows collection.
-          this.metaManager.createRow(null, numberOfCreatedRows);
-        } else if (source !== 'auto') {
-          this.metaManager.createRow(physicalRowIndex, amount);
-        }
-      }
       this.instance.runHooks('afterCreateRow', newVisualRowIndex, numberOfCreatedRows, source);
       this.instance.forceFullRender = true; // used when data was changed
 
@@ -409,7 +399,7 @@ var DataMap = /*#__PURE__*/function () {
         throw new Error('Cannot create new column. When data source in an object, ' + 'you can only have as much columns as defined in first data row, data schema or in the \'columns\' setting.' + 'If you want to be able to add new columns, you have to use array datasource.');
       }
       var dataSource = this.dataSource;
-      var maxCols = this.instance.getSettings().maxCols;
+      var maxCols = this.tableMeta.maxCols;
       var countSourceCols = this.instance.countSourceCols();
       var columnIndex = index;
       if (typeof columnIndex !== 'number' || columnIndex >= countSourceCols) {
@@ -417,9 +407,7 @@ var DataMap = /*#__PURE__*/function () {
       }
       var continueProcess = this.instance.runHooks('beforeCreateCol', columnIndex, amount, source);
       if (continueProcess === false) {
-        return {
-          delta: 0
-        };
+        return 0;
       }
       var physicalColumnIndex = countSourceCols;
       if (columnIndex < this.instance.countCols()) {
@@ -455,14 +443,6 @@ var DataMap = /*#__PURE__*/function () {
         nrOfColumns += 1;
       }
       this.instance.columnIndexMapper.insertIndexes(columnIndex, numberOfCreatedCols);
-      if (numberOfCreatedCols > 0) {
-        if (index === void 0 || index === null) {
-          // Creates the meta columns at the end of the columns collection.
-          this.metaManager.createColumn(null, numberOfCreatedCols);
-        } else if (source !== 'auto') {
-          this.metaManager.createColumn(startPhysicalIndex, amount);
-        }
-      }
       var newVisualColumnIndex = this.instance.toVisualColumn(startPhysicalIndex);
       this.instance.runHooks('afterCreateCol', newVisualColumnIndex, numberOfCreatedCols, source);
       this.instance.forceFullRender = true; // used when data was changed
@@ -487,7 +467,6 @@ var DataMap = /*#__PURE__*/function () {
   }, {
     key: "removeRow",
     value: function removeRow(index) {
-      var _this3 = this;
       var amount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
       var source = arguments.length > 2 ? arguments[2] : undefined;
       var rowIndex = Number.isInteger(index) ? index : -amount; // -amount = taking indexes from the end.
@@ -508,19 +487,13 @@ var DataMap = /*#__PURE__*/function () {
       // TODO: Function `removeRow` should validate fully, probably above.
       if (rowIndex < this.instance.countRows()) {
         this.instance.rowIndexMapper.removeIndexes(removedPhysicalIndexes);
-        var customDefinedColumns = (0, _mixed.isDefined)(this.instance.getSettings().columns) || (0, _mixed.isDefined)(this.instance.getSettings().dataSchema);
+        var customDefinedColumns = (0, _mixed.isDefined)(this.tableMeta.columns) || (0, _mixed.isDefined)(this.tableMeta.dataSchema);
 
         // All rows have been removed. There shouldn't be any columns.
         if (this.instance.rowIndexMapper.getNotTrimmedIndexesLength() === 0 && customDefinedColumns === false) {
           this.instance.columnIndexMapper.setIndexesSequence([]);
         }
       }
-      var descendingPhysicalRows = removedPhysicalIndexes.slice(0).sort(function (a, b) {
-        return b - a;
-      });
-      descendingPhysicalRows.forEach(function (rowPhysicalIndex) {
-        _this3.metaManager.removeRow(rowPhysicalIndex, 1);
-      });
       this.instance.runHooks('afterRemoveRow', rowIndex, numberOfRemovedIndexes, removedPhysicalIndexes, source);
       this.instance.forceFullRender = true; // used when data was changed
 
@@ -542,56 +515,51 @@ var DataMap = /*#__PURE__*/function () {
     value: function removeCol(index) {
       var amount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
       var source = arguments.length > 2 ? arguments[2] : undefined;
-      if (this.instance.dataType === 'object' || this.instance.getSettings().columns) {
+      if (this.instance.dataType === 'object' || this.tableMeta.columns) {
         throw new Error('cannot remove column with object data source or columns option specified');
       }
       var columnIndex = typeof index !== 'number' ? -amount : index;
       columnIndex = (this.instance.countCols() + columnIndex) % this.instance.countCols();
-      var removedPhysicalIndexes = this.visualColumnsToPhysical(columnIndex, amount);
-      var descendingPhysicalColumns = removedPhysicalIndexes.slice(0).sort(function (a, b) {
+      var logicColumns = this.visualColumnsToPhysical(columnIndex, amount);
+      var descendingLogicColumns = logicColumns.slice(0).sort(function (a, b) {
         return b - a;
       });
-      var actionWasNotCancelled = this.instance.runHooks('beforeRemoveCol', columnIndex, amount, removedPhysicalIndexes, source);
+      var actionWasNotCancelled = this.instance.runHooks('beforeRemoveCol', columnIndex, amount, logicColumns, source);
       if (actionWasNotCancelled === false) {
         return false;
       }
       var isTableUniform = true;
-      var removedColumnsCount = descendingPhysicalColumns.length;
+      var removedColumnsCount = descendingLogicColumns.length;
       var data = this.dataSource;
       for (var c = 0; c < removedColumnsCount; c++) {
-        if (isTableUniform && removedPhysicalIndexes[0] !== removedPhysicalIndexes[c] - c) {
+        if (isTableUniform && logicColumns[0] !== logicColumns[c] - c) {
           isTableUniform = false;
         }
       }
       if (isTableUniform) {
         for (var r = 0, rlen = this.instance.countSourceRows(); r < rlen; r++) {
-          data[r].splice(removedPhysicalIndexes[0], amount);
-          if (r === 0) {
-            this.metaManager.removeColumn(removedPhysicalIndexes[0], amount);
-          }
+          data[r].splice(logicColumns[0], amount);
         }
       } else {
         for (var _r = 0, _rlen = this.instance.countSourceRows(); _r < _rlen; _r++) {
           for (var _c = 0; _c < removedColumnsCount; _c++) {
-            data[_r].splice(descendingPhysicalColumns[_c], 1);
-            if (_r === 0) {
-              this.metaManager.removeColumn(descendingPhysicalColumns[_c], 1);
-            }
+            data[_r].splice(descendingLogicColumns[_c], 1);
           }
         }
       }
 
       // TODO: Function `removeCol` should validate fully, probably above.
       if (columnIndex < this.instance.countCols()) {
-        this.instance.columnIndexMapper.removeIndexes(removedPhysicalIndexes);
+        this.instance.columnIndexMapper.removeIndexes(logicColumns);
 
         // All columns have been removed. There shouldn't be any rows.
         if (this.instance.columnIndexMapper.getNotTrimmedIndexesLength() === 0) {
           this.instance.rowIndexMapper.setIndexesSequence([]);
         }
       }
-      this.instance.runHooks('afterRemoveCol', columnIndex, amount, removedPhysicalIndexes, source);
+      this.instance.runHooks('afterRemoveCol', columnIndex, amount, logicColumns, source);
       this.instance.forceFullRender = true; // used when data was changed
+
       this.refreshDuckSchema();
       return true;
     }
@@ -663,7 +631,7 @@ var DataMap = /*#__PURE__*/function () {
   }, {
     key: "spliceData",
     value: function spliceData(index, deleteCount, elements) {
-      var _this4 = this;
+      var _this3 = this;
       var continueSplicing = this.instance.runHooks('beforeDataSplice', index, deleteCount, elements);
       if (continueSplicing !== false) {
         var newData = [].concat(_toConsumableArray(this.dataSource.slice(0, index)), _toConsumableArray(elements), _toConsumableArray(this.dataSource.slice(index)));
@@ -674,7 +642,7 @@ var DataMap = /*#__PURE__*/function () {
         // Pushing to array instead of using `splice`, because Babel changes the code to one that uses the `apply` method.
         // The used method was cause of the problem described within #7840.
         newData.forEach(function (row) {
-          return _this4.dataSource.push(row);
+          return _this3.dataSource.push(row);
         });
       }
     }
@@ -883,7 +851,7 @@ var DataMap = /*#__PURE__*/function () {
   }, {
     key: "getLength",
     value: function getLength() {
-      var maxRowsFromSettings = this.instance.getSettings().maxRows;
+      var maxRowsFromSettings = this.tableMeta.maxRows;
       var maxRows;
       if (maxRowsFromSettings < 0 || maxRowsFromSettings === 0) {
         maxRows = 0;
@@ -942,8 +910,8 @@ var DataMap = /*#__PURE__*/function () {
       var r;
       var c;
       var row;
-      var maxRows = this.instance.getSettings().maxRows;
-      var maxCols = this.instance.getSettings().maxCols;
+      var maxRows = this.tableMeta.maxRows;
+      var maxCols = this.tableMeta.maxCols;
       if (maxRows === 0 || maxCols === 0) {
         return [];
       }
@@ -1000,7 +968,7 @@ var DataMap = /*#__PURE__*/function () {
     key: "destroy",
     value: function destroy() {
       this.instance = null;
-      this.metaManager = null;
+      this.tableMeta = null;
       this.dataSource = null;
       this.duckSchema = null;
       this.colToPropCache.length = 0;