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

package/plugins/mergeCells/renderer.mjs

@@ -1,4 +1,6 @@
 import { isObject } from "../../helpers/object.mjs";
+import { isSafari } from "../../helpers/browser.mjs";
+import { sumCellsHeights } from "./utils.mjs";
 /**
  * Creates a renderer object for the `MergeCells` plugin.
  *
@@ -14,6 +16,7 @@ export function createMergeCellRenderer(plugin) {
     rowIndexMapper: rowMapper,
     columnIndexMapper: columnMapper
   } = hot;
+  const updateNextCellsHeight = new Map();
 
   /**
    * Runs before the cell is rendered.
@@ -35,6 +38,10 @@ export function createMergeCellRenderer(plugin) {
     if (!isObject(mergedCell)) {
       TD.removeAttribute('rowspan');
       TD.removeAttribute('colspan');
+      if (isSafari() && updateNextCellsHeight.has(row) && !hot.getSettings().rowHeaders) {
+        TD.style.height = `${updateNextCellsHeight.get(row)}px`;
+        updateNextCellsHeight.delete(row);
+      }
       TD.style.display = '';
       return;
     }
@@ -46,6 +53,14 @@ export 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 (isSafari() && origColumn === 0 && !hot.getSettings().rowHeaders) {
+      const height = 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.

package/plugins/mergeCells/utils.js

@@ -0,0 +1,31 @@
+"use strict";
+
+exports.__esModule = true;
+exports.sumCellsHeights = sumCellsHeights;
+/**
+ * Calculates the total height of the merged cell.
+ *
+ * @param {Core} hotInstance The Handsontable instance.
+ * @param {*} row The merged cell's row index.
+ * @param {*} rowspan The merged cell height.
+ * @returns {number}
+ */
+function sumCellsHeights(hotInstance, row, rowspan) {
+  const {
+    view,
+    rowIndexMapper
+  } = hotInstance;
+  const stylesHandler = view.getStylesHandler();
+  const defaultHeight = view.getDefaultRowHeight();
+  let height = 0;
+  for (let i = row; i < row + rowspan; i++) {
+    if (!rowIndexMapper.isHidden(i)) {
+      var _hotInstance$getRowHe;
+      height += (_hotInstance$getRowHe = hotInstance.getRowHeight(i)) !== null && _hotInstance$getRowHe !== void 0 ? _hotInstance$getRowHe : defaultHeight;
+      if (i === 0 && !stylesHandler.isClassicTheme()) {
+        height += 1; // border-top-width
+      }
+    }
+  }
+  return height;
+}

package/plugins/mergeCells/utils.mjs

@@ -0,0 +1,27 @@
+/**
+ * Calculates the total height of the merged cell.
+ *
+ * @param {Core} hotInstance The Handsontable instance.
+ * @param {*} row The merged cell's row index.
+ * @param {*} rowspan The merged cell height.
+ * @returns {number}
+ */
+export function sumCellsHeights(hotInstance, row, rowspan) {
+  const {
+    view,
+    rowIndexMapper
+  } = hotInstance;
+  const stylesHandler = view.getStylesHandler();
+  const defaultHeight = view.getDefaultRowHeight();
+  let height = 0;
+  for (let i = row; i < row + rowspan; i++) {
+    if (!rowIndexMapper.isHidden(i)) {
+      var _hotInstance$getRowHe;
+      height += (_hotInstance$getRowHe = hotInstance.getRowHeight(i)) !== null && _hotInstance$getRowHe !== void 0 ? _hotInstance$getRowHe : defaultHeight;
+      if (i === 0 && !stylesHandler.isClassicTheme()) {
+        height += 1; // border-top-width
+      }
+    }
+  }
+  return height;
+}

package/plugins/nestedRows/data/dataManager.js

