handsontable 12.3.1-next-712715f-20230130 → 12.3.1-next-75db455-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-712715f-20230130";
+  var hotVersion = "12.3.1-next-75db455-20230202";
   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 = "12.3.1-next-712715f-20230130";
+  var hotVersion = "12.3.1-next-75db455-20230202";
   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": "12.3.1-next-712715f-20230130",
+  "version": "12.3.1-next-75db455-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,8 +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.array.from.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");
@@ -21,15 +21,14 @@ 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/es.array.includes.js");
-require("core-js/modules/es.string.includes.js");
-require("core-js/modules/es.weak-set.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");
 var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _cellsCollection = _interopRequireDefault(require("./cellsCollection"));
@@ -45,16 +44,16 @@ 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 _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 _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 _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; }
@@ -69,9 +68,6 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 _pluginHooks.default.getSingleton().register('beforeMergeCells');
 _pluginHooks.default.getSingleton().register('afterMergeCells');
 _pluginHooks.default.getSingleton().register('beforeUnmergeCells');
@@ -120,7 +116,6 @@ var SHORTCUTS_GROUP = PLUGIN_KEY;
  * ```
  * :::
  */
-var _ifChromeForceRepaint = /*#__PURE__*/new WeakSet();
 var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   _inherits(MergeCells, _BasePlugin);
   var _super = _createSuper(MergeCells);
@@ -128,7 +123,6 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
     var _this;
     _classCallCheck(this, MergeCells);
     _this = _super.call(this, hotInstance);
-    _classPrivateMethodInitSpec(_assertThisInitialized(_this), _ifChromeForceRepaint);
     privatePool.set(_assertThisInitialized(_this), {
       lastDesiredCoords: null
     });
@@ -297,8 +291,48 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
      * @private
      */
   }, {
-    key: "validateSetting",
-    value:
+    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.
      *
@@ -306,7 +340,9 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
      * @param {object} setting An object with `row`, `col`, `rowspan` and `colspan` properties.
      * @returns {boolean}
      */
-    function validateSetting(setting) {
+  }, {
+    key: "validateSetting",
+    value: function validateSetting(setting) {
       var valid = true;
       if (!setting) {
         return false;
@@ -336,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.
@@ -464,7 +500,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     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();
@@ -488,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;
         });
@@ -504,7 +540,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
           this.hot.populateFromArray(mergeParent.row, mergeParent.col, clearedData, void 0, void 0, this.pluginName);
         }
         if (!auto) {
-          _classPrivateMethodGet(this, _ifChromeForceRepaint, _ifChromeForceRepaint2).call(this);
+          this.ifChromeForceRepaint();
         }
         this.hot.runHooks('afterMergeCells', cellRange, mergeParent, auto);
         return populationInfo;
@@ -525,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) {
@@ -533,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();
@@ -619,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;
@@ -747,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);
@@ -757,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;
@@ -1329,44 +1365,4 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }]);
   return MergeCells;
 }(_base.BasePlugin);
-exports.MergeCells = MergeCells;
-function _ifChromeForceRepaint2() {
-  var _this8 = 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 = _this8.hot.rowIndexMapper.getRenderableFromVisualIndex(rowIndex);
-    _this8.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);
-}
+exports.MergeCells = MergeCells;

package/plugins/mergeCells/mergeCells.mjs

@@ -1,14 +1,14 @@
 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); }
+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 _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 _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 _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; }
@@ -23,23 +23,19 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/es.weak-map.js";
 import "core-js/modules/web.dom-collections.iterator.js";
-import "core-js/modules/es.array.includes.js";
-import "core-js/modules/es.string.includes.js";
-import "core-js/modules/es.weak-set.js";
 import "core-js/modules/web.dom-collections.for-each.js";
 import "core-js/modules/es.set.js";
 import "core-js/modules/es.array.map.js";
 import "core-js/modules/es.function.name.js";
 import "core-js/modules/es.regexp.exec.js";
 import "core-js/modules/es.string.replace.js";
+import "core-js/modules/es.array.includes.js";
+import "core-js/modules/es.string.includes.js";
 import "core-js/modules/es.object.set-prototype-of.js";
 import "core-js/modules/es.object.get-prototype-of.js";
 import "core-js/modules/es.reflect.construct.js";
@@ -51,8 +47,8 @@ import "core-js/modules/es.symbol.js";
 import "core-js/modules/es.symbol.description.js";
 import "core-js/modules/es.number.constructor.js";
 import "core-js/modules/es.symbol.iterator.js";
-import "core-js/modules/es.array.slice.js";
 import "core-js/modules/es.array.from.js";
+import "core-js/modules/es.array.slice.js";
 import { BasePlugin } from "../base/index.mjs";
 import Hooks from "../../pluginHooks.mjs";
 import MergedCellsCollection from "./cellsCollection.mjs";
@@ -113,7 +109,6 @@ var SHORTCUTS_GROUP = PLUGIN_KEY;
  * ```
  * :::
  */
