handsontable 0.0.0-next-ff10728-20250410 → 0.0.0-next-9410a76-20250416

package/plugins/copyPaste/copyPaste.mjs

@@ -17,7 +17,7 @@ import { Hooks } from "../../core/hooks/index.mjs";
 import { stringify, parse } from "../../3rdparty/SheetClip/index.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
 import { sanitize } from "../../helpers/string.mjs";
-import { removeContentEditableFromElementAndDeselect, runWithSelectedContendEditableElement, makeElementContentEditableAndSelectItsContent, isHTMLElement } from "../../helpers/dom/element.mjs";
+import { removeContentEditableFromElementAndDeselect, runWithSelectedContendEditableElement, makeElementContentEditableAndSelectItsContent, isHTMLElement, isInternalElement } from "../../helpers/dom/element.mjs";
 import { isSafari } from "../../helpers/browser.mjs";
 import copyItem from "./contextMenuItem/copy.mjs";
 import copyColumnHeadersOnlyItem from "./contextMenuItem/copyColumnHeadersOnly.mjs";
@@ -252,6 +252,9 @@ export class CopyPaste extends BasePlugin {
       return _assertClassBrand(_CopyPaste_brand, _this, _onAfterSelection).call(_this, ...args);
     });
     this.addHook('afterSelectionEnd', () => _assertClassBrand(_CopyPaste_brand, this, _onAfterSelectionEnd).call(this));
+
+    // Events are attached to the document, not the root table element - as it should,
+    // for Chrome 133 and lower to copy/paste/cut work properly (#dev-2277).
     this.eventManager.addEventListener(this.hot.rootDocument, 'copy', function () {
       return _this.onCopy(...arguments);
     });
@@ -558,12 +561,10 @@ export class CopyPaste extends BasePlugin {
    * @private
    */
   onCopy(event) {
-    var _event$target, _this$hot$getSelected;
+    const eventTarget = event.composedPath()[0];
     const focusedElement = this.hot.getFocusManager().getRefocusElement();
-    const isHotInput = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.hasAttribute('data-hot-input');
-    const selectedCell = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
-    const TD = selectedCell ? this.hot.getCell(selectedCell.row, selectedCell.col, true) : null;
-    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCopy, this) || this.isEditorOpened() || isHTMLElement(event.target) && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
+    const isHotInput = eventTarget === null || eventTarget === void 0 ? void 0 : eventTarget.hasAttribute('data-hot-input');
+    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCopy, this) || this.isEditorOpened() || isHTMLElement(eventTarget) && (isHotInput && eventTarget !== focusedElement || !isHotInput && eventTarget !== this.hot.rootDocument.body && !isInternalElement(eventTarget, this.hot.rootElement))) {
       return;
     }
     event.preventDefault();
@@ -593,12 +594,10 @@ export class CopyPaste extends BasePlugin {
    * @private
    */
   onCut(event) {
-    var _event$target2, _this$hot$getSelected2;
+    const eventTarget = event.composedPath()[0];
     const focusedElement = this.hot.getFocusManager().getRefocusElement();
-    const isHotInput = (_event$target2 = event.target) === null || _event$target2 === void 0 ? void 0 : _event$target2.hasAttribute('data-hot-input');
-    const selectedCell = (_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight;
-    const TD = selectedCell ? this.hot.getCell(selectedCell.row, selectedCell.col, true) : null;
-    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCut, this) || this.isEditorOpened() || isHTMLElement(event.target) && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
+    const isHotInput = eventTarget === null || eventTarget === void 0 ? void 0 : eventTarget.hasAttribute('data-hot-input');
+    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCut, this) || this.isEditorOpened() || isHTMLElement(eventTarget) && (isHotInput && eventTarget !== focusedElement || !isHotInput && eventTarget !== this.hot.rootDocument.body && !isInternalElement(eventTarget, this.hot.rootElement))) {
       return;
     }
     event.preventDefault();
