@economic/taco 2.58.2-EC-64962.0 → 2.58.2-EC-64961.0

package/dist/taco.d.ts

@@ -3148,27 +3148,42 @@ export declare type TableColumnClassNameHandler<TType = unknown> = string | ((ro
 
 export declare type TableColumnDataType = 'text' | 'number' | 'datetime' | 'boolean' | 'amount';
 
+export declare type TableColumnDataTypeOptions = {
+    numberFormatOptions?: Intl.NumberFormatOptions;
+};
+
+export declare type TableColumnDataTypeProps = {
+    dataType?: TableColumnDataType;
+    dataTypeOptions?: TableColumnDataTypeOptions;
+} & ({
+    dataType?: 'number' | 'amount';
+    dataTypeOptions?: Pick<TableColumnDataTypeOptions, 'numberFormatOptions'>;
+} | {
+    dataType?: Omit<TableColumnDataType, 'number' | 'amount'>;
+    dataTypeOptions?: never;
+});
+
 export declare type TableColumnFilter = ColumnFilter;
 
 export declare type TableColumnIdentifierProps<TType = unknown> = {
     [Key in keyof TType]: {
         accessor: Key;
         id?: string;
-        renderer?: TableColumnRenderer<TType, TType[Key]>;
-        aggregate?: TableColumnRendererAggregate<TType, TType[Key]>;
+        renderer?: TableColumnRenderer<TType, TType[Key]> | undefined;
+        aggregate?: TableColumnRendererAggregate<TType, TType[Key]> | undefined;
     };
 }[keyof TType] | {
     accessor?: never;
     id: string;
-    renderer?: TableColumnRenderer<TType, unknown>;
-    aggregate?: TableColumnRendererAggregate<TType, unknown>;
+    renderer?: TableColumnRenderer<TType, unknown> | undefined;
+    aggregate?: TableColumnRendererAggregate<TType, unknown> | undefined;
 };
 
 export declare type TableColumnMenu = ((columnId: string) => React.ReactNode | null)[];
 
-export declare type TableColumnProps<TType = unknown> = TableColumnIdentifierProps<TType> & {
-    control?: TableColumnRendererControl<TType>;
-    footer?: TableColumnRendererFooter<TType>;
+export declare type TableColumnProps<TType = unknown> = TableColumnIdentifierProps<TType> & TableColumnDataTypeProps & {
+    control?: TableColumnRendererControl<TType> | undefined;
+    footer?: TableColumnRendererFooter<TType> | undefined;
     header: TableColumnRendererHeader;
     /** Aggregation function to be used when the column is part of a grouped row */
     aggregationFn?: 'auto' | BuiltInAggregationFn;
@@ -3375,7 +3390,7 @@ export declare type TableRowActionRenderer<TType = unknown> = (row: TType, inter
 
 export declare type TableRowClickHandler<TType = unknown> = (row: TType) => void;
 
-export declare type TableRowDragHandler<TType = unknown> = (rows: TType[], showPlaceholder: (string: any) => void, setDataTransfer: (data: string) => void) => void;
+export declare type TableRowDragHandler<TType = unknown> = (rows: TType[], showPlaceholder: (text: string) => void, setDataTransfer: (data: string) => void) => void;
 
 export declare type TableRowDropHandler<TType = unknown> = (event: React.DragEvent, row: TType) => void;
 
@@ -4046,6 +4061,7 @@ declare module '@tanstack/table-core' {
         className?: TableColumnClassNameHandler<TData>;
         control?: TableColumnRendererControl<TData>;
         dataType?: TableColumnDataType;
+        dataTypeOptions?: TableColumnDataTypeOptions;
         defaultWidth?: number;
         enableEditing?: boolean;
         enableOrdering?: boolean;

package/dist/taco.js

@@ -33048,7 +33048,17 @@ const dataTypes = {
       TableFilterComparator.IsBetween,
       TableFilterComparator.IsEmpty,
       TableFilterComparator.IsNotEmpty
-    ]
+    ],
+    getDisplayValue: (value, options) => {
+      var _a, _b, _c;
+      if (value === void 0) {
+        return "";
+      }
+      if ((_a = options == null ? void 0 : options.dataTypeOptions) == null ? void 0 : _a.numberFormatOptions) {
+        return formatNumber(value, (_b = options == null ? void 0 : options.localization) == null ? void 0 : _b.locale, (_c = options == null ? void 0 : options.dataTypeOptions) == null ? void 0 : _c.numberFormatOptions);
+      }
+      return String(value);
+    }
   },
   datetime: {
     sortingFn: "datetime",
@@ -33088,18 +33098,28 @@ const dataTypes = {
       TableFilterComparator.IsNotEmpty
     ],
     getDisplayValue: (value, options) => {
-      var _a;
+      var _a, _b, _c, _d, _e, _f;
       if (value === void 0) {
         return "";
       }
-      const formatter = new Intl.NumberFormat((_a = options == null ? void 0 : options.localization) == null ? void 0 : _a.locale, { minimumFractionDigits: 2 });
-      const decimalSeperator = formatter.format(1.1).substring(1, 2);
-      const localisedValue = formatter.format(Number(value));
-      const localisedValueWithoutThousandsSeperator = decimalSeperator === "." ? localisedValue.replace(",", "") : localisedValue.replace(".", "");
-      return [localisedValue, localisedValueWithoutThousandsSeperator];
+      const min2 = ((_b = (_a = options == null ? void 0 : options.dataTypeOptions) == null ? void 0 : _a.numberFormatOptions) == null ? void 0 : _b.minimumFractionDigits) ?? 2;
+      const max2 = ((_d = (_c = options == null ? void 0 : options.dataTypeOptions) == null ? void 0 : _c.numberFormatOptions) == null ? void 0 : _d.maximumFractionDigits) ?? 2;
+      const numberFormatOptions = {
+        minimumFractionDigits: Math.min(min2, max2),
+        maximumFractionDigits: Math.max(max2, min2),
+        ...(_e = options == null ? void 0 : options.dataTypeOptions) == null ? void 0 : _e.numberFormatOptions
+      };
+      return formatNumber(value, (_f = options == null ? void 0 : options.localization) == null ? void 0 : _f.locale, numberFormatOptions);
     }
   }
 };
+function formatNumber(value, locale2, numberFormatOptions) {
+  const formatter = new Intl.NumberFormat(locale2, numberFormatOptions);
+  const decimalSeperator = new Intl.NumberFormat(String(locale2 ?? ""), { minimumFractionDigits: 2 }).format(1.1).substring(1, 2);
+  const localisedValue = formatter.format(Number(value));
+  const localisedValueWithoutThousandsSeperator = decimalSeperator === "." ? localisedValue.replace(",", "") : localisedValue.replace(".", "");
+  return [localisedValue, localisedValueWithoutThousandsSeperator];
+}
 function getDataTypeProperties(dataType) {
   return dataTypes[dataType ?? "text"] ?? dataTypes.text;
 }
@@ -33221,7 +33241,7 @@ function columnFilterFn(value, filter2) {
 const flattenCellValue = (cellValue) => {
   return typeof cellValue === "object" ? Object.values(cellValue).map(flattenCellValue) : cellValue;
 };
-function isMatched(searchQuery, cellValue, dataType, localization) {
+function isMatched(searchQuery, cellValue, dataType, dataTypeOptions, localization) {
   if (typeof cellValue === "object") {
     return flattenCellValue(cellValue).flat(Infinity).find((y4) => isWeakContains(y4, searchQuery));
   } else {
@@ -33231,7 +33251,7 @@ function isMatched(searchQuery, cellValue, dataType, localization) {
     } else {
       const dataTypeProperties = getDataTypeProperties(dataType);
       if (dataTypeProperties.getDisplayValue) {
-        const cellDisplayValue = dataTypeProperties.getDisplayValue(cellValue, { localization });
+        const cellDisplayValue = dataTypeProperties.getDisplayValue(cellValue, { dataTypeOptions, localization });
         if (Array.isArray(cellDisplayValue)) {
           for (const displayValue of cellDisplayValue) {
             if (isWeakContains(displayValue, searchQuery)) {
@@ -33247,12 +33267,12 @@ function isMatched(searchQuery, cellValue, dataType, localization) {
   return false;
 }
 function globalFilterFn(row, columnId, searchQuery, localization) {
-  var _a, _b;
+  var _a;
   try {
     if (row.original) {
       const cellValue = row.original[columnId];
-      const dataType = (_b = (_a = row._getAllCellsByColumnId()[columnId]) == null ? void 0 : _a.column.columnDef.meta) == null ? void 0 : _b.dataType;
-      return isMatched(searchQuery, cellValue, dataType, localization);
+      const columnMeta = (_a = row._getAllCellsByColumnId()[columnId]) == null ? void 0 : _a.column.columnDef.meta;
+      return isMatched(searchQuery, cellValue, columnMeta == null ? void 0 : columnMeta.dataType, columnMeta == null ? void 0 : columnMeta.dataTypeOptions, localization);
     }
   } catch {
   }
@@ -33267,7 +33287,7 @@ function resetHighlightedColumnIndexes(searchQuery, table, localization) {
     const rowGrouping = table.getState().grouping;
     table.getRowModel().rows.forEach((row, rowIndex) => {
       columns.forEach((column, columnIndex) => {
-        var _a;
+        var _a, _b;
         try {
           let allowSearch = true;
           if (rowGrouping == null ? void 0 : rowGrouping.length) {
@@ -33280,7 +33300,8 @@ function resetHighlightedColumnIndexes(searchQuery, table, localization) {
           if (column.getIsVisible() && column.columnDef.enableGlobalFilter && allowSearch) {
             const cellValue = get(row.original, column.id);
             const dataType = (_a = column.columnDef.meta) == null ? void 0 : _a.dataType;
-            if (isMatched(searchQuery, cellValue, dataType, localization)) {
+            const dataTypeOptions = (_b = column.columnDef.meta) == null ? void 0 : _b.dataTypeOptions;
+            if (isMatched(searchQuery, cellValue, dataType, dataTypeOptions, localization)) {
               indexes.push([rowIndex, columnIndex]);
             }
           }
@@ -33521,7 +33542,10 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
     };
     const formattedValueRenderer = (value) => {
       var _a;
-      const displayValue = (_a = dataTypeProperties.getDisplayValue) == null ? void 0 : _a.call(dataTypeProperties, value, { localization });
+      const displayValue = (_a = dataTypeProperties.getDisplayValue) == null ? void 0 : _a.call(dataTypeProperties, value, {
+        dataTypeOptions: meta.dataTypeOptions,
+        localization
+      });
       const safeValue = value !== void 0 && value !== null ? String(value) : value;
       if (Array.isArray(displayValue)) {
         return displayValue[0] ?? safeValue;