handsontable 0.0.0-next-802f59c-20241024 → 0.0.0-next-627918e-20241025

package/plugins/manualColumnMove/manualColumnMove.js

@@ -339,11 +339,13 @@ class ManualColumnMove extends _base.BasePlugin {
     const columnMapper = this.hot.columnIndexMapper;
     let columnsWidth = 0;
     for (let visualColumnIndex = fromColumn; visualColumnIndex <= toColumn; visualColumnIndex += 1) {
+      // We can't use just `getColWidth` (even without indexes translation) as it doesn't return proper values
+      // when column is stretched.
       const renderableIndex = columnMapper.getRenderableFromVisualIndex(visualColumnIndex);
       if (visualColumnIndex < 0) {
         columnsWidth += this.hot.view._wt.wtViewport.getRowHeaderWidth() || 0;
       } else if (renderableIndex !== null) {
-        columnsWidth += this.hot.view._wt.wtTable.getColumnWidth(renderableIndex) || 0;
+        columnsWidth += this.hot.view._wt.wtTable.getStretchedColumnWidth(renderableIndex) || 0;
       }
     }
     return columnsWidth;

package/plugins/manualColumnMove/manualColumnMove.mjs

@@ -335,11 +335,13 @@ export class ManualColumnMove extends BasePlugin {
     const columnMapper = this.hot.columnIndexMapper;
     let columnsWidth = 0;
     for (let visualColumnIndex = fromColumn; visualColumnIndex <= toColumn; visualColumnIndex += 1) {
+      // We can't use just `getColWidth` (even without indexes translation) as it doesn't return proper values
+      // when column is stretched.
       const renderableIndex = columnMapper.getRenderableFromVisualIndex(visualColumnIndex);
       if (visualColumnIndex < 0) {
         columnsWidth += this.hot.view._wt.wtViewport.getRowHeaderWidth() || 0;
       } else if (renderableIndex !== null) {
-        columnsWidth += this.hot.view._wt.wtTable.getColumnWidth(renderableIndex) || 0;
+        columnsWidth += this.hot.view._wt.wtTable.getStretchedColumnWidth(renderableIndex) || 0;
       }
     }
     return columnsWidth;

package/plugins/manualColumnResize/manualColumnResize.js

@@ -162,31 +162,15 @@ class ManualColumnResize extends _base.BasePlugin {
    * Enables the plugin functionality for this Handsontable instance.
    */
   enablePlugin() {
-    var _this = this;
     if (this.enabled) {
       return;
     }
     _classPrivateFieldSet(_columnWidthsMap, this, new _translations.PhysicalIndexToValueMap());
     _classPrivateFieldGet(_columnWidthsMap, this).addLocalHook('init', () => _assertClassBrand(_ManualColumnResize_brand, this, _onMapInit).call(this));
     this.hot.columnIndexMapper.registerMap(this.pluginName, _classPrivateFieldGet(_columnWidthsMap, this));
-    this.addHook('modifyColWidth', function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      return _assertClassBrand(_ManualColumnResize_brand, _this, _onModifyColWidth).call(_this, ...args);
-    }, 1);
-    this.addHook('beforeStretchingColumnWidth', function () {
-      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        args[_key2] = arguments[_key2];
-      }
-      return _assertClassBrand(_ManualColumnResize_brand, _this, _onBeforeStretchingColumnWidth).call(_this, ...args);
-    }, 1);
-    this.addHook('beforeColumnResize', function () {
-      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-        args[_key3] = arguments[_key3];
-      }
-      return _assertClassBrand(_ManualColumnResize_brand, _this, _onBeforeColumnResize).call(_this, ...args);
-    });
+    this.addHook('modifyColWidth', (width, col) => _assertClassBrand(_ManualColumnResize_brand, this, _onModifyColWidth).call(this, width, col), 1);
+    this.addHook('beforeStretchingColumnWidth', (stretchedWidth, column) => _assertClassBrand(_ManualColumnResize_brand, this, _onBeforeStretchingColumnWidth).call(this, stretchedWidth, column));
+    this.addHook('beforeColumnResize', (newSize, column, isDoubleClick) => _assertClassBrand(_ManualColumnResize_brand, this, _onBeforeColumnResize).call(this, newSize, column, isDoubleClick));
     this.bindEvents();
     super.enablePlugin();
   }
