handsontable 12.3.1-next-83e8a23-20230111 → 12.3.1-next-8792e1c-20230202

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 = "12.3.1-next-83e8a23-20230111";
+  var hotVersion = "12.3.1-next-8792e1c-20230202";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var domMessageState = 'invalid';
@@ -160,7 +160,7 @@ function _injectProductInfo(key, element) {
   var schemaValidity = _checkKeySchema(key);
   if (hasValidType || isNonCommercial || schemaValidity) {
     if (schemaValidity) {
-      var releaseDate = (0, _moment.default)("18/01/2023", 'DD/MM/YYYY');
+      var releaseDate = (0, _moment.default)("06/02/2023", 'DD/MM/YYYY');
       var releaseDays = Math.floor(releaseDate.toDate().getTime() / 8.64e7);
       var keyValidityDays = _extractTime(key);
       keyValidityDate = (0, _moment.default)((keyValidityDays + 1) * 8.64e7, 'x').format('MMMM DD, YYYY');

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 = "12.3.1-next-83e8a23-20230111";
+  var hotVersion = "12.3.1-next-8792e1c-20230202";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var domMessageState = 'invalid';
@@ -150,7 +150,7 @@ export function _injectProductInfo(key, element) {
   var schemaValidity = _checkKeySchema(key);
   if (hasValidType || isNonCommercial || schemaValidity) {
     if (schemaValidity) {
-      var releaseDate = moment("18/01/2023", 'DD/MM/YYYY');
+      var releaseDate = moment("06/02/2023", 'DD/MM/YYYY');
       var releaseDays = Math.floor(releaseDate.toDate().getTime() / 8.64e7);
       var keyValidityDays = _extractTime(key);
       keyValidityDate = moment((keyValidityDays + 1) * 8.64e7, 'x').format('MMMM DD, YYYY');

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "12.3.1-next-83e8a23-20230111",
+  "version": "12.3.1-next-8792e1c-20230202",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/mergeCells/calculations/autofill.js

@@ -392,6 +392,9 @@ var AutofillCalculations = /*#__PURE__*/function () {
       } while (inBounds(current, fillOffset));
       this.currentFillData = null;
       this.plugin.hot.render();
+      if (foundMergedCells.length > 0) {
+        this.plugin.ifChromeForceRepaint();
+      }
     }
 
     /**

package/plugins/mergeCells/calculations/autofill.mjs

@@ -388,6 +388,9 @@ var AutofillCalculations = /*#__PURE__*/function () {
       } while (inBounds(current, fillOffset));
       this.currentFillData = null;
       this.plugin.hot.render();
+      if (foundMergedCells.length > 0) {
+        this.plugin.ifChromeForceRepaint();
+      }
     }
 
     /**

package/plugins/mergeCells/mergeCells.js

@@ -12,10 +12,8 @@ require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.number.constructor.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");
+require("core-js/modules/es.array.slice.js");
 exports.__esModule = true;
 exports.PLUGIN_PRIORITY = exports.PLUGIN_KEY = exports.MergeCells = void 0;
 require("core-js/modules/es.array.iterator.js");
@@ -23,6 +21,12 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/es.set.js");
+require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 var _base = require("../base");
@@ -37,13 +41,19 @@ var _object = require("../../helpers/object");
 var _console = require("../../helpers/console");
 var _number = require("../../helpers/number");
 var _utils = require("./utils");
+var _element = require("../../helpers/dom/element");
+var _browser = require("../../helpers/browser");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -259,7 +269,8 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
     /**
      * Updates the plugin's state.
      *
-     * This method is executed when [`updateSettings()`](@/api/core.md#updatesettings) is invoked with any of the following configuration options:
+     * This method is executed when [`updateSettings()`](@/api/core.md#updatesettings) is invoked with any of the
+     * following configuration options:
      *  - [`mergeCells`](@/api/options.md#mergecells)
      */
   }, {
@@ -272,6 +283,56 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       _get(_getPrototypeOf(MergeCells.prototype), "updatePlugin", this).call(this);
     }
 
+    /**
+     * If the browser is recognized as Chrome, force an additional repaint to prevent showing the effects of a Chrome bug.
+     *
+     * Issue described in https://github.com/handsontable/dev-handsontable/issues/521.
+     *
+     * @private
+     */
+  }, {
+    key: "ifChromeForceRepaint",
+    value: function ifChromeForceRepaint() {
+      var _this3 = this;
+      if (!(0, _browser.isChrome)()) {
+        return;
+      }
+      var rowsToRefresh = [];
+      var rowIndexesToRefresh = [];
+      this.mergedCellsCollection.mergedCells.forEach(function (mergedCell) {
+        var row = mergedCell.row,
+          rowspan = mergedCell.rowspan;
+        for (var r = row + 1; r < row + rowspan; r++) {
+          rowIndexesToRefresh.push(r);
+        }
+      });
+
+      // Remove duplicates
+      rowIndexesToRefresh = _toConsumableArray(new Set(rowIndexesToRefresh));
+      rowIndexesToRefresh.forEach(function (rowIndex) {
+        var renderableRowIndex = _this3.hot.rowIndexMapper.getRenderableFromVisualIndex(rowIndex);
+        _this3.hot.view._wt.wtOverlays.getOverlays(true).map(function (overlay) {
+          return (overlay === null || overlay === void 0 ? void 0 : overlay.name) === 'master' ? overlay : overlay.clone.wtTable;
+        }).forEach(function (wtTableRef) {
+          var rowToRefresh = wtTableRef.getRow(renderableRowIndex);
+          if (rowToRefresh) {
+            // Modify the TR's `background` property to later modify it asynchronously.
+            // The background color is getting modified only with the alpha, so the change should not be visible (and is
+            // covered by the TDs' background color).
+            rowToRefresh.style.background = (0, _element.getStyle)(rowToRefresh, 'backgroundColor').replace(')', ', 0.99)');
+            rowsToRefresh.push(rowToRefresh);
+          }
+        });
+      });
+
+      // Asynchronously revert the TRs' `background` property to force a fresh repaint.
+      this.hot._registerTimeout(function () {
+        rowsToRefresh.forEach(function (rowElement) {
+          rowElement.style.background = (0, _element.getStyle)(rowElement, 'backgroundColor').replace(', 0.99)', ')');
+        });
+      }, 1);
+    }
+
     /**
      * Validates a single setting object, represented by a single merged cell information object.
      *
@@ -311,19 +372,19 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "generateFromSettings",
     value: function generateFromSettings(settings) {
-      var _this3 = this;
+      var _this4 = this;
       if (Array.isArray(settings)) {
         var populatedNulls = [];
         (0, _array.arrayEach)(settings, function (setting) {
-          if (!_this3.validateSetting(setting)) {
+          if (!_this4.validateSetting(setting)) {
             return;
           }
-          var highlight = _this3.hot._createCellCoords(setting.row, setting.col);
-          var rangeEnd = _this3.hot._createCellCoords(setting.row + setting.rowspan - 1, setting.col + setting.colspan - 1);
-          var mergeRange = _this3.hot._createCellRange(highlight, highlight, rangeEnd);
+          var highlight = _this4.hot._createCellCoords(setting.row, setting.col);
+          var rangeEnd = _this4.hot._createCellCoords(setting.row + setting.rowspan - 1, setting.col + setting.colspan - 1);
+          var mergeRange = _this4.hot._createCellRange(highlight, highlight, rangeEnd);
 
           // Merging without data population.
-          _this3.mergeRange(mergeRange, true, true);
+          _this4.mergeRange(mergeRange, true, true);
           (0, _number.rangeEach)(setting.row, setting.row + setting.rowspan - 1, function (rowIndex) {
             (0, _number.rangeEach)(setting.col, setting.col + setting.colspan - 1, function (columnIndex) {
               // Not resetting a cell representing a merge area's value.
@@ -429,15 +490,17 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
      * @private
      * @param {CellRange} cellRange Cell range to merge.
      * @param {boolean} [auto=false] `true` if is called automatically, e.g. At initialization.
-     * @param {boolean} [preventPopulation=false] `true`, if the method should not run `populateFromArray` at the end, but rather return its arguments.
-     * @returns {Array|boolean} Returns an array of [row, column, dataUnderCollection] if preventPopulation is set to true. If the the merging process went successful, it returns `true`, otherwise - `false`.
+     * @param {boolean} [preventPopulation=false] `true`, if the method should not run `populateFromArray` at the end,
+     *   but rather return its arguments.
+     * @returns {Array|boolean} Returns an array of [row, column, dataUnderCollection] if preventPopulation is set to
+     *   true. If the the merging process went successful, it returns `true`, otherwise - `false`.
      * @fires Hooks#beforeMergeCells
      * @fires Hooks#afterMergeCells
      */
   }, {
     key: "mergeRange",
     value: function mergeRange(cellRange) {
-      var _this4 = this;
+      var _this5 = this;
       var auto = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var preventPopulation = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var topStart = cellRange.getTopStartCorner();
@@ -461,9 +524,9 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
             clearedData[i] = [];
           }
           if (i === 0 && j === 0) {
-            clearedValue = _this4.hot.getSourceDataAtCell(_this4.hot.toPhysicalRow(mergeParent.row), _this4.hot.toPhysicalColumn(mergeParent.col));
+            clearedValue = _this5.hot.getSourceDataAtCell(_this5.hot.toPhysicalRow(mergeParent.row), _this5.hot.toPhysicalColumn(mergeParent.col));
           } else {
-            _this4.hot.setCellMeta(mergeParent.row + i, mergeParent.col + j, 'hidden', true);
+            _this5.hot.setCellMeta(mergeParent.row + i, mergeParent.col + j, 'hidden', true);
           }
           clearedData[i][j] = clearedValue;
         });
@@ -476,6 +539,9 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         } else {
           this.hot.populateFromArray(mergeParent.row, mergeParent.col, clearedData, void 0, void 0, this.pluginName);
         }
