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

package/dist/taco.d.ts

@@ -3149,19 +3149,23 @@ export declare type TableColumnClassNameHandler<TType = unknown> = string | ((ro
 export declare type TableColumnDataType = 'text' | 'number' | 'datetime' | 'boolean' | 'amount';
 
 export declare type TableColumnDataTypeOptions = {
-    numberFormatOptions?: Intl.NumberFormatOptions;
+    currency?: string;
+    decimals?: number;
+    useGrouping?: boolean;
 };
 
-export declare type TableColumnDataTypeProps = {
-    dataType?: TableColumnDataType;
-    dataTypeOptions?: TableColumnDataTypeOptions;
-} & ({
-    dataType?: 'number' | 'amount';
-    dataTypeOptions?: Pick<TableColumnDataTypeOptions, 'numberFormatOptions'>;
+export declare type TableColumnDataTypeOptionsHandler<TType = unknown, TOptions = TableColumnDataTypeOptions> = TOptions | ((row: TType) => TOptions);
+
+export declare type TableColumnDataTypeProps<TType = unknown> = {
+    dataType?: 'number';
+    dataTypeOptions?: TableColumnDataTypeOptionsHandler<TType, Pick<TableColumnDataTypeOptions, 'currency' | 'decimals' | 'useGrouping'>>;
+} | {
+    dataType?: 'amount';
+    dataTypeOptions?: TableColumnDataTypeOptionsHandler<TType, Pick<TableColumnDataTypeOptions, 'currency'>>;
 } | {
     dataType?: Omit<TableColumnDataType, 'number' | 'amount'>;
     dataTypeOptions?: never;
-});
+};
 
 export declare type TableColumnFilter = ColumnFilter;
 
@@ -3181,7 +3185,7 @@ export declare type TableColumnIdentifierProps<TType = unknown> = {
 
 export declare type TableColumnMenu = ((columnId: string) => React.ReactNode | null)[];
 
-export declare type TableColumnProps<TType = unknown> = TableColumnIdentifierProps<TType> & TableColumnDataTypeProps & {
+export declare type TableColumnProps<TType = unknown> = TableColumnIdentifierProps<TType> & TableColumnDataTypeProps<TType> & {
     control?: TableColumnRendererControl<TType> | undefined;
     footer?: TableColumnRendererFooter<TType> | undefined;
     header: TableColumnRendererHeader;

package/dist/taco.js

@@ -33036,30 +33036,6 @@ const dataTypes = {
       TableFilterComparator.IsNotEmpty
     ]
   },
-  number: {
-    sortingFn: "basic",
-    filterComparators: [
-      TableFilterComparator.IsEqualTo,
-      TableFilterComparator.IsNotEqualTo,
-      TableFilterComparator.IsGreaterThan,
-      TableFilterComparator.IsLessThan,
-      TableFilterComparator.IsGreaterThanOrEqualTo,
-      TableFilterComparator.IsLessThanOrEqualTo,
-      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",
     filterComparators: [
@@ -33073,7 +33049,7 @@ const dataTypes = {
       TableFilterComparator.IsEmpty,
       TableFilterComparator.IsNotEmpty
     ],
-    getDisplayValue: (value, options) => {
+    getDisplayValue: (value, _1, options) => {
       var _a;
       return format$1(value, (_a = options == null ? void 0 : options.localization) == null ? void 0 : _a.formatting.date) ?? "";
     }
@@ -33082,9 +33058,13 @@ const dataTypes = {
     sortingFn: "basic",
     filterComparators: [TableFilterComparator.IsEqualTo, TableFilterComparator.IsNotEqualTo]
   },
-  // advanced
-  amount: {
-    align: "right",
+  // numbers
+  number: createNumberDataType("left"),
+  amount: createNumberDataType("right", { decimals: 2, useGrouping: true })
+};
+function createNumberDataType(align, defaultOptions2) {
+  return {
+    align,
     sortingFn: "basic",
     filterComparators: [
       TableFilterComparator.IsEqualTo,
@@ -33097,28 +33077,37 @@ const dataTypes = {
       TableFilterComparator.IsEmpty,
       TableFilterComparator.IsNotEmpty
     ],
-    getDisplayValue: (value, options) => {
-      var _a, _b, _c, _d, _e, _f;
+    getDisplayValue: (value, row, options) => {
+      var _a, _b;
       if (value === void 0) {
         return "";
       }
-      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 dataTypeOptions = typeof (options == null ? void 0 : options.dataTypeOptions) === "function" ? options == null ? void 0 : options.dataTypeOptions(row) : options == null ? void 0 : options.dataTypeOptions;
       const numberFormatOptions = {
-        minimumFractionDigits: Math.min(min2, max2),
-        maximumFractionDigits: Math.max(max2, min2),
-        ...(_e = options == null ? void 0 : options.dataTypeOptions) == null ? void 0 : _e.numberFormatOptions
+        // format
+        useGrouping: (dataTypeOptions == null ? void 0 : dataTypeOptions.useGrouping) ?? (defaultOptions2 == null ? void 0 : defaultOptions2.useGrouping) ?? false,
+        // decimals
+        minimumFractionDigits: (dataTypeOptions == null ? void 0 : dataTypeOptions.decimals) ?? (defaultOptions2 == null ? void 0 : defaultOptions2.decimals),
+        maximumFractionDigits: (dataTypeOptions == null ? void 0 : dataTypeOptions.decimals) ?? (defaultOptions2 == null ? void 0 : defaultOptions2.decimals)
       };
-      return formatNumber(value, (_f = options == null ? void 0 : options.localization) == null ? void 0 : _f.locale, numberFormatOptions);
+      if (dataTypeOptions == null ? void 0 : dataTypeOptions.currency) {
+        numberFormatOptions.style = "currency";
+        numberFormatOptions.currency = dataTypeOptions.currency;
+        numberFormatOptions.currencyDisplay = "code";
+      }
+      const localisedValue = new Intl.NumberFormat((_a = options == null ? void 0 : options.localization) == null ? void 0 : _a.locale, numberFormatOptions).format(
+        Number(value)
+      );
+      if (!numberFormatOptions.useGrouping) {
+        return localisedValue;
+      }
+      const localisedValueWithoutThousandsSeperator = new Intl.NumberFormat((_b = options == null ? void 0 : options.localization) == null ? void 0 : _b.locale, {
+        ...numberFormatOptions,
+        useGrouping: false
+      }).format(Number(value));
+      return [localisedValue, localisedValueWithoutThousandsSeperator];
     }
-  }
-};
-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;
@@ -33241,7 +33230,7 @@ function columnFilterFn(value, filter2) {
 const flattenCellValue = (cellValue) => {
   return typeof cellValue === "object" ? Object.values(cellValue).map(flattenCellValue) : cellValue;
 };
-function isMatched(searchQuery, cellValue, dataType, dataTypeOptions, localization) {
+function isMatched(searchQuery, cellValue, rowValue, dataType, dataTypeOptions, localization) {
   if (typeof cellValue === "object") {
     return flattenCellValue(cellValue).flat(Infinity).find((y4) => isWeakContains(y4, searchQuery));
   } else {
@@ -33251,7 +33240,10 @@ function isMatched(searchQuery, cellValue, dataType, dataTypeOptions, localizati
     } else {
       const dataTypeProperties = getDataTypeProperties(dataType);
       if (dataTypeProperties.getDisplayValue) {
-        const cellDisplayValue = dataTypeProperties.getDisplayValue(cellValue, { dataTypeOptions, localization });
+        const cellDisplayValue = dataTypeProperties.getDisplayValue(cellValue, rowValue, {
+          dataTypeOptions,
+          localization
+        });
         if (Array.isArray(cellDisplayValue)) {
           for (const displayValue of cellDisplayValue) {
             if (isWeakContains(displayValue, searchQuery)) {
@@ -33272,7 +33264,14 @@ function globalFilterFn(row, columnId, searchQuery, localization) {
     if (row.original) {
       const cellValue = row.original[columnId];
       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);
+      return isMatched(
+        searchQuery,
+        cellValue,
+        row.original,
+        columnMeta == null ? void 0 : columnMeta.dataType,
+        columnMeta == null ? void 0 : columnMeta.dataTypeOptions,
+        localization
+      );
     }
   } catch {
   }
@@ -33301,7 +33300,7 @@ function resetHighlightedColumnIndexes(searchQuery, table, localization) {
             const cellValue = get(row.original, column.id);
             const dataType = (_a = column.columnDef.meta) == null ? void 0 : _a.dataType;
             const dataTypeOptions = (_b = column.columnDef.meta) == null ? void 0 : _b.dataTypeOptions;
-            if (isMatched(searchQuery, cellValue, dataType, dataTypeOptions, localization)) {
+            if (isMatched(searchQuery, cellValue, row.original, dataType, dataTypeOptions, localization)) {
               indexes.push([rowIndex, columnIndex]);
             }
           }
@@ -33540,9 +33539,9 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
         header
       }
     };
-    const formattedValueRenderer = (value) => {
+    const formattedValueRenderer = (value, row) => {
       var _a;
-      const displayValue = (_a = dataTypeProperties.getDisplayValue) == null ? void 0 : _a.call(dataTypeProperties, value, {
+      const displayValue = (_a = dataTypeProperties.getDisplayValue) == null ? void 0 : _a.call(dataTypeProperties, value, row, {
         dataTypeOptions: meta.dataTypeOptions,
         localization
       });
@@ -33553,14 +33552,14 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
       return displayValue ?? safeValue;
     };
     const rendererArgs = (info) => ({
-      formattedValue: formattedValueRenderer(info.getValue()),
+      formattedValue: formattedValueRenderer(info.getValue(), info.row.original),
       row: info.row.original,
       value: info.getValue()
     });
     if (typeof renderer2 === "function") {
       column.cell = (info) => renderer2(rendererArgs(info));
     } else {
-      column.cell = (info) => formattedValueRenderer(info.getValue());
+      column.cell = (info) => formattedValueRenderer(info.getValue(), info.row.original);
     }
     if (typeof footer === "function") {
       column.footer = (info) => footer(info.table.getRowModel().rows.flatMap((row) => row.original !== void 0 ? row.original : []));