handsontable 0.0.0-next-4e882ff-20250117 → 0.0.0-next-e2116ad-20250117

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-4e882ff-20250117";
+  const hotVersion = "0.0.0-next-e2116ad-20250117";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-4e882ff-20250117";
+  const hotVersion = "0.0.0-next-e2116ad-20250117";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-4e882ff-20250117",
+  "version": "0.0.0-next-e2116ad-20250117",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/filters/filters.js

@@ -101,8 +101,10 @@ class Filters extends _base.BasePlugin {
    */
 
   constructor(hotInstance) {
-    super(hotInstance);
+    var _this;
     // One listener for the enable/disable functionality
+    super(hotInstance);
+    _this = this;
     /**
      * `afterChange` listener.
      *
@@ -150,7 +152,12 @@ class Filters extends _base.BasePlugin {
      * @type {WeakSet<Menu>}
      */
     _classPrivateFieldInitSpec(this, _dropdownMenuTraces, new WeakSet());
-    this.hot.addHook('afterGetColHeader', (col, TH) => _assertClassBrand(_Filters_brand, this, _onAfterGetColHeader).call(this, col, TH));
+    this.hot.addHook('afterGetColHeader', function () {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      return _assertClassBrand(_Filters_brand, _this, _onAfterGetColHeader).call(_this, ...args);
+    });
   }
 
   /**
@@ -168,7 +175,7 @@ class Filters extends _base.BasePlugin {
    * Enables the plugin functionality for this Handsontable instance.
    */
   enablePlugin() {
-    var _this = this;
+    var _this2 = this;
     if (this.enabled) {
       return;
     }
@@ -231,10 +238,10 @@ class Filters extends _base.BasePlugin {
     }
     this.components.forEach(component => component.show());
     this.addHook('afterDropdownMenuDefaultOptions', function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
       }
-      return _assertClassBrand(_Filters_brand, _this, _onAfterDropdownMenuDefaultOptions).call(_this, ...args);
+      return _assertClassBrand(_Filters_brand, _this2, _onAfterDropdownMenuDefaultOptions).call(_this2, ...args);
     });
     this.addHook('beforeDropdownMenuShow', () => _assertClassBrand(_Filters_brand, this, _onBeforeDropdownMenuShow).call(this));
     this.addHook('afterDropdownMenuShow', () => _assertClassBrand(_Filters_brand, this, _onAfterDropdownMenuShow).call(this));