+        if (!auto) {
+          this.ifChromeForceRepaint();
+        }
         this.hot.runHooks('afterMergeCells', cellRange, mergeParent, auto);
         return populationInfo;
       }
@@ -495,7 +561,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "unmergeRange",
     value: function unmergeRange(cellRange) {
-      var _this5 = this;
+      var _this6 = this;
       var auto = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var mergedCells = this.mergedCellsCollection.getWithinRange(cellRange);
       if (!mergedCells) {
@@ -503,13 +569,13 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       }
       this.hot.runHooks('beforeUnmergeCells', cellRange, auto);
       (0, _array.arrayEach)(mergedCells, function (currentCollection) {
-        _this5.mergedCellsCollection.remove(currentCollection.row, currentCollection.col);
+        _this6.mergedCellsCollection.remove(currentCollection.row, currentCollection.col);
         (0, _number.rangeEach)(0, currentCollection.rowspan - 1, function (i) {
           (0, _number.rangeEach)(0, currentCollection.colspan - 1, function (j) {
-            _this5.hot.removeCellMeta(currentCollection.row + i, currentCollection.col + j, 'hidden');
+            _this6.hot.removeCellMeta(currentCollection.row + i, currentCollection.col + j, 'hidden');
           });
         });
-        _this5.hot.removeCellMeta(currentCollection.row, currentCollection.col, 'spanned');
+        _this6.hot.removeCellMeta(currentCollection.row, currentCollection.col, 'spanned');
       });
       this.hot.runHooks('afterUnmergeCells', cellRange, auto);
       this.hot.render();
@@ -589,14 +655,14 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "registerShortcuts",
     value: function registerShortcuts() {
-      var _this6 = this;
+      var _this7 = this;
       var shortcutManager = this.hot.getShortcutManager();
       var gridContext = shortcutManager.getContext('grid');
       gridContext.addShortcut({
         keys: [['Control', 'm']],
         callback: function callback() {
-          _this6.toggleMerge(_this6.hot.getSelectedRangeLast());
-          _this6.hot.render();
+          _this7.toggleMerge(_this7.hot.getSelectedRangeLast());
+          _this7.hot.render();
         },
         runOnlyIf: function runOnlyIf(event) {
           return !event.altKey;
@@ -620,7 +686,8 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
     }
 
     /**
-     * Modifies the information on whether the current selection contains multiple cells. The `afterIsMultipleSelection` hook callback.
+     * Modifies the information on whether the current selection contains multiple cells. The `afterIsMultipleSelection`
+     * hook callback.
      *
      * @private
      * @param {boolean} isMultiple Determines whether the current selection contains multiple cells.
@@ -716,7 +783,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onModifyTransformEnd",
     value: function onModifyTransformEnd(delta) {
-      var _this7 = this;
+      var _this8 = this;
       var currentSelectionRange = this.hot.getSelectedRangeLast();
       var newDelta = (0, _object.clone)(delta);
       var newSelectionRange = this.selectionCalculations.getUpdatedSelectionRange(currentSelectionRange, delta);
@@ -726,7 +793,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         tempDelta = (0, _object.clone)(newDelta);
         this.selectionCalculations.getUpdatedSelectionRange(currentSelectionRange, newDelta);
         (0, _array.arrayEach)(mergedCellsWithinRange, function (mergedCell) {
-          _this7.selectionCalculations.snapDelta(newDelta, currentSelectionRange, mergedCell);
+          _this8.selectionCalculations.snapDelta(newDelta, currentSelectionRange, mergedCell);
         });
       } while (newDelta.row !== tempDelta.row || newDelta.col !== tempDelta.col);
       delta.row = newDelta.row;
@@ -844,7 +911,8 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
 
     /**
      * `beforeSetRangeEnd` hook callback.
-     * While selecting cells with keyboard or mouse, make sure that rectangular area is expanded to the extent of the merged cell.
+     * While selecting cells with keyboard or mouse, make sure that rectangular area is expanded to the extent of the
+     * merged cell.
      *
      * Note: Please keep in mind that callback may modify both start and end range coordinates by the reference.
      *
@@ -1216,13 +1284,15 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
     }
 
     /**
-     * `afterModifyTransformStart` hook callback. Fixes a problem with navigating through merged cells at the edges of the table
-     * with the ENTER/SHIFT+ENTER/TAB/SHIFT+TAB keys.
+     * `afterModifyTransformStart` hook callback. Fixes a problem with navigating through merged cells at the edges of
+     * the table with the ENTER/SHIFT+ENTER/TAB/SHIFT+TAB keys.
      *
      * @private
      * @param {CellCoords} coords Coordinates of the to-be-selected cell.
-     * @param {number} rowTransformDir Row transformation direction (negative value = up, 0 = none, positive value = down).
-     * @param {number} colTransformDir Column transformation direction (negative value = up, 0 = none, positive value = down).
+     * @param {number} rowTransformDir Row transformation direction (negative value = up, 0 = none, positive value =
+     *   down).
+     * @param {number} colTransformDir Column transformation direction (negative value = up, 0 = none, positive value =
+     *   down).
      */
   }, {
     key: "onAfterModifyTransformStart",
@@ -1254,9 +1324,11 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
      * @private
      * @param {number} currentRow Visual row index of the currently processed cell.
      * @param {number} currentColumn Visual column index of the currently cell.
-     * @param {Array} cornersOfSelection Array of the current selection in a form of `[startRow, startColumn, endRow, endColumn]`.
+     * @param {Array} cornersOfSelection Array of the current selection in a form of `[startRow, startColumn, endRow,
+     *   endColumn]`.
      * @param {number|undefined} layerLevel Number indicating which layer of selection is currently processed.
-     * @returns {string|undefined} A `String`, which will act as an additional `className` to be added to the currently processed cell.
+     * @returns {string|undefined} A `String`, which will act as an additional `className` to be added to the currently
+     *   processed cell.
      */
   }, {
     key: "onAfterDrawSelection",
@@ -1272,7 +1344,8 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
      * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
      *
      * @private
-     * @returns {string[]} An `Array` of `String`s. Each of these strings will act like class names to be removed from all the cells in the table.
+     * @returns {string[]} An `Array` of `String`s. Each of these strings will act like class names to be removed from
+     *   all the cells in the table.
      */
   }, {
     key: "onBeforeRemoveCellClassNames",