@@ -424,7 +408,11 @@ class ManualColumnResize extends _base.BasePlugin {
       if (hookNewSize !== undefined) {
         _classPrivateFieldSet(_newSize, this, hookNewSize);
       }
-      this.setManualSize(column, _classPrivateFieldGet(_newSize, this)); // double click sets by auto row size plugin
+      if (this.hot.getSettings().stretchH === 'all') {
+        this.clearManualSize(column);
+      } else {
+        this.setManualSize(column, _classPrivateFieldGet(_newSize, this)); // double click sets by auto row size plugin
+      }
       this.saveManualColumnWidths();
       this.hot.runHooks('afterColumnResize', _classPrivateFieldGet(_newSize, this), column, true);
       if (forceRender) {
@@ -642,11 +630,11 @@ function _onModifyColWidth(width, column) {
  * @returns {number}
  */
 function _onBeforeStretchingColumnWidth(stretchedWidth, column) {
-  const width = _classPrivateFieldGet(_columnWidthsMap, this).getValueAtIndex(this.hot.toPhysicalColumn(column));
-  if (typeof width === 'number') {
-    return width;
+  let width = _classPrivateFieldGet(_columnWidthsMap, this).getValueAtIndex(column);
+  if (width === null) {
+    width = stretchedWidth;
   }
-  return stretchedWidth;
+  return width;
 }
 /**
  * `beforeColumnResize` hook callback.

package/plugins/manualColumnResize/manualColumnResize.mjs

@@ -157,31 +157,15 @@ export class ManualColumnResize extends BasePlugin {
    * Enables the plugin functionality for this Handsontable instance.
    */
   enablePlugin() {
-    var _this = this;
     if (this.enabled) {
       return;
     }
     _classPrivateFieldSet(_columnWidthsMap, this, new IndexToValueMap());
     _classPrivateFieldGet(_columnWidthsMap, this).addLocalHook('init', () => _assertClassBrand(_ManualColumnResize_brand, this, _onMapInit).call(this));
     this.hot.columnIndexMapper.registerMap(this.pluginName, _classPrivateFieldGet(_columnWidthsMap, this));
-    this.addHook('modifyColWidth', function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      return _assertClassBrand(_ManualColumnResize_brand, _this, _onModifyColWidth).call(_this, ...args);
-    }, 1);
-    this.addHook('beforeStretchingColumnWidth', function () {
-      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        args[_key2] = arguments[_key2];
-      }
-      return _assertClassBrand(_ManualColumnResize_brand, _this, _onBeforeStretchingColumnWidth).call(_this, ...args);
-    }, 1);
-    this.addHook('beforeColumnResize', function () {
-      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-        args[_key3] = arguments[_key3];
-      }
-      return _assertClassBrand(_ManualColumnResize_brand, _this, _onBeforeColumnResize).call(_this, ...args);
-    });
+    this.addHook('modifyColWidth', (width, col) => _assertClassBrand(_ManualColumnResize_brand, this, _onModifyColWidth).call(this, width, col), 1);
+    this.addHook('beforeStretchingColumnWidth', (stretchedWidth, column) => _assertClassBrand(_ManualColumnResize_brand, this, _onBeforeStretchingColumnWidth).call(this, stretchedWidth, column));
+    this.addHook('beforeColumnResize', (newSize, column, isDoubleClick) => _assertClassBrand(_ManualColumnResize_brand, this, _onBeforeColumnResize).call(this, newSize, column, isDoubleClick));
     this.bindEvents();
     super.enablePlugin();
   }
@@ -419,7 +403,11 @@ export class ManualColumnResize extends BasePlugin {
       if (hookNewSize !== undefined) {
         _classPrivateFieldSet(_newSize, this, hookNewSize);
       }
-      this.setManualSize(column, _classPrivateFieldGet(_newSize, this)); // double click sets by auto row size plugin
+      if (this.hot.getSettings().stretchH === 'all') {
+        this.clearManualSize(column);
+      } else {
+        this.setManualSize(column, _classPrivateFieldGet(_newSize, this)); // double click sets by auto row size plugin
+      }
       this.saveManualColumnWidths();
       this.hot.runHooks('afterColumnResize', _classPrivateFieldGet(_newSize, this), column, true);
       if (forceRender) {
@@ -636,11 +624,11 @@ function _onModifyColWidth(width, column) {
  * @returns {number}
  */
 function _onBeforeStretchingColumnWidth(stretchedWidth, column) {
-  const width = _classPrivateFieldGet(_columnWidthsMap, this).getValueAtIndex(this.hot.toPhysicalColumn(column));
-  if (typeof width === 'number') {
-    return width;
+  let width = _classPrivateFieldGet(_columnWidthsMap, this).getValueAtIndex(column);
+  if (width === null) {
+    width = stretchedWidth;
   }
-  return stretchedWidth;
+  return width;
 }
 /**
  * `beforeColumnResize` hook callback.

package/plugins/manualRowMove/manualRowMove.js

@@ -317,7 +317,7 @@ class ManualRowMove extends _base.BasePlugin {
     for (let visualRowIndex = fromRow; visualRowIndex <= toRow; visualRowIndex++) {
       const renderableIndex = rowMapper.getRenderableFromVisualIndex(visualRowIndex);
       if (renderableIndex !== null) {
-        rowsHeight += this.hot.view._wt.wtTable.getRowHeight(renderableIndex) || 23;
+        rowsHeight += this.hot.view._wt.wtTable.getRowHeight(renderableIndex) || this.hot.view.getDefaultRowHeight();
       }
     }
     return rowsHeight;

package/plugins/manualRowMove/manualRowMove.mjs

@@ -313,7 +313,7 @@ export class ManualRowMove extends BasePlugin {
     for (let visualRowIndex = fromRow; visualRowIndex <= toRow; visualRowIndex++) {
       const renderableIndex = rowMapper.getRenderableFromVisualIndex(visualRowIndex);
       if (renderableIndex !== null) {
-        rowsHeight += this.hot.view._wt.wtTable.getRowHeight(renderableIndex) || 23;
+        rowsHeight += this.hot.view._wt.wtTable.getRowHeight(renderableIndex) || this.hot.view.getDefaultRowHeight();
       }
     }
     return rowsHeight;

package/plugins/manualRowResize/manualRowResize.js

@@ -8,7 +8,6 @@ var _element = require("../../helpers/dom/element");
 var _array = require("../../helpers/array");
 var _number = require("../../helpers/number");
 var _translations = require("../../translations");
-var _src = require("../../3rdparty/walkontable/src");
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
@@ -227,7 +226,7 @@ class ManualRowResize extends _base.BasePlugin {
    */
   setManualSize(row, height) {
     const physicalRow = this.hot.toPhysicalRow(row);
-    const newHeight = Math.max(height, _src.DEFAULT_ROW_HEIGHT);
+    const newHeight = Math.max(height, this.hot.view.getDefaultRowHeight());
     _classPrivateFieldGet(_rowHeightsMap, this).setValueAtIndex(physicalRow, newHeight);
     return newHeight;
   }

package/plugins/manualRowResize/manualRowResize.mjs

@@ -10,8 +10,7 @@ import { BasePlugin } from "../base/index.mjs";
 import { addClass, closest, hasClass, removeClass, outerWidth, isDetached } from "../../helpers/dom/element.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
-import { PhysicalIndexToValueMap as IndexToValueMap } from "../../translations/index.mjs";
-import { DEFAULT_ROW_HEIGHT } from "../../3rdparty/walkontable/src/index.mjs"; // Developer note! Whenever you make a change in this file, make an analogous change in manualColumnResize.js
+import { PhysicalIndexToValueMap as IndexToValueMap } from "../../translations/index.mjs"; // Developer note! Whenever you make a change in this file, make an analogous change in manualColumnResize.js
 export const PLUGIN_KEY = 'manualRowResize';
 export const PLUGIN_PRIORITY = 30;
 const PERSISTENT_STATE_KEY = 'manualRowHeights';
@@ -222,7 +221,7 @@ export class ManualRowResize extends BasePlugin {
    */
   setManualSize(row, height) {
     const physicalRow = this.hot.toPhysicalRow(row);
-    const newHeight = Math.max(height, DEFAULT_ROW_HEIGHT);
+    const newHeight = Math.max(height, this.hot.view.getDefaultRowHeight());
     _classPrivateFieldGet(_rowHeightsMap, this).setValueAtIndex(physicalRow, newHeight);
     return newHeight;
   }

package/plugins/mergeCells/mergeCells.js

@@ -1491,7 +1491,7 @@ function _onModifyRowHeightByOverlayName(height, row, overlayType) {
  * @returns {number}
  */
 function _sumCellsHeights(row, rowspan) {
-  const defaultHeight = this.hot.view._wt.wtSettings.getSettingPure('defaultRowHeight');
+  const defaultHeight = this.hot.view.getDefaultRowHeight();
   const autoRowSizePlugin = this.hot.getPlugin('autoRowSize');
   let height = 0;
   for (let i = row; i < row + rowspan; i++) {

package/plugins/mergeCells/mergeCells.mjs

@@ -1486,7 +1486,7 @@ function _onModifyRowHeightByOverlayName(height, row, overlayType) {
  * @returns {number}
  */
 function _sumCellsHeights(row, rowspan) {
-  const defaultHeight = this.hot.view._wt.wtSettings.getSettingPure('defaultRowHeight');
+  const defaultHeight = this.hot.view.getDefaultRowHeight();
   const autoRowSizePlugin = this.hot.getPlugin('autoRowSize');
   let height = 0;
   for (let i = row; i < row + rowspan; i++) {

package/plugins/nestedRows/ui/headers.js

@@ -125,7 +125,9 @@ class HeadersUI extends _base.default {
     if (!deepestLevelIndex) {
       deepestLevelIndex = this.dataManager.cache.levelCount;
     }
-    this.rowHeaderWidthCache = Math.max(50, 11 + 10 * deepestLevelIndex + 25);
+    const verticalPadding = this.hot.view.getCSSVariableValue('cell-horizontal-padding');
+    const completeVerticalPadding = this.hot.view.isUsingClassicTheme() ? 11 : verticalPadding * 2;
+    this.rowHeaderWidthCache = Math.max(50, completeVerticalPadding + 10 * deepestLevelIndex + 25);
     this.hot.render();
   }
 }

package/plugins/nestedRows/ui/headers.mjs

@@ -121,7 +121,9 @@ class HeadersUI extends BaseUI {
     if (!deepestLevelIndex) {
       deepestLevelIndex = this.dataManager.cache.levelCount;
     }
-    this.rowHeaderWidthCache = Math.max(50, 11 + 10 * deepestLevelIndex + 25);
+    const verticalPadding = this.hot.view.getCSSVariableValue('cell-horizontal-padding');
+    const completeVerticalPadding = this.hot.view.isUsingClassicTheme() ? 11 : verticalPadding * 2;
+    this.rowHeaderWidthCache = Math.max(50, completeVerticalPadding + 10 * deepestLevelIndex + 25);
     this.hot.render();
   }
 }

package/settings.d.ts

@@ -214,6 +214,7 @@ export interface GridSettings extends Events {
   strict?: boolean;
   tableClassName?: string | string[];
   tabMoves?: CellCoords | SimpleCellCoords | ((event: KeyboardEvent) => CellCoords | SimpleCellCoords);
+  themeName?: string;
   title?: string;
   trimDropdown?: boolean;
   trimRows?: TrimRowsSettings;