@@ -627,12 +626,10 @@ export class CopyPaste extends BasePlugin {
    * @private
    */
   onPaste(event) {
-    var _event$target3, _this$hot$getSelected3;
+    const eventTarget = event.composedPath()[0];
     const focusedElement = this.hot.getFocusManager().getRefocusElement();
-    const isHotInput = (_event$target3 = event.target) === null || _event$target3 === void 0 ? void 0 : _event$target3.hasAttribute('data-hot-input');
-    const selectedCell = (_this$hot$getSelected3 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected3 === void 0 ? void 0 : _this$hot$getSelected3.highlight;
-    const TD = selectedCell ? this.hot.getCell(selectedCell.row, selectedCell.col, true) : null;
-    if (!this.hot.isListening() || this.isEditorOpened() || !this.hot.getSelected() || isHTMLElement(event.target) && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
+    const isHotInput = eventTarget === null || eventTarget === void 0 ? void 0 : eventTarget.hasAttribute('data-hot-input');
+    if (!this.hot.isListening() || this.isEditorOpened() || !this.hot.getSelected() || isHTMLElement(eventTarget) && (isHotInput && eventTarget !== focusedElement || !isHotInput && eventTarget !== this.hot.rootDocument.body && !isInternalElement(eventTarget, this.hot.rootElement))) {
       return;
     }
     event.preventDefault();

package/plugins/copyPaste/pasteEvent.js

@@ -11,5 +11,8 @@ class PasteEvent {
     this.clipboardData = new _clipboardData.default();
   }
   preventDefault() {}
+  composedPath() {
+    return [];
+  }
 }
 exports.default = PasteEvent;

package/plugins/copyPaste/pasteEvent.mjs

@@ -7,4 +7,7 @@ export default class PasteEvent {
     this.clipboardData = new ClipboardData();
   }
   preventDefault() {}
+  composedPath() {
+    return [];
+  }
 }

package/plugins/filters/filters.js

@@ -542,10 +542,10 @@ class Filters extends _base.BasePlugin {
    *
    * @returns {Array}
    */
-  /* eslint-enable jsdoc/require-description-complete-sentence */
   exportConditions() {
     return this.conditionCollection.exportAllConditions();
   }
+  /* eslint-enable jsdoc/require-description-complete-sentence */
 
   /**
    * Filters data based on added filter conditions.
@@ -562,38 +562,39 @@ class Filters extends _base.BasePlugin {
     let visibleVisualRows = [];
     const conditions = this.exportConditions();
     const allowFiltering = this.hot.runHooks('beforeFilter', conditions, _classPrivateFieldGet(_previousConditionStack, this));
-    if (allowFiltering !== false) {
-      if (needToFilter) {
-        const trimmedRows = [];
-        this.hot.batchExecution(() => {
-          this.filtersRowsMap.clear();
-          visibleVisualRows = (0, _array.arrayMap)(dataFilter.filter(), rowData => rowData.meta.visualRow);
-          const visibleVisualRowsAssertion = (0, _utils.createArrayAssertion)(visibleVisualRows);
-          (0, _number.rangeEach)(this.hot.countSourceRows() - 1, row => {
-            if (!visibleVisualRowsAssertion(row)) {
-              trimmedRows.push(row);
-            }
-          });
-          (0, _array.arrayEach)(trimmedRows, physicalRow => {
-            this.filtersRowsMap.setValueAtIndex(physicalRow, true);
-          });
-        }, true);
-        if (!navigableHeaders && !visibleVisualRows.length) {
-          this.hot.deselectCell();
-        }
-      } else {
+    if (allowFiltering !== false && needToFilter) {
+      const trimmedRows = [];
+      this.hot.batchExecution(() => {
         this.filtersRowsMap.clear();
+        visibleVisualRows = (0, _array.arrayMap)(dataFilter.filter(), rowData => rowData.meta.visualRow);
+        const visibleVisualRowsAssertion = (0, _utils.createArrayAssertion)(visibleVisualRows);
+        (0, _number.rangeEach)(this.hot.countSourceRows() - 1, row => {
+          if (!visibleVisualRowsAssertion(row)) {
+            trimmedRows.push(row);
+          }
+        });
+        (0, _array.arrayEach)(trimmedRows, physicalRow => {
+          this.filtersRowsMap.setValueAtIndex(physicalRow, true);
+        });
+      }, true);
+      if (!navigableHeaders && !visibleVisualRows.length) {
+        this.hot.deselectCell();
       }
       _classPrivateFieldSet(_previousConditionStack, this, this.exportConditions());
-      this.hot.runHooks('afterFilter', conditions);
-      this.hot.view.adjustElementsSize();
-      this.hot.render();
+    } else if (allowFiltering !== false && !needToFilter) {
+      _classPrivateFieldSet(_previousConditionStack, this, this.exportConditions());
+      this.filtersRowsMap.clear();
     } else {
       this.importConditions(_classPrivateFieldGet(_previousConditionStack, this));
     }
     if (this.hot.selection.isSelected()) {
       this.hot.selectCell(navigableHeaders ? -1 : 0, this.hot.getSelectedRangeLast().highlight.col);
     }
+    if (allowFiltering !== false) {
+      this.hot.runHooks('afterFilter', conditions);
+      this.hot.view.adjustElementsSize();
+      this.hot.render();
+    }
   }
 
   /**

package/plugins/filters/filters.mjs

@@ -536,10 +536,10 @@ export class Filters extends BasePlugin {
    *
    * @returns {Array}
    */
-  /* eslint-enable jsdoc/require-description-complete-sentence */
   exportConditions() {
     return this.conditionCollection.exportAllConditions();
   }
+  /* eslint-enable jsdoc/require-description-complete-sentence */
 
   /**
    * Filters data based on added filter conditions.
@@ -556,38 +556,39 @@ export class Filters extends BasePlugin {
     let visibleVisualRows = [];
     const conditions = this.exportConditions();
     const allowFiltering = this.hot.runHooks('beforeFilter', conditions, _classPrivateFieldGet(_previousConditionStack, this));
-    if (allowFiltering !== false) {
-      if (needToFilter) {
-        const trimmedRows = [];
-        this.hot.batchExecution(() => {
-          this.filtersRowsMap.clear();
-          visibleVisualRows = arrayMap(dataFilter.filter(), rowData => rowData.meta.visualRow);
-          const visibleVisualRowsAssertion = createArrayAssertion(visibleVisualRows);
-          rangeEach(this.hot.countSourceRows() - 1, row => {
-            if (!visibleVisualRowsAssertion(row)) {
-              trimmedRows.push(row);
-            }
-          });
-          arrayEach(trimmedRows, physicalRow => {
-            this.filtersRowsMap.setValueAtIndex(physicalRow, true);
-          });
-        }, true);
-        if (!navigableHeaders && !visibleVisualRows.length) {
-          this.hot.deselectCell();
-        }
-      } else {
+    if (allowFiltering !== false && needToFilter) {
+      const trimmedRows = [];
+      this.hot.batchExecution(() => {
         this.filtersRowsMap.clear();
+        visibleVisualRows = arrayMap(dataFilter.filter(), rowData => rowData.meta.visualRow);
+        const visibleVisualRowsAssertion = createArrayAssertion(visibleVisualRows);
+        rangeEach(this.hot.countSourceRows() - 1, row => {
+          if (!visibleVisualRowsAssertion(row)) {
+            trimmedRows.push(row);
+          }
+        });
+        arrayEach(trimmedRows, physicalRow => {
+          this.filtersRowsMap.setValueAtIndex(physicalRow, true);
+        });
+      }, true);
+      if (!navigableHeaders && !visibleVisualRows.length) {
+        this.hot.deselectCell();
       }
       _classPrivateFieldSet(_previousConditionStack, this, this.exportConditions());
-      this.hot.runHooks('afterFilter', conditions);
-      this.hot.view.adjustElementsSize();
-      this.hot.render();
+    } else if (allowFiltering !== false && !needToFilter) {
+      _classPrivateFieldSet(_previousConditionStack, this, this.exportConditions());
+      this.filtersRowsMap.clear();
     } else {
       this.importConditions(_classPrivateFieldGet(_previousConditionStack, this));
     }
     if (this.hot.selection.isSelected()) {
       this.hot.selectCell(navigableHeaders ? -1 : 0, this.hot.getSelectedRangeLast().highlight.col);
     }
+    if (allowFiltering !== false) {
+      this.hot.runHooks('afterFilter', conditions);
+      this.hot.view.adjustElementsSize();
+      this.hot.render();
+    }
   }
 
   /**

package/plugins/filters/ui/multipleSelect.js

@@ -253,7 +253,13 @@ class MultipleSelectUI extends _base.BaseUI {
         beforeOnCellMouseUp: () => {
           _classPrivateFieldGet(_itemsBox, this).listen();
         },
-        colWidths: () => _classPrivateFieldGet(_itemsBox, this).container.scrollWidth - (0, _element.getScrollbarWidth)(rootDocument),
+        modifyColWidth: width => {
+          const minWidth = _classPrivateFieldGet(_itemsBox, this).container.scrollWidth - (0, _element.getScrollbarWidth)(rootDocument);
+          if (width !== undefined && width < minWidth) {
+            return minWidth;
+          }
+          return width;
+        },
         maxCols: 1,
         autoWrapCol: true,
         height: 110,

package/plugins/filters/ui/multipleSelect.mjs

@@ -248,7 +248,13 @@ export class MultipleSelectUI extends BaseUI {
         beforeOnCellMouseUp: () => {
           _classPrivateFieldGet(_itemsBox, this).listen();
         },
-        colWidths: () => _classPrivateFieldGet(_itemsBox, this).container.scrollWidth - getScrollbarWidth(rootDocument),
+        modifyColWidth: width => {
+          const minWidth = _classPrivateFieldGet(_itemsBox, this).container.scrollWidth - getScrollbarWidth(rootDocument);
+          if (width !== undefined && width < minWidth) {
+            return minWidth;
+          }
+          return width;
+        },
         maxCols: 1,
         autoWrapCol: true,
         height: 110,

package/plugins/hiddenColumns/hiddenColumns.js

@@ -231,8 +231,8 @@ class HiddenColumns extends _base.BasePlugin {
    * Disables the plugin functionality for this Handsontable instance.
    */
   disablePlugin() {
-    this.hot.columnIndexMapper.unregisterMap(this.pluginName);
     super.disablePlugin();
+    this.hot.columnIndexMapper.unregisterMap(this.pluginName);
     this.resetCellsMeta();
   }
 

package/plugins/hiddenColumns/hiddenColumns.mjs

@@ -227,8 +227,8 @@ export class HiddenColumns extends BasePlugin {
    * Disables the plugin functionality for this Handsontable instance.
    */
   disablePlugin() {
-    this.hot.columnIndexMapper.unregisterMap(this.pluginName);
     super.disablePlugin();
+    this.hot.columnIndexMapper.unregisterMap(this.pluginName);
     this.resetCellsMeta();
   }
 

package/plugins/hiddenRows/hiddenRows.js

@@ -231,8 +231,8 @@ class HiddenRows extends _base.BasePlugin {
    * Disables the plugin functionality for this Handsontable instance.
    */
   disablePlugin() {
-    this.hot.rowIndexMapper.unregisterMap(this.pluginName);
     super.disablePlugin();
+    this.hot.rowIndexMapper.unregisterMap(this.pluginName);
     this.resetCellsMeta();
   }
 

package/plugins/hiddenRows/hiddenRows.mjs

@@ -227,8 +227,8 @@ export class HiddenRows extends BasePlugin {
    * Disables the plugin functionality for this Handsontable instance.
    */
   disablePlugin() {
-    this.hot.rowIndexMapper.unregisterMap(this.pluginName);
     super.disablePlugin();
+    this.hot.rowIndexMapper.unregisterMap(this.pluginName);
     this.resetCellsMeta();
   }
 

package/plugins/manualColumnResize/manualColumnResize.js

@@ -341,12 +341,12 @@ class ManualColumnResize extends _base.BasePlugin {
   setupGuidePosition() {
     const handleHeight = parseInt((0, _element.outerHeight)(_classPrivateFieldGet(_handle, this)), 10);
     const handleBottomPosition = parseInt(_classPrivateFieldGet(_handle, this).style.top, 10) + handleHeight;
-    const maximumVisibleElementHeight = parseInt(this.hot.view.maximumVisibleElementHeight(0), 10);
+    const tableHeight = this.hot.view.getTableHeight();
     (0, _element.addClass)(_classPrivateFieldGet(_handle, this), 'active');
     (0, _element.addClass)(_classPrivateFieldGet(_guide, this), 'active');
     _classPrivateFieldGet(_guide, this).style.top = `${handleBottomPosition}px`;
     this.refreshGuidePosition();
-    _classPrivateFieldGet(_guide, this).style.height = `${maximumVisibleElementHeight - handleHeight}px`;
+    _classPrivateFieldGet(_guide, this).style.height = `${tableHeight - handleHeight}px`;
     this.hot.rootElement.appendChild(_classPrivateFieldGet(_guide, this));
   }
 
@@ -417,8 +417,7 @@ class ManualColumnResize extends _base.BasePlugin {
    */
   afterMouseDownTimeout() {
     const render = () => {
-      this.hot.forceFullRender = true;
-      this.hot.view.render(); // updates all
+      this.hot.render();
       this.hot.view.adjustElementsSize();
     };
     const resize = (column, forceRender) => {
@@ -578,8 +577,7 @@ function _onMouseMove(event) {
  */
 function _onMouseUp() {
   const render = () => {
-    this.hot.forceFullRender = true;
-    this.hot.view.render(); // updates all
+    this.hot.render();
     this.hot.view.adjustElementsSize();
   };
   const resize = (column, forceRender) => {

package/plugins/manualColumnResize/manualColumnResize.mjs

@@ -336,12 +336,12 @@ export class ManualColumnResize extends BasePlugin {
   setupGuidePosition() {
     const handleHeight = parseInt(outerHeight(_classPrivateFieldGet(_handle, this)), 10);
     const handleBottomPosition = parseInt(_classPrivateFieldGet(_handle, this).style.top, 10) + handleHeight;
-    const maximumVisibleElementHeight = parseInt(this.hot.view.maximumVisibleElementHeight(0), 10);
+    const tableHeight = this.hot.view.getTableHeight();
     addClass(_classPrivateFieldGet(_handle, this), 'active');
     addClass(_classPrivateFieldGet(_guide, this), 'active');
     _classPrivateFieldGet(_guide, this).style.top = `${handleBottomPosition}px`;
     this.refreshGuidePosition();
-    _classPrivateFieldGet(_guide, this).style.height = `${maximumVisibleElementHeight - handleHeight}px`;
+    _classPrivateFieldGet(_guide, this).style.height = `${tableHeight - handleHeight}px`;
     this.hot.rootElement.appendChild(_classPrivateFieldGet(_guide, this));
   }
 
@@ -412,8 +412,7 @@ export class ManualColumnResize extends BasePlugin {
    */
   afterMouseDownTimeout() {
     const render = () => {
-      this.hot.forceFullRender = true;
-      this.hot.view.render(); // updates all
+      this.hot.render();
       this.hot.view.adjustElementsSize();
     };
     const resize = (column, forceRender) => {
@@ -572,8 +571,7 @@ function _onMouseMove(event) {
  */
 function _onMouseUp() {
   const render = () => {
-    this.hot.forceFullRender = true;
-    this.hot.view.render(); // updates all
+    this.hot.render();
     this.hot.view.adjustElementsSize();
   };
   const resize = (column, forceRender) => {

package/plugins/manualRowResize/manualRowResize.js

@@ -328,12 +328,12 @@ class ManualRowResize extends _base.BasePlugin {
   setupGuidePosition() {
     const handleWidth = parseInt((0, _element.outerWidth)(_classPrivateFieldGet(_handle, this)), 10);
     const handleEndPosition = parseInt(_classPrivateFieldGet(_handle, this).style[this.inlineDir], 10) + handleWidth;
-    const maximumVisibleElementWidth = parseInt(this.hot.view.maximumVisibleElementWidth(0), 10);
+    const tableWidth = this.hot.view.getTableWidth();
     (0, _element.addClass)(_classPrivateFieldGet(_handle, this), 'active');
     (0, _element.addClass)(_classPrivateFieldGet(_guide, this), 'active');
     _classPrivateFieldGet(_guide, this).style.top = _classPrivateFieldGet(_handle, this).style.top;
     _classPrivateFieldGet(_guide, this).style[this.inlineDir] = `${handleEndPosition}px`;
-    _classPrivateFieldGet(_guide, this).style.width = `${maximumVisibleElementWidth - handleWidth}px`;
+    _classPrivateFieldGet(_guide, this).style.width = `${tableWidth - handleWidth}px`;
     this.hot.rootElement.appendChild(_classPrivateFieldGet(_guide, this));
   }
 
@@ -414,8 +414,7 @@ class ManualRowResize extends _base.BasePlugin {
    */
   afterMouseDownTimeout() {
     const render = () => {
-      this.hot.forceFullRender = true;
-      this.hot.view.render(); // updates all
+      this.hot.render();
       this.hot.view.adjustElementsSize();
     };
     const resize = (row, forceRender) => {
@@ -543,8 +542,7 @@ function _onMouseMove(event) {
  */
 function _onMouseUp() {
   const render = () => {
-    this.hot.forceFullRender = true;
-    this.hot.view.render(); // updates all
+    this.hot.render();
     this.hot.view.adjustElementsSize();
   };
   const runHooks = (row, forceRender) => {

package/plugins/manualRowResize/manualRowResize.mjs

@@ -323,12 +323,12 @@ export class ManualRowResize extends BasePlugin {
   setupGuidePosition() {
     const handleWidth = parseInt(outerWidth(_classPrivateFieldGet(_handle, this)), 10);
     const handleEndPosition = parseInt(_classPrivateFieldGet(_handle, this).style[this.inlineDir], 10) + handleWidth;
-    const maximumVisibleElementWidth = parseInt(this.hot.view.maximumVisibleElementWidth(0), 10);
+    const tableWidth = this.hot.view.getTableWidth();
     addClass(_classPrivateFieldGet(_handle, this), 'active');
     addClass(_classPrivateFieldGet(_guide, this), 'active');
     _classPrivateFieldGet(_guide, this).style.top = _classPrivateFieldGet(_handle, this).style.top;
     _classPrivateFieldGet(_guide, this).style[this.inlineDir] = `${handleEndPosition}px`;
-    _classPrivateFieldGet(_guide, this).style.width = `${maximumVisibleElementWidth - handleWidth}px`;
+    _classPrivateFieldGet(_guide, this).style.width = `${tableWidth - handleWidth}px`;
     this.hot.rootElement.appendChild(_classPrivateFieldGet(_guide, this));
   }
 
@@ -409,8 +409,7 @@ export class ManualRowResize extends BasePlugin {
    */
   afterMouseDownTimeout() {
     const render = () => {
-      this.hot.forceFullRender = true;
-      this.hot.view.render(); // updates all
+      this.hot.render();
       this.hot.view.adjustElementsSize();
     };
     const resize = (row, forceRender) => {
@@ -537,8 +536,7 @@ function _onMouseMove(event) {
  */
 function _onMouseUp() {
   const render = () => {
-    this.hot.forceFullRender = true;
-    this.hot.view.render(); // updates all
+    this.hot.render();
     this.hot.view.adjustElementsSize();
   };
   const runHooks = (row, forceRender) => {

package/plugins/mergeCells/mergeCells.js

@@ -30,6 +30,7 @@ var _element = require("../../helpers/dom/element");
 var _browser = require("../../helpers/browser");
 var _focusOrder2 = require("./focusOrder");
 var _renderer = require("./renderer");
+var _utils = require("./utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -666,8 +667,12 @@ class MergeCells extends _base.BasePlugin {
    * @param {CellRange} cellRange The cell range to merge or unmerged.
    */
   toggleMerge(cellRange) {
-    const mergedCell = this.mergedCellsCollection.get(cellRange.from.row, cellRange.from.col);
-    const mergedCellCoversWholeRange = mergedCell.row === cellRange.from.row && mergedCell.col === cellRange.from.col && mergedCell.row + mergedCell.rowspan - 1 === cellRange.to.row && mergedCell.col + mergedCell.colspan - 1 === cellRange.to.col;
+    const {
+      from,
+      to
+    } = cellRange.clone().normalize();
+    const mergedCell = this.mergedCellsCollection.get(from.row, from.col);
+    const mergedCellCoversWholeRange = mergedCell.row === from.row && mergedCell.col === from.col && mergedCell.row + mergedCell.rowspan - 1 === to.row && mergedCell.col + mergedCell.colspan - 1 === to.col;
     if (mergedCellCoversWholeRange) {
       this.unmergeRange(cellRange);
     } else {
@@ -1479,33 +1484,7 @@ function _onModifyRowHeightByOverlayName(height, row, overlayType) {
     } else {
       rowspanAfterCorrection = rowspan - rowspanCorrection;
     }
-    height = Math.max(height !== null && height !== void 0 ? height : 0, _assertClassBrand(_MergeCells_brand, this, _sumCellsHeights).call(this, row, rowspanAfterCorrection));
+    height = Math.max(height !== null && height !== void 0 ? height : 0, (0, _utils.sumCellsHeights)(this.hot, row, rowspanAfterCorrection));
   });
   return height;
-}
-/**
- * Sums the heights of the all cells that the merge cell consists of.
- *
- * @param {number} row The visual row index of the merged cell.
- * @param {number} rowspan The rowspan value of the merged cell.
- * @returns {number}
- */
-function _sumCellsHeights(row, rowspan) {
-  const {
-    view,
-    rowIndexMapper
-  } = this.hot;
-  const stylesHandler = view.getStylesHandler();
-  const defaultHeight = view.getDefaultRowHeight();
-  let height = 0;
-  for (let i = row; i < row + rowspan; i++) {
-    if (!rowIndexMapper.isHidden(i)) {
-      var _this$hot$getRowHeigh;
-      height += (_this$hot$getRowHeigh = this.hot.getRowHeight(i)) !== null && _this$hot$getRowHeigh !== void 0 ? _this$hot$getRowHeigh : defaultHeight;
-      if (i === 0 && !stylesHandler.isClassicTheme()) {
-        height += 1; // border-top-width
-      }
-    }
-  }
-  return height;
 }

package/plugins/mergeCells/mergeCells.mjs

@@ -36,6 +36,7 @@ import { getStyle } from "../../helpers/dom/element.mjs";
 import { isChrome } from "../../helpers/browser.mjs";
 import { FocusOrder } from "./focusOrder.mjs";
 import { createMergeCellRenderer } from "./renderer.mjs";
+import { sumCellsHeights } from "./utils.mjs";
 Hooks.getSingleton().register('beforeMergeCells');
 Hooks.getSingleton().register('afterMergeCells');
 Hooks.getSingleton().register('beforeUnmergeCells');
@@ -662,8 +663,12 @@ export class MergeCells extends BasePlugin {
    * @param {CellRange} cellRange The cell range to merge or unmerged.
    */
   toggleMerge(cellRange) {
-    const mergedCell = this.mergedCellsCollection.get(cellRange.from.row, cellRange.from.col);
-    const mergedCellCoversWholeRange = mergedCell.row === cellRange.from.row && mergedCell.col === cellRange.from.col && mergedCell.row + mergedCell.rowspan - 1 === cellRange.to.row && mergedCell.col + mergedCell.colspan - 1 === cellRange.to.col;
+    const {
+      from,
+      to
+    } = cellRange.clone().normalize();
+    const mergedCell = this.mergedCellsCollection.get(from.row, from.col);
+    const mergedCellCoversWholeRange = mergedCell.row === from.row && mergedCell.col === from.col && mergedCell.row + mergedCell.rowspan - 1 === to.row && mergedCell.col + mergedCell.colspan - 1 === to.col;
     if (mergedCellCoversWholeRange) {
       this.unmergeRange(cellRange);
     } else {
@@ -1474,33 +1479,7 @@ function _onModifyRowHeightByOverlayName(height, row, overlayType) {
     } else {
       rowspanAfterCorrection = rowspan - rowspanCorrection;
     }
-    height = Math.max(height !== null && height !== void 0 ? height : 0, _assertClassBrand(_MergeCells_brand, this, _sumCellsHeights).call(this, row, rowspanAfterCorrection));
+    height = Math.max(height !== null && height !== void 0 ? height : 0, sumCellsHeights(this.hot, row, rowspanAfterCorrection));
   });
   return height;
-}
-/**
- * Sums the heights of the all cells that the merge cell consists of.
- *
- * @param {number} row The visual row index of the merged cell.
- * @param {number} rowspan The rowspan value of the merged cell.
- * @returns {number}
- */
-function _sumCellsHeights(row, rowspan) {
-  const {
-    view,
-    rowIndexMapper
-  } = this.hot;
-  const stylesHandler = view.getStylesHandler();
-  const defaultHeight = view.getDefaultRowHeight();
-  let height = 0;
-  for (let i = row; i < row + rowspan; i++) {
-    if (!rowIndexMapper.isHidden(i)) {
-      var _this$hot$getRowHeigh;
-      height += (_this$hot$getRowHeigh = this.hot.getRowHeight(i)) !== null && _this$hot$getRowHeigh !== void 0 ? _this$hot$getRowHeigh : defaultHeight;
-      if (i === 0 && !stylesHandler.isClassicTheme()) {
-        height += 1; // border-top-width
-      }
-    }
-  }
-  return height;
 }

package/plugins/mergeCells/renderer.js

@@ -3,6 +3,8 @@
 exports.__esModule = true;
 exports.createMergeCellRenderer = createMergeCellRenderer;
 var _object = require("../../helpers/object");
+var _browser = require("../../helpers/browser");
+var _utils = require("./utils");
 /**
  * Creates a renderer object for the `MergeCells` plugin.
  *
@@ -18,6 +20,7 @@ function createMergeCellRenderer(plugin) {
     rowIndexMapper: rowMapper,
     columnIndexMapper: columnMapper
   } = hot;
+  const updateNextCellsHeight = new Map();
 
   /**
    * Runs before the cell is rendered.
@@ -39,6 +42,10 @@ function createMergeCellRenderer(plugin) {
     if (!(0, _object.isObject)(mergedCell)) {
       TD.removeAttribute('rowspan');
       TD.removeAttribute('colspan');
+      if ((0, _browser.isSafari)() && updateNextCellsHeight.has(row) && !hot.getSettings().rowHeaders) {
+        TD.style.height = `${updateNextCellsHeight.get(row)}px`;
+        updateNextCellsHeight.delete(row);
+      }
       TD.style.display = '';
       return;
     }
@@ -50,6 +57,14 @@ function createMergeCellRenderer(plugin) {
     } = mergedCell;
     const [lastMergedRowIndex, lastMergedColumnIndex] = plugin.translateMergedCellToRenderable(origRow, origRowspan, origColumn, origColspan);
     const isVirtualRenderingEnabled = plugin.getSetting('virtualized');
+
+    // Safari bug fix - the height of the cells next to the merged cell must be defined
+    // so that their height is proportional to the height of the merged cell
+    // (this emulates default behavior in Chrome, FF etc.)
+    if ((0, _browser.isSafari)() && origColumn === 0 && !hot.getSettings().rowHeaders) {
+      const height = (0, _utils.sumCellsHeights)(hot, origRow, origRowspan);
+      updateNextCellsHeight.set(row, height / origRowspan);
+    }
     const renderedRowIndex = rowMapper.getRenderableFromVisualIndex(row);
     const renderedColumnIndex = columnMapper.getRenderableFromVisualIndex(col);
     const maxRowSpan = lastMergedRowIndex - renderedRowIndex + 1; // Number of rendered columns.