@@ -627,7 +627,7 @@ class DataManager {
    */
   syncRowWithRawSource(rowElement) {
     let upmostParent = rowElement;
-    let tempParent = null;
+    let tempParent = upmostParent;
     do {
       tempParent = this.getRowParent(tempParent);
       if (tempParent !== null) {
@@ -635,7 +635,7 @@ class DataManager {
       }
     } while (tempParent !== null);
     this.plugin.disableCoreAPIModifiers();
-    this.hot.setSourceDataAtCell(this.getRowIndex(upmostParent), '__children', upmostParent.__children, 'NestedRows.syncRowWithRawSource');
+    this.hot.setSourceDataAtCell(this.getRowIndexWithinParent(upmostParent), '__children', upmostParent.__children, 'NestedRows.syncRowWithRawSource');
     this.plugin.enableCoreAPIModifiers();
   }
 

package/plugins/nestedRows/data/dataManager.mjs

@@ -624,7 +624,7 @@ class DataManager {
    */
   syncRowWithRawSource(rowElement) {
     let upmostParent = rowElement;
-    let tempParent = null;
+    let tempParent = upmostParent;
     do {
       tempParent = this.getRowParent(tempParent);
       if (tempParent !== null) {
@@ -632,7 +632,7 @@ class DataManager {
       }
     } while (tempParent !== null);
     this.plugin.disableCoreAPIModifiers();
-    this.hot.setSourceDataAtCell(this.getRowIndex(upmostParent), '__children', upmostParent.__children, 'NestedRows.syncRowWithRawSource');
+    this.hot.setSourceDataAtCell(this.getRowIndexWithinParent(upmostParent), '__children', upmostParent.__children, 'NestedRows.syncRowWithRawSource');
     this.plugin.enableCoreAPIModifiers();
   }
 

package/plugins/undoRedo/actions/removeColumn.js

@@ -37,7 +37,7 @@ class RemoveColumnAction extends _base.BaseAction {
      */
     _defineProperty(this, "index", void 0);
     /**
-     * @param {number[]} indexes The visual column indexes.
+     * @param {number[]} indexes The physical column indexes.
      */
     _defineProperty(this, "indexes", void 0);
     /**
@@ -103,16 +103,14 @@ class RemoveColumnAction extends _base.BaseAction {
             headers.push(hot.getSettings().colHeaders[hot.toPhysicalColumn(columnIndex + i)] || null);
           });
         }
-        const columnsMap = hot.columnIndexMapper.getIndexesSequence();
-        const rowsMap = hot.rowIndexMapper.getIndexesSequence();
         return new RemoveColumnAction({
           index: columnIndex,
           indexes,
           data: removedData,
           amount,
           headers,
-          columnPositions: columnsMap,
-          rowPositions: rowsMap,
+          columnPositions: hot.columnIndexMapper.getIndexesSequence(),
+          rowPositions: hot.rowIndexMapper.getIndexesSequence(),
           fixedColumnsStart: hot.getSettings().fixedColumnsStart,
           removedCellMetas: (0, _utils.getCellMetas)(hot, 0, hot.countRows(), columnIndex, lastColumnIndex)
         });
@@ -139,14 +137,27 @@ class RemoveColumnAction extends _base.BaseAction {
     }
     const sortedHeaders = (0, _array.arrayMap)(this.headers, sortByIndexes);
     const changes = [];
-    hot.alter('insert_col_start', this.indexes[0], this.indexes.length, 'UndoRedo.undo');
+
+    // The indexes sequence have to be applied twice.
+    //  * First for proper index translation. The alter method accepts a visual index
+    //    and we are able to retrieve the correct index indicating where to add a new row based
+    //    only on the previous order state of the columns;
+    //  * The alter method shifts the indexes (a side-effect), so we need to reapply the indexes sequence
+    //    the same as it was in the previous state;
+    hot.columnIndexMapper.setIndexesSequence(this.columnPositions);
+    hot.alter('insert_col_start', hot.toVisualColumn(this.indexes[0]), this.indexes.length, 'UndoRedo.undo');
+    hot.batchExecution(() => {
+      // Restore row sequence in a case when all columns are removed. the original
+      // row sequence is lost in that case.
+      hot.rowIndexMapper.setIndexesSequence(this.rowPositions);
+      hot.columnIndexMapper.setIndexesSequence(this.columnPositions);
+    }, true);
     (0, _array.arrayEach)(hot.getSourceDataArray(), (rowData, rowIndex) => {
       (0, _array.arrayEach)(ascendingIndexes, (changedIndex, contiquesIndex) => {
         rowData[changedIndex] = sortedData[rowIndex][contiquesIndex];
         changes.push([rowIndex, changedIndex, rowData[changedIndex]]);
       });
     });
-    hot.setSourceDataAtCell(changes, undefined, undefined, 'UndoRedo.undo');
     if (typeof this.headers !== 'undefined') {
       (0, _array.arrayEach)(sortedHeaders, (headerData, columnIndex) => {
         hot.getSettings().colHeaders[ascendingIndexes[columnIndex]] = headerData;
@@ -156,14 +167,8 @@ class RemoveColumnAction extends _base.BaseAction {
       let [rowIndex, columnIndex, cellMeta] = _ref2;
       hot.setCellMetaObject(rowIndex, columnIndex, cellMeta);
     });
-    hot.batchExecution(() => {
-      // Restore row sequence in a case when all columns are removed. the original
-      // row sequence is lost in that case.
-      hot.rowIndexMapper.setIndexesSequence(this.rowPositions);
-      hot.columnIndexMapper.setIndexesSequence(this.columnPositions);
-    }, true);
     hot.addHookOnce('afterViewRender', undoneCallback);
-    hot.render();
+    hot.setSourceDataAtCell(changes, null, null, 'UndoRedo.undo');
   }
 
   /**

package/plugins/undoRedo/actions/removeColumn.mjs

@@ -34,7 +34,7 @@ export class RemoveColumnAction extends BaseAction {
      */
     _defineProperty(this, "index", void 0);
     /**
-     * @param {number[]} indexes The visual column indexes.
+     * @param {number[]} indexes The physical column indexes.
      */
     _defineProperty(this, "indexes", void 0);
     /**
@@ -100,16 +100,14 @@ export class RemoveColumnAction extends BaseAction {
             headers.push(hot.getSettings().colHeaders[hot.toPhysicalColumn(columnIndex + i)] || null);
           });
         }
-        const columnsMap = hot.columnIndexMapper.getIndexesSequence();
-        const rowsMap = hot.rowIndexMapper.getIndexesSequence();
         return new RemoveColumnAction({
           index: columnIndex,
           indexes,
           data: removedData,
           amount,
           headers,
-          columnPositions: columnsMap,
-          rowPositions: rowsMap,
+          columnPositions: hot.columnIndexMapper.getIndexesSequence(),
+          rowPositions: hot.rowIndexMapper.getIndexesSequence(),
           fixedColumnsStart: hot.getSettings().fixedColumnsStart,
           removedCellMetas: getCellMetas(hot, 0, hot.countRows(), columnIndex, lastColumnIndex)
         });
@@ -136,14 +134,27 @@ export class RemoveColumnAction extends BaseAction {
     }
     const sortedHeaders = arrayMap(this.headers, sortByIndexes);
     const changes = [];
-    hot.alter('insert_col_start', this.indexes[0], this.indexes.length, 'UndoRedo.undo');
+
+    // The indexes sequence have to be applied twice.
+    //  * First for proper index translation. The alter method accepts a visual index
+    //    and we are able to retrieve the correct index indicating where to add a new row based
+    //    only on the previous order state of the columns;
+    //  * The alter method shifts the indexes (a side-effect), so we need to reapply the indexes sequence
+    //    the same as it was in the previous state;
+    hot.columnIndexMapper.setIndexesSequence(this.columnPositions);
+    hot.alter('insert_col_start', hot.toVisualColumn(this.indexes[0]), this.indexes.length, 'UndoRedo.undo');
+    hot.batchExecution(() => {
+      // Restore row sequence in a case when all columns are removed. the original
+      // row sequence is lost in that case.
+      hot.rowIndexMapper.setIndexesSequence(this.rowPositions);
+      hot.columnIndexMapper.setIndexesSequence(this.columnPositions);
+    }, true);
     arrayEach(hot.getSourceDataArray(), (rowData, rowIndex) => {
       arrayEach(ascendingIndexes, (changedIndex, contiquesIndex) => {
         rowData[changedIndex] = sortedData[rowIndex][contiquesIndex];
         changes.push([rowIndex, changedIndex, rowData[changedIndex]]);
       });
     });
-    hot.setSourceDataAtCell(changes, undefined, undefined, 'UndoRedo.undo');
     if (typeof this.headers !== 'undefined') {
       arrayEach(sortedHeaders, (headerData, columnIndex) => {
         hot.getSettings().colHeaders[ascendingIndexes[columnIndex]] = headerData;
@@ -153,14 +164,8 @@ export class RemoveColumnAction extends BaseAction {
       let [rowIndex, columnIndex, cellMeta] = _ref2;
       hot.setCellMetaObject(rowIndex, columnIndex, cellMeta);
     });
-    hot.batchExecution(() => {
-      // Restore row sequence in a case when all columns are removed. the original
-      // row sequence is lost in that case.
-      hot.rowIndexMapper.setIndexesSequence(this.rowPositions);
-      hot.columnIndexMapper.setIndexesSequence(this.columnPositions);
-    }, true);
     hot.addHookOnce('afterViewRender', undoneCallback);
-    hot.render();
+    hot.setSourceDataAtCell(changes, null, null, 'UndoRedo.undo');
   }
 
   /**

package/plugins/undoRedo/actions/removeRow.js

@@ -29,7 +29,7 @@ class RemoveRowAction extends _base.BaseAction {
     } = _ref;
     super('remove_row');
     /**
-     * @param {number} index The visual row index.
+     * @param {number} index The physical row index.
      */
     _defineProperty(this, "index", void 0);
     /**
@@ -97,14 +97,22 @@ class RemoveRowAction extends _base.BaseAction {
         changes.push([this.index + rowIndexDelta, isNaN(columnIndex) ? columnProp : columnIndex, dataRow[columnProp]]);
       });
     });
-    hot.alter('insert_row_above', this.index, this.data.length, 'UndoRedo.undo');
+
+    // The indexes sequence have to be applied twice.
+    //  * First for proper index translation. The alter method accepts a visual index
+    //    and we are able to retrieve the correct index indicating where to add a new row based
+    //    only on the previous order state of the rows;
+    //  * The alter method shifts the indexes (a side-effect), so we need to reapply the indexes sequence
+    //    the same as it was in the previous state;
+    hot.rowIndexMapper.setIndexesSequence(this.rowIndexesSequence);
+    hot.alter('insert_row_above', hot.toVisualRow(this.index), this.data.length, 'UndoRedo.undo');
+    hot.rowIndexMapper.setIndexesSequence(this.rowIndexesSequence);
     this.removedCellMetas.forEach(_ref2 => {
       let [rowIndex, columnIndex, cellMeta] = _ref2;
       hot.setCellMetaObject(rowIndex, columnIndex, cellMeta);
     });
     hot.addHookOnce('afterViewRender', undoneCallback);
     hot.setSourceDataAtCell(changes, null, null, 'UndoRedo.undo');
-    hot.rowIndexMapper.setIndexesSequence(this.rowIndexesSequence);
   }
 
   /**
@@ -113,7 +121,7 @@ class RemoveRowAction extends _base.BaseAction {
    */
   redo(hot, redoneCallback) {
     hot.addHookOnce('afterRemoveRow', redoneCallback);
-    hot.alter('remove_row', this.index, this.data.length, 'UndoRedo.redo');
+    hot.alter('remove_row', hot.toVisualRow(this.index), this.data.length, 'UndoRedo.redo');
   }
 }
 exports.RemoveRowAction = RemoveRowAction;

package/plugins/undoRedo/actions/removeRow.mjs

@@ -26,7 +26,7 @@ export class RemoveRowAction extends BaseAction {
     } = _ref;
     super('remove_row');
     /**
-     * @param {number} index The visual row index.
+     * @param {number} index The physical row index.
      */
     _defineProperty(this, "index", void 0);
     /**
@@ -94,14 +94,22 @@ export class RemoveRowAction extends BaseAction {
         changes.push([this.index + rowIndexDelta, isNaN(columnIndex) ? columnProp : columnIndex, dataRow[columnProp]]);
       });
     });
-    hot.alter('insert_row_above', this.index, this.data.length, 'UndoRedo.undo');
+
+    // The indexes sequence have to be applied twice.
+    //  * First for proper index translation. The alter method accepts a visual index
+    //    and we are able to retrieve the correct index indicating where to add a new row based
+    //    only on the previous order state of the rows;
+    //  * The alter method shifts the indexes (a side-effect), so we need to reapply the indexes sequence
+    //    the same as it was in the previous state;
+    hot.rowIndexMapper.setIndexesSequence(this.rowIndexesSequence);
+    hot.alter('insert_row_above', hot.toVisualRow(this.index), this.data.length, 'UndoRedo.undo');
+    hot.rowIndexMapper.setIndexesSequence(this.rowIndexesSequence);
     this.removedCellMetas.forEach(_ref2 => {
       let [rowIndex, columnIndex, cellMeta] = _ref2;
       hot.setCellMetaObject(rowIndex, columnIndex, cellMeta);
     });
     hot.addHookOnce('afterViewRender', undoneCallback);
     hot.setSourceDataAtCell(changes, null, null, 'UndoRedo.undo');
-    hot.rowIndexMapper.setIndexesSequence(this.rowIndexesSequence);
   }
 
   /**
@@ -110,6 +118,6 @@ export class RemoveRowAction extends BaseAction {
    */
   redo(hot, redoneCallback) {
     hot.addHookOnce('afterRemoveRow', redoneCallback);
-    hot.alter('remove_row', this.index, this.data.length, 'UndoRedo.redo');
+    hot.alter('remove_row', hot.toVisualRow(this.index), this.data.length, 'UndoRedo.redo');
   }
 }

package/selection/selection.js

@@ -1192,7 +1192,9 @@ class Selection {
       col: (0, _number.clamp)(to.col, 0, countColumns - 1)
     });
     this.selectedRange.ranges.push(range);
-    this.highlight.getFocus().add(highlight).commit().syncWith(range);
+    if (this.highlight.isEnabledFor(_highlight.FOCUS_TYPE, this.selectedRange.current().highlight)) {
+      this.highlight.getFocus().add(highlight).commit().syncWith(range);
+    }
     this.applyAndCommit(range);
   }
 

package/selection/selection.mjs

@@ -1186,7 +1186,9 @@ class Selection {
       col: clamp(to.col, 0, countColumns - 1)
     });
     this.selectedRange.ranges.push(range);