@@ -689,6 +696,9 @@ class Filters extends _base.BasePlugin {
    *
    * @param {number} col Visual column index.
    * @param {HTMLTableCellElement} TH Header's TH element.
+   * @param {number} headerLevel The index of header level counting from the top (positive
+   *                             values counting from 0 to N).
+   *
    */
 
   /**
@@ -724,8 +734,8 @@ class Filters extends _base.BasePlugin {
       return indexes;
     }
     const menu = this.dropdownMenuPlugin.menu;
-    for (var _len2 = arguments.length, components = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      components[_key2] = arguments[_key2];
+    for (var _len3 = arguments.length, components = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+      components[_key3] = arguments[_key3];
     }
     (0, _array.arrayEach)(components, component => {
       (0, _array.arrayEach)(menu.menuItems, (item, index) => {
@@ -752,8 +762,8 @@ class Filters extends _base.BasePlugin {
     const menu = this.dropdownMenuPlugin.menu;
     const hotMenu = menu.hotMenu;
     const hiddenRows = hotMenu.getPlugin('hiddenRows');
-    for (var _len3 = arguments.length, components = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-      components[_key3 - 1] = arguments[_key3];
+    for (var _len4 = arguments.length, components = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
+      components[_key4 - 1] = arguments[_key4];
     }
     const indexes = this.getIndexesOfComponents(...components);
     if (visible) {
@@ -771,8 +781,8 @@ class Filters extends _base.BasePlugin {
    * @param {...BaseComponent} components List of components.
    */
   hideComponents() {
-    for (var _len4 = arguments.length, components = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-      components[_key4] = arguments[_key4];
+    for (var _len5 = arguments.length, components = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+      components[_key5] = arguments[_key5];
     }
     this.changeComponentsVisibility(false, ...components);
   }
@@ -784,8 +794,8 @@ class Filters extends _base.BasePlugin {
    * @param {...BaseComponent} components List of components.
    */
   showComponents() {
-    for (var _len5 = arguments.length, components = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-      components[_key5] = arguments[_key5];
+    for (var _len6 = arguments.length, components = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
+      components[_key6] = arguments[_key6];
     }
     this.changeComponentsVisibility(true, ...components);
   }
@@ -913,9 +923,9 @@ function _onComponentChange(component, command) {
 function _onSelectUIClosed() {
   this.setListeningDropdownMenu();
 }
-function _onAfterGetColHeader(col, TH) {
+function _onAfterGetColHeader(col, TH, headerLevel) {
   const physicalColumn = this.hot.toPhysicalColumn(col);
-  if (this.enabled && this.conditionCollection.hasConditions(physicalColumn)) {
+  if (this.enabled && this.conditionCollection.hasConditions(physicalColumn) && headerLevel === this.hot.view.getColumnHeadersCount() - 1) {
     (0, _element.addClass)(TH, 'htFiltersActive');
   } else {
     (0, _element.removeClass)(TH, 'htFiltersActive');

package/plugins/filters/filters.mjs

@@ -95,8 +95,10 @@ export class Filters extends BasePlugin {
    */
 
   constructor(hotInstance) {
-    super(hotInstance);
+    var _this;
     // One listener for the enable/disable functionality
+    super(hotInstance);
+    _this = this;
     /**
      * `afterChange` listener.
      *
@@ -144,7 +146,12 @@ export class Filters extends BasePlugin {
      * @type {WeakSet<Menu>}
      */
     _classPrivateFieldInitSpec(this, _dropdownMenuTraces, new WeakSet());
-    this.hot.addHook('afterGetColHeader', (col, TH) => _assertClassBrand(_Filters_brand, this, _onAfterGetColHeader).call(this, col, TH));
+    this.hot.addHook('afterGetColHeader', function () {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      return _assertClassBrand(_Filters_brand, _this, _onAfterGetColHeader).call(_this, ...args);
+    });
   }
 
   /**
@@ -162,7 +169,7 @@ export class Filters extends BasePlugin {
    * Enables the plugin functionality for this Handsontable instance.
    */
   enablePlugin() {
-    var _this = this;
+    var _this2 = this;
     if (this.enabled) {
       return;
     }
@@ -225,10 +232,10 @@ export class Filters extends BasePlugin {
     }
     this.components.forEach(component => component.show());
     this.addHook('afterDropdownMenuDefaultOptions', function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
       }
-      return _assertClassBrand(_Filters_brand, _this, _onAfterDropdownMenuDefaultOptions).call(_this, ...args);
+      return _assertClassBrand(_Filters_brand, _this2, _onAfterDropdownMenuDefaultOptions).call(_this2, ...args);
     });
     this.addHook('beforeDropdownMenuShow', () => _assertClassBrand(_Filters_brand, this, _onBeforeDropdownMenuShow).call(this));
     this.addHook('afterDropdownMenuShow', () => _assertClassBrand(_Filters_brand, this, _onAfterDropdownMenuShow).call(this));
@@ -683,6 +690,9 @@ export class Filters extends BasePlugin {
    *
    * @param {number} col Visual column index.
    * @param {HTMLTableCellElement} TH Header's TH element.
+   * @param {number} headerLevel The index of header level counting from the top (positive
+   *                             values counting from 0 to N).
+   *
    */
 
   /**
@@ -718,8 +728,8 @@ export class Filters extends BasePlugin {
       return indexes;
     }
     const menu = this.dropdownMenuPlugin.menu;
-    for (var _len2 = arguments.length, components = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      components[_key2] = arguments[_key2];
+    for (var _len3 = arguments.length, components = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+      components[_key3] = arguments[_key3];
     }
     arrayEach(components, component => {
       arrayEach(menu.menuItems, (item, index) => {
@@ -746,8 +756,8 @@ export class Filters extends BasePlugin {
     const menu = this.dropdownMenuPlugin.menu;
     const hotMenu = menu.hotMenu;
     const hiddenRows = hotMenu.getPlugin('hiddenRows');
-    for (var _len3 = arguments.length, components = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-      components[_key3 - 1] = arguments[_key3];
+    for (var _len4 = arguments.length, components = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
+      components[_key4 - 1] = arguments[_key4];
     }
     const indexes = this.getIndexesOfComponents(...components);
     if (visible) {
@@ -765,8 +775,8 @@ export class Filters extends BasePlugin {
    * @param {...BaseComponent} components List of components.
    */
   hideComponents() {
-    for (var _len4 = arguments.length, components = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-      components[_key4] = arguments[_key4];
+    for (var _len5 = arguments.length, components = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+      components[_key5] = arguments[_key5];
     }
     this.changeComponentsVisibility(false, ...components);
   }
@@ -778,8 +788,8 @@ export class Filters extends BasePlugin {
    * @param {...BaseComponent} components List of components.
    */
   showComponents() {
-    for (var _len5 = arguments.length, components = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-      components[_key5] = arguments[_key5];
+    for (var _len6 = arguments.length, components = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
+      components[_key6] = arguments[_key6];
     }
     this.changeComponentsVisibility(true, ...components);
   }
@@ -906,9 +916,9 @@ function _onComponentChange(component, command) {
 function _onSelectUIClosed() {
   this.setListeningDropdownMenu();
 }
-function _onAfterGetColHeader(col, TH) {
+function _onAfterGetColHeader(col, TH, headerLevel) {
   const physicalColumn = this.hot.toPhysicalColumn(col);
-  if (this.enabled && this.conditionCollection.hasConditions(physicalColumn)) {
+  if (this.enabled && this.conditionCollection.hasConditions(physicalColumn) && headerLevel === this.hot.view.getColumnHeadersCount() - 1) {
     addClass(TH, 'htFiltersActive');
   } else {
     removeClass(TH, 'htFiltersActive');

package/renderers/checkboxRenderer/checkboxRenderer.js

@@ -369,7 +369,14 @@ function createInput(rootDocument) {
 function createLabel(rootDocument, text, fullWidth) {
   const label = rootDocument.createElement('label');
   label.className = `htCheckboxRendererLabel ${fullWidth ? 'fullWidth' : ''}`;
-  label.appendChild(rootDocument.createTextNode(text));
+  const textNode = rootDocument.createTextNode(text);
+  if (fullWidth) {
+    const span = rootDocument.createElement('span');
+    span.appendChild(textNode);
+    label.appendChild(span);
+  } else {
+    label.appendChild(textNode);
+  }
   return label.cloneNode(true);
 }
 

package/renderers/checkboxRenderer/checkboxRenderer.mjs

@@ -364,7 +364,14 @@ function createInput(rootDocument) {
 function createLabel(rootDocument, text, fullWidth) {
   const label = rootDocument.createElement('label');
   label.className = `htCheckboxRendererLabel ${fullWidth ? 'fullWidth' : ''}`;
-  label.appendChild(rootDocument.createTextNode(text));
+  const textNode = rootDocument.createTextNode(text);
+  if (fullWidth) {
+    const span = rootDocument.createElement('span');
+    span.appendChild(textNode);
+    label.appendChild(span);
+  } else {
+    label.appendChild(textNode);
+  }
   return label.cloneNode(true);
 }
 

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-4e882ff-20250117
- * Release date: 16/12/2024 (built at 17/01/2025 07:41:42)
+ * Version: 0.0.0-next-e2116ad-20250117
+ * Release date: 16/12/2024 (built at 17/01/2025 11:44:24)
  */
 .ht-wrapper:not([class*=ht-theme]) {
   --ht-cell-horizontal-padding: 8px;
@@ -794,6 +794,13 @@
   vertical-align: middle;
   cursor: pointer;
   appearance: none;
+  margin-top: -2px;
+}
+.handsontable .htCheckboxRendererInput:first-child {
+  margin-inline-end: var(--ht-gap-size);
+}
+.handsontable .htCheckboxRendererInput:last-child {
+  margin-inline-start: var(--ht-gap-size);
 }
 .handsontable .htCheckboxRendererInput::before {
   content: "";
@@ -871,10 +878,6 @@
   color: inherit;
   margin: 0;
 }
-.handsontable .htCheckboxRendererLabel .htCheckboxRendererInput {
-  margin-top: -2px;
-  margin-inline-end: var(--ht-gap-size);
-}
 .handsontable .htCheckboxRendererLabel.fullWidth {
   width: 100%;
 }