handsontable 0.0.0-next-fd66c90-20240209 → 0.0.0-next-d255844-20240209

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-fd66c90-20240209";
+  const hotVersion = "0.0.0-next-d255844-20240209";
   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-fd66c90-20240209";
+  const hotVersion = "0.0.0-next-d255844-20240209";
   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-fd66c90-20240209",
+  "version": "0.0.0-next-d255844-20240209",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/pluginHooks.d.ts

@@ -242,6 +242,7 @@ export interface Events {
   modifyColumnHeaderValue?: (headerValue: string, visualColumnIndex: number, headerLevel: number) => void | string;
   modifyColWidth?: (width: number, column: number) => void;
   modifyCopyableRange?: (copyableRanges: RangeType[]) => void;
+  modifyFiltersMultiSelectValue?: (value: string, meta: CellProperties) => void | CellValue;
   modifyFocusedElement?: (row: number, column: number, focusedElement: HTMLElement) => void | HTMLElement;
   modifyData?: (row: number, column: number, valueHolder: { value: CellValue }, ioMode: 'get' | 'set') => void;
   modifyFocusOnTabNavigation?: (tabActivationDir: 'from_above' | 'from_below', visualCoords: CellCoords) => void;

package/pluginHooks.js

@@ -1340,6 +1340,16 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  * @param {number} column Visual column index.
  */
 'modifyColWidth',
+/**
+ * Fired when rendering the list of values in the multiple-selection component of the Filters dropdown.
+ * The hook allows modifying the displayed values in that component.
+ *
+ * @since 14.2.0
+ * @event Hooks#modifyFiltersMultiSelectValue
+ * @param {object} item The item in the list of values.
+ * @param {object} meta The cell properties object.
+ */
+'modifyFiltersMultiSelectValue',
 /**
  * Fired when focusing a cell or a header element. Allows replacing the element to be focused by returning a
  * different HTML element.

package/pluginHooks.mjs

@@ -1336,6 +1336,16 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  * @param {number} column Visual column index.
  */
 'modifyColWidth',
+/**
+ * Fired when rendering the list of values in the multiple-selection component of the Filters dropdown.
+ * The hook allows modifying the displayed values in that component.
+ *
+ * @since 14.2.0
+ * @event Hooks#modifyFiltersMultiSelectValue
+ * @param {object} item The item in the list of values.
+ * @param {object} meta The cell properties object.
+ */
+'modifyFiltersMultiSelectValue',
 /**
  * Fired when focusing a cell or a header element. Allows replacing the element to be focused by returning a
  * different HTML element.

package/plugins/filters/component/value.js

@@ -13,6 +13,7 @@ var _base = require("./_base");
 var _multipleSelect = require("../ui/multipleSelect");
 var _constants2 = require("../constants");
 var _conditionRegisterer = require("../conditionRegisterer");
+var _numericRenderer = require("../../../renderers/numericRenderer");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
@@ -26,12 +27,29 @@ function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(
  * @class ValueComponent
  */
 var _onInputKeyDown = /*#__PURE__*/new WeakSet();
+var _triggerModifyMultipleSelectionValueHook = /*#__PURE__*/new WeakSet();
+var _onModifyDisplayedValue = /*#__PURE__*/new WeakSet();
 class ValueComponent extends _base.BaseComponent {
   constructor(hotInstance, options) {
     super(hotInstance, {
       id: options.id,
       stateless: false
     });
+    /**
+     * Modify the value displayed in the multiple select list.
+     *
+     * @param {*} value Cell value.
+     * @param {object} meta The cell meta object.
+     * @returns {*} Returns the modified value.
+     */
+    _classPrivateMethodInitSpec(this, _onModifyDisplayedValue);
+    /**
+     * Trigger the `modifyFiltersMultiSelectValue` hook.
+     *
+     * @param {object} item Item from the multiple select list.
+     * @param {Map} metaMap Map of row meta objects.
+     */
+    _classPrivateMethodInitSpec(this, _triggerModifyMultipleSelectionValueHook);
     /**
      * Key down listener.
      *
@@ -56,6 +74,7 @@ class ValueComponent extends _base.BaseComponent {
    */
   registerHooks() {
     this.getMultipleSelectElement().addLocalHook('keydown', event => _classPrivateMethodGet(this, _onInputKeyDown, _onInputKeyDown2).call(this, event)).addLocalHook('listTabKeydown', event => this.runLocalHooks('listTabKeydown', event));
+    this.hot.addHook('modifyFiltersMultiSelectValue', (value, meta) => _classPrivateMethodGet(this, _onModifyDisplayedValue, _onModifyDisplayedValue2).call(this, value, meta));
   }
 
   /**
@@ -113,15 +132,19 @@ class ValueComponent extends _base.BaseComponent {
       const state = {};
       const defaultBlankCellValue = this.hot.getTranslatedPhrase(C.FILTERS_VALUES_BLANK_CELLS);
       if (firstByValueCondition) {
-        const rowValues = (0, _utils.unifyColumnValues)((0, _array.arrayMap)(filteredRowsFactory(physicalColumn, conditionsStack), row => row.value));
+        const filteredRows = filteredRowsFactory(physicalColumn, conditionsStack);
+        const rowValues = (0, _array.arrayMap)(filteredRows, row => row.value);
+        const rowMetaMap = new Map(filteredRows.map(row => [row.value, this.hot.getCellMeta(row.meta.visualRow, row.meta.visualCol)]));
+        const unifiedRowValues = (0, _utils.unifyColumnValues)(rowValues);
         if (conditionArgsChange) {
           firstByValueCondition.args[0] = conditionArgsChange;
         }
         const selectedValues = [];
-        const itemsSnapshot = (0, _utils.intersectValues)(rowValues, firstByValueCondition.args[0], defaultBlankCellValue, item => {
+        const itemsSnapshot = (0, _utils.intersectValues)(unifiedRowValues, firstByValueCondition.args[0], defaultBlankCellValue, item => {
           if (item.checked) {
             selectedValues.push(item.value);
           }
+          _classPrivateMethodGet(this, _triggerModifyMultipleSelectionValueHook, _triggerModifyMultipleSelectionValueHook2).call(this, item, rowMetaMap);
         });
         const column = stateInfo.editedConditionStack.column;
         state.locale = this.hot.getCellMeta(0, column).locale;
@@ -182,8 +205,13 @@ class ValueComponent extends _base.BaseComponent {
    */
   reset() {
     const defaultBlankCellValue = this.hot.getTranslatedPhrase(C.FILTERS_VALUES_BLANK_CELLS);
-    const values = (0, _utils.unifyColumnValues)(this._getColumnVisibleValues());
-    const items = (0, _utils.intersectValues)(values, values, defaultBlankCellValue);
+    const rowEntries = this._getColumnVisibleValues();
+    const rowValues = rowEntries.map(entry => entry.value);
+    const rowMetaMap = new Map(rowEntries.map(row => [row.value, row.meta]));
+    const values = (0, _utils.unifyColumnValues)(rowValues);
+    const items = (0, _utils.intersectValues)(values, values, defaultBlankCellValue, item => {
+      _classPrivateMethodGet(this, _triggerModifyMultipleSelectionValueHook, _triggerModifyMultipleSelectionValueHook2).call(this, item, rowMetaMap);
+    });
     this.getMultipleSelectElement().setItems(items);
     super.reset();
     this.getMultipleSelectElement().setValue(values);
@@ -203,7 +231,12 @@ class ValueComponent extends _base.BaseComponent {
     if (selectedColumn === null) {
       return [];
     }
-    return (0, _array.arrayMap)(this.hot.getDataAtCol(selectedColumn.visualIndex), v => (0, _utils.toEmptyString)(v));
+    return (0, _array.arrayMap)(this.hot.getDataAtCol(selectedColumn.visualIndex), (v, rowIndex) => {
+      return {
+        value: (0, _utils.toEmptyString)(v),
+        meta: this.hot.getCellMeta(selectedColumn.visualIndex, rowIndex)
+      };
+    });
   }
 }
 exports.ValueComponent = ValueComponent;
@@ -212,4 +245,17 @@ function _onInputKeyDown2(event) {
     this.runLocalHooks('cancel');
     (0, _event.stopImmediatePropagation)(event);
   }
+}
+function _triggerModifyMultipleSelectionValueHook2(item, metaMap) {
+  if (this.hot.hasHook('modifyFiltersMultiSelectValue')) {
+    item.visualValue = this.hot.runHooks('modifyFiltersMultiSelectValue', item.visualValue, metaMap.get(item.value));
+  }
+}
+function _onModifyDisplayedValue2(value, meta) {
+  switch (meta.type) {
+    case 'numeric':
+      return (0, _numericRenderer.getRenderedValue)(value, meta);
+    default:
+      return value;
+  }
 }

package/plugins/filters/component/value.mjs

@@ -16,17 +16,35 @@ import { BaseComponent } from "./_base.mjs";
 import { MultipleSelectUI } from "../ui/multipleSelect.mjs";
 import { CONDITION_BY_VALUE, CONDITION_NONE } from "../constants.mjs";
 import { getConditionDescriptor } from "../conditionRegisterer.mjs";
+import { getRenderedValue as getRenderedNumericValue } from "../../../renderers/numericRenderer/index.mjs";
 /**
  * @private
  * @class ValueComponent
  */
 var _onInputKeyDown = /*#__PURE__*/new WeakSet();
+var _triggerModifyMultipleSelectionValueHook = /*#__PURE__*/new WeakSet();
+var _onModifyDisplayedValue = /*#__PURE__*/new WeakSet();
 export class ValueComponent extends BaseComponent {
   constructor(hotInstance, options) {
     super(hotInstance, {
       id: options.id,
       stateless: false
     });
+    /**
+     * Modify the value displayed in the multiple select list.
+     *
+     * @param {*} value Cell value.
+     * @param {object} meta The cell meta object.
+     * @returns {*} Returns the modified value.
+     */
+    _classPrivateMethodInitSpec(this, _onModifyDisplayedValue);
+    /**
+     * Trigger the `modifyFiltersMultiSelectValue` hook.
+     *
+     * @param {object} item Item from the multiple select list.
+     * @param {Map} metaMap Map of row meta objects.
+     */
+    _classPrivateMethodInitSpec(this, _triggerModifyMultipleSelectionValueHook);
     /**
      * Key down listener.
      *
@@ -51,6 +69,7 @@ export class ValueComponent extends BaseComponent {
    */
   registerHooks() {
     this.getMultipleSelectElement().addLocalHook('keydown', event => _classPrivateMethodGet(this, _onInputKeyDown, _onInputKeyDown2).call(this, event)).addLocalHook('listTabKeydown', event => this.runLocalHooks('listTabKeydown', event));
+    this.hot.addHook('modifyFiltersMultiSelectValue', (value, meta) => _classPrivateMethodGet(this, _onModifyDisplayedValue, _onModifyDisplayedValue2).call(this, value, meta));
   }
 
   /**
@@ -108,15 +127,19 @@ export class ValueComponent extends BaseComponent {
       const state = {};
       const defaultBlankCellValue = this.hot.getTranslatedPhrase(C.FILTERS_VALUES_BLANK_CELLS);
       if (firstByValueCondition) {
-        const rowValues = unifyColumnValues(arrayMap(filteredRowsFactory(physicalColumn, conditionsStack), row => row.value));
+        const filteredRows = filteredRowsFactory(physicalColumn, conditionsStack);
+        const rowValues = arrayMap(filteredRows, row => row.value);
+        const rowMetaMap = new Map(filteredRows.map(row => [row.value, this.hot.getCellMeta(row.meta.visualRow, row.meta.visualCol)]));
+        const unifiedRowValues = unifyColumnValues(rowValues);
         if (conditionArgsChange) {
           firstByValueCondition.args[0] = conditionArgsChange;
         }
         const selectedValues = [];
-        const itemsSnapshot = intersectValues(rowValues, firstByValueCondition.args[0], defaultBlankCellValue, item => {
+        const itemsSnapshot = intersectValues(unifiedRowValues, firstByValueCondition.args[0], defaultBlankCellValue, item => {
           if (item.checked) {
             selectedValues.push(item.value);
           }
+          _classPrivateMethodGet(this, _triggerModifyMultipleSelectionValueHook, _triggerModifyMultipleSelectionValueHook2).call(this, item, rowMetaMap);
         });
         const column = stateInfo.editedConditionStack.column;
         state.locale = this.hot.getCellMeta(0, column).locale;
@@ -177,8 +200,13 @@ export class ValueComponent extends BaseComponent {
    */
   reset() {
     const defaultBlankCellValue = this.hot.getTranslatedPhrase(C.FILTERS_VALUES_BLANK_CELLS);
-    const values = unifyColumnValues(this._getColumnVisibleValues());
-    const items = intersectValues(values, values, defaultBlankCellValue);
+    const rowEntries = this._getColumnVisibleValues();
+    const rowValues = rowEntries.map(entry => entry.value);
+    const rowMetaMap = new Map(rowEntries.map(row => [row.value, row.meta]));
+    const values = unifyColumnValues(rowValues);
+    const items = intersectValues(values, values, defaultBlankCellValue, item => {
+      _classPrivateMethodGet(this, _triggerModifyMultipleSelectionValueHook, _triggerModifyMultipleSelectionValueHook2).call(this, item, rowMetaMap);
+    });
     this.getMultipleSelectElement().setItems(items);
     super.reset();
     this.getMultipleSelectElement().setValue(values);
@@ -198,7 +226,12 @@ export class ValueComponent extends BaseComponent {
     if (selectedColumn === null) {
       return [];
     }
-    return arrayMap(this.hot.getDataAtCol(selectedColumn.visualIndex), v => toEmptyString(v));
+    return arrayMap(this.hot.getDataAtCol(selectedColumn.visualIndex), (v, rowIndex) => {
+      return {
+        value: toEmptyString(v),
+        meta: this.hot.getCellMeta(selectedColumn.visualIndex, rowIndex)
+      };
+    });
   }
 }
 function _onInputKeyDown2(event) {
@@ -206,4 +239,17 @@ function _onInputKeyDown2(event) {
     this.runLocalHooks('cancel');
     stopImmediatePropagation(event);
   }
+}
+function _triggerModifyMultipleSelectionValueHook2(item, metaMap) {
+  if (this.hot.hasHook('modifyFiltersMultiSelectValue')) {
+    item.visualValue = this.hot.runHooks('modifyFiltersMultiSelectValue', item.visualValue, metaMap.get(item.value));
+  }
+}
+function _onModifyDisplayedValue2(value, meta) {
+  switch (meta.type) {
+    case 'numeric':
+      return getRenderedNumericValue(value, meta);
+    default:
+      return value;
+  }
 }

package/plugins/filters/utils.js

@@ -77,7 +77,7 @@ function toEmptyString(value) {
 }
 
 /**
- * Unify column values (replace `null` and `undefined` values into empty string, unique values and sort them).
+ * Unify column values (remove duplicated values and sort them).
  *
  * @param {Array} values An array of values.
  * @returns {Array}

package/plugins/filters/utils.mjs

@@ -68,7 +68,7 @@ export function toEmptyString(value) {
 }
 
 /**
- * Unify column values (replace `null` and `undefined` values into empty string, unique values and sort them).
+ * Unify column values (remove duplicated values and sort them).
  *
  * @param {Array} values An array of values.
  * @returns {Array}

package/renderers/numericRenderer/index.js

@@ -3,4 +3,5 @@
 exports.__esModule = true;
 var _numericRenderer = require("./numericRenderer");
 exports.RENDERER_TYPE = _numericRenderer.RENDERER_TYPE;
-exports.numericRenderer = _numericRenderer.numericRenderer;
+exports.numericRenderer = _numericRenderer.numericRenderer;
+exports.getRenderedValue = _numericRenderer.getRenderedValue;

package/renderers/numericRenderer/index.mjs

@@ -1 +1 @@
-export { RENDERER_TYPE, numericRenderer } from "./numericRenderer.mjs";
+export { RENDERER_TYPE, numericRenderer, getRenderedValue } from "./numericRenderer.mjs";

package/renderers/numericRenderer/numericRenderer.js

@@ -1,6 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
+exports.getRenderedValue = getRenderedValue;
 exports.numericRenderer = numericRenderer;
 require("core-js/modules/es.array.push.js");
 var _numbro = _interopRequireDefault(require("numbro"));
@@ -9,6 +10,31 @@ var _number = require("../../helpers/number");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const RENDERER_TYPE = exports.RENDERER_TYPE = 'numeric';
 
+/**
+ * Get the rendered value.
+ *
+ * @param {*} value Value to be rendered.
+ * @param {CellMeta} cellProperties Cell meta object.
+ * @returns {*} Returns the rendered value.
+ */
+function getRenderedValue(value, cellProperties) {
+  if ((0, _number.isNumeric)(value)) {
+    const numericFormat = cellProperties.numericFormat;
+    const cellCulture = numericFormat && numericFormat.culture || '-';
+    const cellFormatPattern = numericFormat && numericFormat.pattern;
+    if (typeof cellCulture !== 'undefined' && !_numbro.default.languages()[cellCulture]) {
+      const shortTag = cellCulture.replace('-', '');
+      const langData = _numbro.default.allLanguages ? _numbro.default.allLanguages[cellCulture] : _numbro.default[shortTag];
+      if (langData) {
+        _numbro.default.registerLanguage(langData);
+      }
+    }
+    _numbro.default.setLanguage(cellCulture);
+    value = (0, _numbro.default)(value).format(cellFormatPattern || '0');
+  }
+  return value;
+}
+
 /**
  * Numeric cell renderer.
  *
@@ -24,20 +50,9 @@ const RENDERER_TYPE = exports.RENDERER_TYPE = 'numeric';
 function numericRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   let newValue = value;
   if ((0, _number.isNumeric)(newValue)) {
-    const numericFormat = cellProperties.numericFormat;
-    const cellCulture = numericFormat && numericFormat.culture || '-';
-    const cellFormatPattern = numericFormat && numericFormat.pattern;
     const className = cellProperties.className || '';
     const classArr = className.length ? className.split(' ') : [];
-    if (typeof cellCulture !== 'undefined' && !_numbro.default.languages()[cellCulture]) {
-      const shortTag = cellCulture.replace('-', '');
-      const langData = _numbro.default.allLanguages ? _numbro.default.allLanguages[cellCulture] : _numbro.default[shortTag];
-      if (langData) {
-        _numbro.default.registerLanguage(langData);
-      }
-    }
-    _numbro.default.setLanguage(cellCulture);
-    newValue = (0, _numbro.default)(newValue).format(cellFormatPattern || '0');
+    newValue = getRenderedValue(newValue, cellProperties);
     if (classArr.indexOf('htLeft') < 0 && classArr.indexOf('htCenter') < 0 && classArr.indexOf('htRight') < 0 && classArr.indexOf('htJustify') < 0) {
       classArr.push('htRight');
     }

package/renderers/numericRenderer/numericRenderer.mjs

@@ -4,6 +4,31 @@ import { textRenderer } from "../textRenderer/index.mjs";
 import { isNumeric } from "../../helpers/number.mjs";
 export const RENDERER_TYPE = 'numeric';
 
+/**
+ * Get the rendered value.
+ *
+ * @param {*} value Value to be rendered.
+ * @param {CellMeta} cellProperties Cell meta object.
+ * @returns {*} Returns the rendered value.
+ */
+export function getRenderedValue(value, cellProperties) {
+  if (isNumeric(value)) {
+    const numericFormat = cellProperties.numericFormat;
+    const cellCulture = numericFormat && numericFormat.culture || '-';
+    const cellFormatPattern = numericFormat && numericFormat.pattern;
+    if (typeof cellCulture !== 'undefined' && !numbro.languages()[cellCulture]) {
+      const shortTag = cellCulture.replace('-', '');
+      const langData = numbro.allLanguages ? numbro.allLanguages[cellCulture] : numbro[shortTag];
+      if (langData) {
+        numbro.registerLanguage(langData);
+      }
+    }
+    numbro.setLanguage(cellCulture);
+    value = numbro(value).format(cellFormatPattern || '0');
+  }
+  return value;
+}
+
 /**
  * Numeric cell renderer.
  *
@@ -19,20 +44,9 @@ export const RENDERER_TYPE = 'numeric';
 export function numericRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   let newValue = value;
   if (isNumeric(newValue)) {
-    const numericFormat = cellProperties.numericFormat;
-    const cellCulture = numericFormat && numericFormat.culture || '-';
-    const cellFormatPattern = numericFormat && numericFormat.pattern;
     const className = cellProperties.className || '';
     const classArr = className.length ? className.split(' ') : [];
-    if (typeof cellCulture !== 'undefined' && !numbro.languages()[cellCulture]) {
-      const shortTag = cellCulture.replace('-', '');
-      const langData = numbro.allLanguages ? numbro.allLanguages[cellCulture] : numbro[shortTag];
-      if (langData) {
-        numbro.registerLanguage(langData);
-      }
-    }
-    numbro.setLanguage(cellCulture);
-    newValue = numbro(newValue).format(cellFormatPattern || '0');
+    newValue = getRenderedValue(newValue, cellProperties);
     if (classArr.indexOf('htLeft') < 0 && classArr.indexOf('htCenter') < 0 && classArr.indexOf('htRight') < 0 && classArr.indexOf('htJustify') < 0) {
       classArr.push('htRight');
     }