handsontable 0.0.0-next-a262af5-20230913 → 0.0.0-next-ab279a9-20230913

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-a262af5-20230913";
+  const hotVersion = "0.0.0-next-ab279a9-20230913";
   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-a262af5-20230913";
+  const hotVersion = "0.0.0-next-ab279a9-20230913";
   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-a262af5-20230913",
+  "version": "0.0.0-next-ab279a9-20230913",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/autoRowSize/autoRowSize.js

@@ -147,12 +147,19 @@ class AutoRowSize extends _base.BasePlugin {
      * @private
      * @type {SamplesGenerator}
      */
-    this.samplesGenerator = new _samplesGenerator.default((row, col) => {
+    this.samplesGenerator = new _samplesGenerator.default((row, column) => {
+      if (row >= 0 && column >= 0) {
+        const cellMeta = this.hot.getCellMeta(row, column);
+        if (cellMeta.hidden) {
+          // do not generate samples for cells that are covered by merged cell (null values)
+          return false;
+        }
+      }
       let cellValue;
       if (row >= 0) {
-        cellValue = this.hot.getDataAtCell(row, col);
+        cellValue = this.hot.getDataAtCell(row, column);
       } else if (row === -1) {
-        cellValue = this.hot.getColHeader(col);
+        cellValue = this.hot.getColHeader(column);
       }
       return {
         value: cellValue
@@ -187,7 +194,7 @@ class AutoRowSize extends _base.BasePlugin {
     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.
-    // This is necesseary for height recalculation for resize handler doubleclick (ManualRowResize).
+    // This is necessary for height recalculation for resize handler doubleclick (ManualRowResize).
     this.addHook('beforeRowResize', (size, row, isDblClick) => this.onBeforeRowResize(size, row, isDblClick));
   }
 
@@ -577,11 +584,11 @@ class AutoRowSize extends _base.BasePlugin {
       this.recalculateAllRowsHeight();
     } else {
       // first load - initialization
-      setTimeout(() => {
+      this.hot._registerTimeout(() => {
         if (this.hot) {
           this.recalculateAllRowsHeight();
         }
-      }, 0);
+      });
     }
   }
 

package/plugins/autoRowSize/autoRowSize.mjs

@@ -141,12 +141,19 @@ export class AutoRowSize extends BasePlugin {
      * @private
      * @type {SamplesGenerator}
      */
-    this.samplesGenerator = new SamplesGenerator((row, col) => {
+    this.samplesGenerator = new SamplesGenerator((row, column) => {
+      if (row >= 0 && column >= 0) {
+        const cellMeta = this.hot.getCellMeta(row, column);
+        if (cellMeta.hidden) {
+          // do not generate samples for cells that are covered by merged cell (null values)
+          return false;
+        }
+      }
       let cellValue;
       if (row >= 0) {
-        cellValue = this.hot.getDataAtCell(row, col);
+        cellValue = this.hot.getDataAtCell(row, column);
       } else if (row === -1) {
-        cellValue = this.hot.getColHeader(col);
+        cellValue = this.hot.getColHeader(column);
       }
       return {
         value: cellValue
@@ -181,7 +188,7 @@ export class AutoRowSize extends BasePlugin {
     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.
-    // This is necesseary for height recalculation for resize handler doubleclick (ManualRowResize).
+    // This is necessary for height recalculation for resize handler doubleclick (ManualRowResize).
     this.addHook('beforeRowResize', (size, row, isDblClick) => this.onBeforeRowResize(size, row, isDblClick));
   }
 
@@ -571,11 +578,11 @@ export class AutoRowSize extends BasePlugin {
       this.recalculateAllRowsHeight();
     } else {
       // first load - initialization
-      setTimeout(() => {
+      this.hot._registerTimeout(() => {
         if (this.hot) {
           this.recalculateAllRowsHeight();
         }
-      }, 0);
+      });
     }
   }
 

package/utils/ghostTable.js

@@ -5,6 +5,9 @@ require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 var _element = require("./../helpers/dom/element");
 var _array = require("./../helpers/array");
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
  * @class GhostTable
  */
@@ -15,47 +18,48 @@ class GhostTable {
      *
      * @type {Core}
      */
-    this.hot = hotInstance;
+    _defineProperty(this, "hot", null);
     /**
      * Container element where every table will be injected.
      *
      * @type {HTMLElement|null}
      */
-    this.container = null;
+    _defineProperty(this, "container", null);
     /**
      * Flag which determine is table was injected to DOM.
      *
      * @type {boolean}
      */
-    this.injected = false;
+    _defineProperty(this, "injected", false);
     /**
      * Added rows collection.
      *
      * @type {Array}
      */
-    this.rows = [];
+    _defineProperty(this, "rows", []);
     /**
      * Added columns collection.
      *
      * @type {Array}
      */
-    this.columns = [];
+    _defineProperty(this, "columns", []);
     /**
      * Samples prepared for calculations.
      *
      * @type {Map}
      * @default {null}
      */
-    this.samples = null;
+    _defineProperty(this, "samples", null);
     /**
      * Ghost table settings.
      *
      * @type {object}
      * @default {Object}
      */
-    this.settings = {
+    _defineProperty(this, "settings", {
       useHeaders: true
-    };
+    });
+    this.hot = hotInstance;
   }
 
   /**
@@ -77,7 +81,7 @@ class GhostTable {
     this.rows.push(rowObject);
     this.samples = samples;
     this.table = this.createTable(this.hot.table.className);
-    this.table.colGroup.appendChild(this.createColGroupsCol());
+    this.table.colGroup.appendChild(this.createColGroupsCol(row));
     this.table.tr.appendChild(this.createRow(row));
     this.container.container.appendChild(this.table.fragment);
     rowObject.table = this.table.table;
@@ -221,16 +225,17 @@ class GhostTable {
   /**
    * Create colgroup col elements.
    *
+   * @param {number} row Visual row index.
    * @returns {DocumentFragment}
    */
-  createColGroupsCol() {
+  createColGroupsCol(row) {
     const fragment = this.hot.rootDocument.createDocumentFragment();
     if (this.hot.hasRowHeaders()) {
-      fragment.appendChild(this.createColElement(-1));
+      fragment.appendChild(this.createColElement(-1, -1));
     }
     this.samples.forEach(sample => {
       (0, _array.arrayEach)(sample.strings, string => {
-        fragment.appendChild(this.createColElement(string.col));
+        fragment.appendChild(this.createColElement(string.col, row));
       });
     });
     return fragment;
@@ -377,12 +382,23 @@ class GhostTable {
   /**
    * Create col element.
    *
-   * @param {number} column Column index.
+   * @param {number} column Visual column index.
+   * @param {number} row Visual row index.
    * @returns {HTMLElement}
    */
-  createColElement(column) {
+  createColElement(column, row) {
     const col = this.hot.rootDocument.createElement('col');
-    col.style.width = `${this.hot.view._wt.wtTable.getStretchedColumnWidth(column)}px`;
+    let colspan = 0;
+    if (row >= 0 && column >= 0) {
+      colspan = this.hot.getCellMeta(row, column).colspan;
+    }
+    let width = this.hot.view._wt.wtTable.getStretchedColumnWidth(column);
+    if (colspan > 1) {
+      for (let nextColumn = column + 1; nextColumn < column + colspan; nextColumn++) {
+        width += this.hot.view._wt.wtTable.getStretchedColumnWidth(nextColumn);
+      }
+    }
+    col.style.width = `${width}px`;
     return col;
   }
 

package/utils/ghostTable.mjs

@@ -1,5 +1,8 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { addClass, outerHeight } from "./../helpers/dom/element.mjs";
 import { arrayEach } from "./../helpers/array.mjs";
 /**
@@ -12,47 +15,48 @@ class GhostTable {
      *
      * @type {Core}
      */
-    this.hot = hotInstance;
+    _defineProperty(this, "hot", null);
     /**
      * Container element where every table will be injected.
      *
      * @type {HTMLElement|null}
      */
-    this.container = null;
+    _defineProperty(this, "container", null);
     /**
      * Flag which determine is table was injected to DOM.
      *
      * @type {boolean}
      */
-    this.injected = false;
+    _defineProperty(this, "injected", false);
     /**
      * Added rows collection.
      *
      * @type {Array}
      */
-    this.rows = [];
+    _defineProperty(this, "rows", []);
     /**
      * Added columns collection.
      *
      * @type {Array}
      */
-    this.columns = [];
+    _defineProperty(this, "columns", []);
     /**
      * Samples prepared for calculations.
      *
      * @type {Map}
      * @default {null}
      */
-    this.samples = null;
+    _defineProperty(this, "samples", null);
     /**
      * Ghost table settings.
      *
      * @type {object}
      * @default {Object}
      */
-    this.settings = {
+    _defineProperty(this, "settings", {
       useHeaders: true
-    };
+    });
+    this.hot = hotInstance;
   }
 
   /**
@@ -74,7 +78,7 @@ class GhostTable {
     this.rows.push(rowObject);
     this.samples = samples;
     this.table = this.createTable(this.hot.table.className);
-    this.table.colGroup.appendChild(this.createColGroupsCol());
+    this.table.colGroup.appendChild(this.createColGroupsCol(row));
     this.table.tr.appendChild(this.createRow(row));
     this.container.container.appendChild(this.table.fragment);
     rowObject.table = this.table.table;
@@ -218,16 +222,17 @@ class GhostTable {
   /**
    * Create colgroup col elements.
    *
+   * @param {number} row Visual row index.
    * @returns {DocumentFragment}
    */
-  createColGroupsCol() {
+  createColGroupsCol(row) {
     const fragment = this.hot.rootDocument.createDocumentFragment();
     if (this.hot.hasRowHeaders()) {
-      fragment.appendChild(this.createColElement(-1));
+      fragment.appendChild(this.createColElement(-1, -1));
     }
     this.samples.forEach(sample => {
       arrayEach(sample.strings, string => {
-        fragment.appendChild(this.createColElement(string.col));
+        fragment.appendChild(this.createColElement(string.col, row));
       });
     });
     return fragment;
@@ -374,12 +379,23 @@ class GhostTable {
   /**
    * Create col element.
    *
-   * @param {number} column Column index.
+   * @param {number} column Visual column index.
+   * @param {number} row Visual row index.
    * @returns {HTMLElement}
    */
-  createColElement(column) {
+  createColElement(column, row) {
     const col = this.hot.rootDocument.createElement('col');
-    col.style.width = `${this.hot.view._wt.wtTable.getStretchedColumnWidth(column)}px`;
+    let colspan = 0;
+    if (row >= 0 && column >= 0) {
+      colspan = this.hot.getCellMeta(row, column).colspan;
+    }
+    let width = this.hot.view._wt.wtTable.getStretchedColumnWidth(column);
+    if (colspan > 1) {
+      for (let nextColumn = column + 1; nextColumn < column + colspan; nextColumn++) {
+        width += this.hot.view._wt.wtTable.getStretchedColumnWidth(nextColumn);
+      }
+    }
+    col.style.width = `${width}px`;
     return col;
   }
 

package/utils/samplesGenerator.js

@@ -6,6 +6,9 @@ require("core-js/modules/es.array.push.js");
 var _object = require("./../helpers/object");
 var _number = require("./../helpers/number");
 var _mixed = require("./../helpers/mixed");
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
  * @class SamplesGenerator
  */
@@ -18,34 +21,36 @@ class SamplesGenerator {
   static get SAMPLE_COUNT() {
     return 3;
   }
+  /**
+   * Samples prepared for calculations.
+   *
+   * @type {Map}
+   * @default {null}
+   */
+
   constructor(dataFactory) {
-    /**
-     * Samples prepared for calculations.
-     *
-     * @type {Map}
-     * @default {null}
-     */
-    this.samples = null;
+    _defineProperty(this, "samples", null);
     /**
      * Function which give the data to collect samples.
      *
      * @type {Function}
      */
-    this.dataFactory = dataFactory;
+    _defineProperty(this, "dataFactory", null);
     /**
      * Custom number of samples to take of each value length.
      *
      * @type {number}
      * @default {null}
      */
-    this.customSampleCount = null;
+    _defineProperty(this, "customSampleCount", null);
     /**
      * `true` if duplicate samples collection should be allowed, `false` otherwise.
      *
      * @type {boolean}
      * @default {false}
      */
-    this.allowDuplicates = false;
+    _defineProperty(this, "allowDuplicates", false);
+    this.dataFactory = dataFactory;
   }
 
   /**
@@ -140,10 +145,14 @@ class SamplesGenerator {
     const computedKey = type === 'row' ? 'col' : 'row';
     const sampledValues = [];
     (0, _number.rangeEach)(range.from, range.to, index => {
+      const data = type === 'row' ? this.dataFactory(specifierValue, index) : this.dataFactory(index, specifierValue);
+      if (data === false) {
+        return;
+      }
       const {
         value,
         bundleSeed
-      } = type === 'row' ? this.dataFactory(specifierValue, index) : this.dataFactory(index, specifierValue);
+      } = data;
       const hasCustomBundleSeed = typeof bundleSeed === 'string' && bundleSeed.length > 0;
       let seed;
       if (hasCustomBundleSeed) {

package/utils/samplesGenerator.mjs

@@ -1,5 +1,8 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { isObject } from "./../helpers/object.mjs";
 import { rangeEach } from "./../helpers/number.mjs";
 import { stringify } from "./../helpers/mixed.mjs";
@@ -15,34 +18,36 @@ class SamplesGenerator {
   static get SAMPLE_COUNT() {
     return 3;
   }
+  /**
+   * Samples prepared for calculations.
+   *
+   * @type {Map}
+   * @default {null}
+   */
+
   constructor(dataFactory) {
-    /**
-     * Samples prepared for calculations.
-     *
-     * @type {Map}
-     * @default {null}
-     */
-    this.samples = null;
+    _defineProperty(this, "samples", null);
     /**
      * Function which give the data to collect samples.
      *
      * @type {Function}
      */
-    this.dataFactory = dataFactory;
+    _defineProperty(this, "dataFactory", null);
     /**
      * Custom number of samples to take of each value length.
      *
      * @type {number}
      * @default {null}
      */
-    this.customSampleCount = null;
+    _defineProperty(this, "customSampleCount", null);
     /**
      * `true` if duplicate samples collection should be allowed, `false` otherwise.
      *
      * @type {boolean}
      * @default {false}
      */
-    this.allowDuplicates = false;
+    _defineProperty(this, "allowDuplicates", false);
+    this.dataFactory = dataFactory;
   }
 
   /**
@@ -137,10 +142,14 @@ class SamplesGenerator {
     const computedKey = type === 'row' ? 'col' : 'row';
     const sampledValues = [];
     rangeEach(range.from, range.to, index => {
+      const data = type === 'row' ? this.dataFactory(specifierValue, index) : this.dataFactory(index, specifierValue);
+      if (data === false) {
+        return;
+      }
       const {
         value,
         bundleSeed
-      } = type === 'row' ? this.dataFactory(specifierValue, index) : this.dataFactory(index, specifierValue);
+      } = data;
       const hasCustomBundleSeed = typeof bundleSeed === 'string' && bundleSeed.length > 0;
       let seed;
       if (hasCustomBundleSeed) {