-    this.highlight.getFocus().add(highlight).commit().syncWith(range);
+    if (this.highlight.isEnabledFor(FOCUS_TYPE, this.selectedRange.current().highlight)) {
+      this.highlight.getFocus().add(highlight).commit().syncWith(range);
+    }
     this.applyAndCommit(range);
   }
 

package/styles/handsontable.css

@@ -25,8 +25,8 @@
  * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM
  * USE OR INABILITY TO USE THIS SOFTWARE.
  *
- * Version: 0.0.0-next-ff10728-20250410
- * Release date: 20/02/2025 (built at 10/04/2025 06:43:56)
+ * Version: 0.0.0-next-9410a76-20250416
+ * Release date: 19/03/2025 (built at 16/04/2025 06:18:15)
  */
 .ht-wrapper:not([class*=ht-theme]) {
   --ht-gap-size: 4px;
@@ -85,14 +85,16 @@
 .handsontable.htGhostTable table thead th {
   border-bottom-width: 0;
 }
-.handsontable.htGhostTable table tbody tr td,
-.handsontable.htGhostTable table tbody tr th {
+.handsontable.htGhostTable table tbody tr th,
+.handsontable.htGhostTable table tbody tr td {
   border-top-width: 0;
-}
-.handsontable.htGhostTable table tbody tr:first-of-type th,
-.handsontable.htGhostTable table tbody tr:first-of-type td {
   height: calc(var(--ht-cell-vertical-padding) * 2 + var(--ht-line-height) + 1px);
 }
+.handsontable.htGhostTable table.htGhostTableFirstRow tbody tr th,
+.handsontable.htGhostTable table.htGhostTableFirstRow tbody tr td {
+  border-top-width: 1px;
+  height: calc(var(--ht-cell-vertical-padding) * 2 + var(--ht-line-height) + 2px);
+}
 .handsontable.htHasScrollX .ht_master .wtHolder, .handsontable.htHasScrollY .ht_master .wtHolder {
   background-color: var(--ht-background-color);
   border-radius: var(--ht-wrapper-border-radius, 0);
@@ -1785,9 +1787,6 @@
 .handsontable.htDropdownMenu table tbody tr td .htUIButton input, .handsontable.htContextMenu table tbody tr td .htUIButton input, .handsontable.htFiltersConditionsMenu table tbody tr td .htUIButton input {
   width: 100%;
 }
-.handsontable.htContextMenuSub_Alignment, .handsontable.htDropdownMenuSub_Alignment {
-  margin-top: calc(var(--ht-menu-vertical-padding) * -1);
-}
 .handsontable .htUIClearAll a,
 .handsontable .htUISelectAll a {
   padding: var(--ht-gap-size);
@@ -1909,7 +1908,7 @@
   outline: 1px solid var(--ht-link-hover-color);
 }
 .handsontable .htUIMultipleSelect .ht_master .wtHolder {
-  overflow-y: auto;
+  overflow: auto;
 }
 .handsontable .htUIMultipleSelect .ht_master .wtHolder .wtHider,
 .handsontable .htUIMultipleSelect .ht_master .wtHolder .htCore,
@@ -1962,20 +1961,20 @@
   background-color: var(--ht-comments-textarea-focus-background-color, #ffffff);
 }
 
-.handsontable .columnSorting {
+.handsontable .columnSorting:not(.indicatorDisabled) {
   position: relative;
 }
-.handsontable .columnSorting.sortAction {
+.handsontable .columnSorting:not(.indicatorDisabled).sortAction {
   padding-inline-start: calc(var(--ht-icon-size, 16px) + 2px);
   padding-inline-end: calc(var(--ht-icon-size, 16px) + 2px);
   min-width: calc(var(--ht-icon-size, 16px) + 8px);
   max-width: calc(100% - var(--ht-icon-size, 16px) * 2 - 4px);
 }
-.handsontable .columnSorting.sortAction:hover {
+.handsontable .columnSorting:not(.indicatorDisabled).sortAction:hover {
   text-decoration: none;
   cursor: pointer;
 }
-.handsontable .columnSorting.sortAction::before {
+.handsontable .columnSorting:not(.indicatorDisabled).sortAction::before {
   content: "";
   display: block;
   width: var(--ht-icon-size, 16px);