handsontable 0.0.0-next-a2cc849-20240208 → 0.0.0-next-d255844-20240209

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/plugins/mergeCells/mergeCells.js

@@ -1031,10 +1031,8 @@ function _onAfterIsMultipleSelection2(isMultiple) {
   if (isMultiple) {
     const mergedCells = this.mergedCellsCollection.mergedCells;
     const selectionRange = this.hot.getSelectedRangeLast();
-    const topStartCoords = selectionRange.getTopStartCorner();
-    const bottomEndCoords = selectionRange.getBottomEndCorner();
     for (let group = 0; group < mergedCells.length; group += 1) {
-      if (topStartCoords.row === mergedCells[group].row && topStartCoords.col === mergedCells[group].col && bottomEndCoords.row === mergedCells[group].row + mergedCells[group].rowspan - 1 && bottomEndCoords.col === mergedCells[group].col + mergedCells[group].colspan - 1) {
+      if (selectionRange.from.row === mergedCells[group].row && selectionRange.from.col === mergedCells[group].col && selectionRange.to.row === mergedCells[group].row + mergedCells[group].rowspan - 1 && selectionRange.to.col === mergedCells[group].col + mergedCells[group].colspan - 1) {
         return false;
       }
     }

package/plugins/mergeCells/mergeCells.mjs

@@ -1026,10 +1026,8 @@ function _onAfterIsMultipleSelection2(isMultiple) {
   if (isMultiple) {
     const mergedCells = this.mergedCellsCollection.mergedCells;
     const selectionRange = this.hot.getSelectedRangeLast();
-    const topStartCoords = selectionRange.getTopStartCorner();
-    const bottomEndCoords = selectionRange.getBottomEndCorner();
     for (let group = 0; group < mergedCells.length; group += 1) {
-      if (topStartCoords.row === mergedCells[group].row && topStartCoords.col === mergedCells[group].col && bottomEndCoords.row === mergedCells[group].row + mergedCells[group].rowspan - 1 && bottomEndCoords.col === mergedCells[group].col + mergedCells[group].colspan - 1) {
+      if (selectionRange.from.row === mergedCells[group].row && selectionRange.from.col === mergedCells[group].col && selectionRange.to.row === mergedCells[group].row + mergedCells[group].rowspan - 1 && selectionRange.to.col === mergedCells[group].col + mergedCells[group].colspan - 1) {
         return false;
       }
     }

package/plugins/multiColumnSorting/multiColumnSorting.js

@@ -9,7 +9,6 @@ var _element = require("../../helpers/dom/element");
 var _rootComparator = require("./rootComparator");
 var _utils2 = require("./utils");
 var _domHelpers = require("./domHelpers");
-var _shortcutContexts = require("../../shortcutContexts");
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -131,17 +130,12 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
         if (highlight.row === -1 && highlight.col >= 0) {
           this.sort(this.getNextSortConfig(highlight.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
         }
-
-        // prevent default Enter behavior (move to the next row within a selection range)
-        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
-      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
-      position: 'before',
       group: SHORTCUTS_GROUP
     });
   }

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -9,7 +9,6 @@ import { addClass, removeClass } from "../../helpers/dom/element.mjs";
 import { rootComparator } from "./rootComparator.mjs";
 import { warnAboutPluginsConflict } from "./utils.mjs";
 import { getClassesToAdd, getClassesToRemove } from "./domHelpers.mjs";
-import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 export const PLUGIN_KEY = 'multiColumnSorting';
 export const PLUGIN_PRIORITY = 170;
 const CONFLICTED_PLUGIN_KEY = 'columnSorting';
@@ -128,17 +127,12 @@ export class MultiColumnSorting extends ColumnSorting {
         if (highlight.row === -1 && highlight.col >= 0) {
           this.sort(this.getNextSortConfig(highlight.col, APPEND_COLUMN_CONFIG_STRATEGY));
         }
-
-        // prevent default Enter behavior (move to the next row within a selection range)
-        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
-      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
-      position: 'before',
       group: SHORTCUTS_GROUP
     });
   }

package/plugins/nestedHeaders/nestedHeaders.js

@@ -364,7 +364,6 @@ class NestedHeaders extends _base.BasePlugin {
       return _classPrivateMethodGet(_this, _onModifyTransformStart, _onModifyTransformStart2).call(_this, ...args);
     });
     this.addHook('afterSelection', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
-    this.addHook('afterSelectionFocusSet', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
     this.addHook('beforeViewportScrollHorizontally', function () {
       for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
         args[_key8] = arguments[_key8];

package/plugins/nestedHeaders/nestedHeaders.mjs

@@ -360,7 +360,6 @@ export class NestedHeaders extends BasePlugin {
       return _classPrivateMethodGet(_this, _onModifyTransformStart, _onModifyTransformStart2).call(_this, ...args);
     });
     this.addHook('afterSelection', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
-    this.addHook('afterSelectionFocusSet', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
     this.addHook('beforeViewportScrollHorizontally', function () {
       for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
         args[_key8] = arguments[_key8];

package/plugins/nestedRows/nestedRows.js

@@ -11,7 +11,6 @@ var _contextMenu = _interopRequireDefault(require("./ui/contextMenu"));
 var _console = require("../../helpers/console");
 var _data = require("../../helpers/data");
 var _translations = require("../../translations");
-var _shortcutContexts = require("../../shortcutContexts");
 var _rowMoveController = _interopRequireDefault(require("./utils/rowMoveController"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
@@ -401,18 +400,13 @@ class NestedRows extends _base.BasePlugin {
             this.collapsingUI.collapseChildren(row);
           }
         }
-
-        // prevent default Enter behavior (move to the next row within a selection range)
-        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
-      group: SHORTCUTS_GROUP,
-      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
-      position: 'before'
+      group: SHORTCUTS_GROUP
     });
   }
 

package/plugins/nestedRows/nestedRows.mjs

@@ -20,7 +20,6 @@ import ContextMenuUI from "./ui/contextMenu.mjs";
 import { error } from "../../helpers/console.mjs";
 import { isArrayOfObjects } from "../../helpers/data.mjs";
 import { TrimmingMap } from "../../translations/index.mjs";
-import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 import RowMoveController from "./utils/rowMoveController.mjs";
 export const PLUGIN_KEY = 'nestedRows';
 export const PLUGIN_PRIORITY = 300;
@@ -397,18 +396,13 @@ export class NestedRows extends BasePlugin {
             this.collapsingUI.collapseChildren(row);
           }
         }
-
-        // prevent default Enter behavior (move to the next row within a selection range)
-        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
-      group: SHORTCUTS_GROUP,
-      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
-      position: 'before'
+      group: SHORTCUTS_GROUP
     });
   }
 

package/renderers/checkboxRenderer/checkboxRenderer.js

@@ -139,9 +139,7 @@ function checkboxRenderer(hotInstance, TD, row, col, prop, value, cellProperties
     const shortcutManager = hotInstance.getShortcutManager();
     const gridContext = shortcutManager.getContext('grid');
     const config = {
-      group: SHORTCUTS_GROUP,
-      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
-      position: 'before'
+      group: SHORTCUTS_GROUP
     };
     gridContext.addShortcuts([{
       keys: [['space']],
@@ -161,7 +159,9 @@ function checkboxRenderer(hotInstance, TD, row, col, prop, value, cellProperties
       callback: () => {
         changeSelectedCheckboxesState(true);
         return !areSelectedCheckboxCells(); // False blocks next action associated with the keyboard shortcut.
-      }
+      },
+      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+      position: 'before'
     }], config);
   }
 

package/renderers/checkboxRenderer/checkboxRenderer.mjs

@@ -134,9 +134,7 @@ export function checkboxRenderer(hotInstance, TD, row, col, prop, value, cellPro
     const shortcutManager = hotInstance.getShortcutManager();
     const gridContext = shortcutManager.getContext('grid');
     const config = {
-      group: SHORTCUTS_GROUP,
-      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
-      position: 'before'
+      group: SHORTCUTS_GROUP
     };
     gridContext.addShortcuts([{
       keys: [['space']],
@@ -156,7 +154,9 @@ export function checkboxRenderer(hotInstance, TD, row, col, prop, value, cellPro
       callback: () => {
         changeSelectedCheckboxesState(true);
         return !areSelectedCheckboxCells(); // False blocks next action associated with the keyboard shortcut.
-      }
+      },
+      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
+      position: 'before'
     }], config);
   }
 

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');
     }