-var _ifChromeForceRepaint = /*#__PURE__*/new WeakSet();
 export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   _inherits(MergeCells, _BasePlugin);
   var _super = _createSuper(MergeCells);
@@ -121,7 +116,6 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
     var _this;
     _classCallCheck(this, MergeCells);
     _this = _super.call(this, hotInstance);
-    _classPrivateMethodInitSpec(_assertThisInitialized(_this), _ifChromeForceRepaint);
     privatePool.set(_assertThisInitialized(_this), {
       lastDesiredCoords: null
     });
@@ -290,8 +284,48 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
      * @private
      */
   }, {
-    key: "validateSetting",
-    value:
+    key: "ifChromeForceRepaint",
+    value: function ifChromeForceRepaint() {
+      var _this3 = this;
+      if (!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 = 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 = getStyle(rowElement, 'backgroundColor').replace(', 0.99)', ')');
+        });
+      }, 1);
+    }
+
     /**
      * Validates a single setting object, represented by a single merged cell information object.
      *
@@ -299,7 +333,9 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
      * @param {object} setting An object with `row`, `col`, `rowspan` and `colspan` properties.
      * @returns {boolean}
      */
-    function validateSetting(setting) {
+  }, {
+    key: "validateSetting",
+    value: function validateSetting(setting) {
       var valid = true;
       if (!setting) {
         return false;
@@ -329,19 +365,19 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "generateFromSettings",
     value: function generateFromSettings(settings) {
-      var _this3 = this;
+      var _this4 = this;
       if (Array.isArray(settings)) {
         var populatedNulls = [];
         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);
           rangeEach(setting.row, setting.row + setting.rowspan - 1, function (rowIndex) {
             rangeEach(setting.col, setting.col + setting.colspan - 1, function (columnIndex) {
               // Not resetting a cell representing a merge area's value.
@@ -457,7 +493,7 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     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();
@@ -481,9 +517,9 @@ export 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;
         });
@@ -497,7 +533,7 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
           this.hot.populateFromArray(mergeParent.row, mergeParent.col, clearedData, void 0, void 0, this.pluginName);
         }
         if (!auto) {
-          _classPrivateMethodGet(this, _ifChromeForceRepaint, _ifChromeForceRepaint2).call(this);
+          this.ifChromeForceRepaint();
         }
         this.hot.runHooks('afterMergeCells', cellRange, mergeParent, auto);
         return populationInfo;
@@ -518,7 +554,7 @@ export 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) {
@@ -526,13 +562,13 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       }
       this.hot.runHooks('beforeUnmergeCells', cellRange, auto);
       arrayEach(mergedCells, function (currentCollection) {
-        _this5.mergedCellsCollection.remove(currentCollection.row, currentCollection.col);
+        _this6.mergedCellsCollection.remove(currentCollection.row, currentCollection.col);
         rangeEach(0, currentCollection.rowspan - 1, function (i) {
           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();
@@ -612,14 +648,14 @@ export 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;
@@ -740,7 +776,7 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onModifyTransformEnd",
     value: function onModifyTransformEnd(delta) {
-      var _this7 = this;
+      var _this8 = this;
       var currentSelectionRange = this.hot.getSelectedRangeLast();
       var newDelta = clone(delta);
       var newSelectionRange = this.selectionCalculations.getUpdatedSelectionRange(currentSelectionRange, delta);
@@ -750,7 +786,7 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         tempDelta = clone(newDelta);
         this.selectionCalculations.getUpdatedSelectionRange(currentSelectionRange, newDelta);
         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;
@@ -1321,44 +1357,4 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
     }
   }]);
   return MergeCells;
-}(BasePlugin);
-function _ifChromeForceRepaint2() {
-  var _this8 = this;
-  if (!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 = _this8.hot.rowIndexMapper.getRenderableFromVisualIndex(rowIndex);
-    _this8.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 = 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 = getStyle(rowElement, 'backgroundColor').replace(', 0.99)', ')');
-    });
-  }, 1);
-}
+}(BasePlugin);