@economic/taco 2.58.2-EC-64961.5 → 2.58.2-EC-64961.7

package/dist/taco.d.ts

@@ -3228,7 +3228,7 @@ export declare type TableColumnRendererArgs<TType, TValue> = {
     value: TValue;
 };
 
-export declare type TableColumnRendererControl<TType = unknown> = ((props: TableColumnRendererControlProps, row?: TType, filterState?: TableFilter[]) => JSX.Element) | 'datepicker' | 'input' | 'switch' | 'checkbox' | 'textarea';
+export declare type TableColumnRendererControl<TType = unknown> = ((props: TableColumnRendererControlProps, row?: TType, filterState?: TableFilter[]) => JSX.Element | null) | 'datepicker' | 'input' | 'switch' | 'checkbox' | 'textarea';
 
 export declare type TableColumnRendererControlProps = {
     className?: string;

package/dist/taco.js

@@ -32301,6 +32301,163 @@ function useReactTable(options) {
   }));
   return tableRef.current;
 }
+var TableFilterComparator = /* @__PURE__ */ ((TableFilterComparator2) => {
+  TableFilterComparator2[TableFilterComparator2["Contains"] = 0] = "Contains";
+  TableFilterComparator2[TableFilterComparator2["DoesNotContain"] = 1] = "DoesNotContain";
+  TableFilterComparator2[TableFilterComparator2["IsEqualTo"] = 2] = "IsEqualTo";
+  TableFilterComparator2[TableFilterComparator2["IsNotEqualTo"] = 3] = "IsNotEqualTo";
+  TableFilterComparator2[TableFilterComparator2["IsGreaterThan"] = 4] = "IsGreaterThan";
+  TableFilterComparator2[TableFilterComparator2["IsLessThan"] = 5] = "IsLessThan";
+  TableFilterComparator2[TableFilterComparator2["IsBetween"] = 6] = "IsBetween";
+  TableFilterComparator2[TableFilterComparator2["IsEmpty"] = 7] = "IsEmpty";
+  TableFilterComparator2[TableFilterComparator2["IsNotEmpty"] = 8] = "IsNotEmpty";
+  TableFilterComparator2[TableFilterComparator2["IsLessThanOrEqualTo"] = 9] = "IsLessThanOrEqualTo";
+  TableFilterComparator2[TableFilterComparator2["IsGreaterThanOrEqualTo"] = 10] = "IsGreaterThanOrEqualTo";
+  TableFilterComparator2[TableFilterComparator2["HasAnyOf"] = 11] = "HasAnyOf";
+  TableFilterComparator2[TableFilterComparator2["HasAllOf"] = 12] = "HasAllOf";
+  TableFilterComparator2[TableFilterComparator2["HasNoneOf"] = 13] = "HasNoneOf";
+  TableFilterComparator2[TableFilterComparator2["IsOneOf"] = 14] = "IsOneOf";
+  TableFilterComparator2[TableFilterComparator2["IsNoneOf"] = 15] = "IsNoneOf";
+  return TableFilterComparator2;
+})(TableFilterComparator || {});
+const dataTypes = {
+  auto: {
+    sortingFn: "auto",
+    filterComparators: [
+      TableFilterComparator.Contains,
+      TableFilterComparator.DoesNotContain,
+      TableFilterComparator.IsEqualTo,
+      TableFilterComparator.IsNotEqualTo,
+      TableFilterComparator.IsEmpty,
+      TableFilterComparator.IsNotEmpty
+    ]
+  },
+  // base
+  text: {
+    sortingFn: "alphanumeric",
+    filterComparators: [
+      TableFilterComparator.Contains,
+      TableFilterComparator.DoesNotContain,
+      TableFilterComparator.IsEqualTo,
+      TableFilterComparator.IsNotEqualTo,
+      TableFilterComparator.IsEmpty,
+      TableFilterComparator.IsNotEmpty
+    ]
+  },
+  boolean: {
+    sortingFn: "basic",
+    filterComparators: [TableFilterComparator.IsEqualTo, TableFilterComparator.IsNotEqualTo]
+  },
+  // dates
+  date: createDatetimeDataType({
+    day: "2-digit",
+    month: "2-digit",
+    year: "2-digit"
+  }),
+  time: createDatetimeDataType({
+    hour: "2-digit",
+    minute: "2-digit"
+  }),
+  datetime: createDatetimeDataType({
+    day: "2-digit",
+    month: "2-digit",
+    year: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit"
+  }),
+  // numbers
+  number: createNumberDataType("left"),
+  amount: createNumberDataType("right", { decimals: 2, useGrouping: true }),
+  percentage: createNumberDataType("right", { useGrouping: true, percent: true })
+};
+function createDatetimeDataType(defaultOptions2) {
+  return {
+    sortingFn: "datetime",
+    filterComparators: [
+      TableFilterComparator.IsEqualTo,
+      TableFilterComparator.IsNotEqualTo,
+      TableFilterComparator.IsGreaterThan,
+      TableFilterComparator.IsLessThan,
+      TableFilterComparator.IsGreaterThanOrEqualTo,
+      TableFilterComparator.IsLessThanOrEqualTo,
+      TableFilterComparator.IsBetween,
+      TableFilterComparator.IsEmpty,
+      TableFilterComparator.IsNotEmpty
+    ],
+    getDisplayValue: (value, row, options) => {
+      var _a;
+      if (value === void 0) {
+        return "";
+      }
+      return new Intl.DateTimeFormat((_a = options == null ? void 0 : options.localization) == null ? void 0 : _a.locale, defaultOptions2).format(
+        typeof value === "string" ? Date.parse(value) : value
+      );
+    }
+  };
+}
+function createNumberDataType(align, defaultOptions2) {
+  return {
+    align,
+    sortingFn: "basic",
+    filterComparators: [
+      TableFilterComparator.IsEqualTo,
+      TableFilterComparator.IsNotEqualTo,
+      TableFilterComparator.IsGreaterThan,
+      TableFilterComparator.IsLessThan,
+      TableFilterComparator.IsGreaterThanOrEqualTo,
+      TableFilterComparator.IsLessThanOrEqualTo,
+      TableFilterComparator.IsBetween,
+      TableFilterComparator.IsEmpty,
+      TableFilterComparator.IsNotEmpty
+    ],
+    getDisplayValue: (value, row, options) => {
+      var _a, _b;
+      if (value === void 0) {
+        return "";
+      }
+      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 = {
+        // 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)
+      };
+      if (defaultOptions2 == null ? void 0 : defaultOptions2.percent) {
+        numberFormatOptions.style = "percent";
+      } else if (dataTypeOptions == null ? void 0 : dataTypeOptions.currency) {
+        numberFormatOptions.style = "currency";
+        numberFormatOptions.currency = dataTypeOptions.currency;
+        numberFormatOptions.currencyDisplay = "code";
+      }
+      let 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;
+      }
+      let localisedValueWithoutThousandsSeperator = new Intl.NumberFormat((_b = options == null ? void 0 : options.localization) == null ? void 0 : _b.locale, {
+        ...numberFormatOptions,
+        useGrouping: false
+      }).format(Number(value));
+      if (numberFormatOptions.style === "percent" || numberFormatOptions.style === "currency") {
+        localisedValue = localisedValue.replace(/\u00A0/g, " ");
+        localisedValueWithoutThousandsSeperator = localisedValueWithoutThousandsSeperator.replace(/\u00A0/g, " ");
+      }
+      return [localisedValue, localisedValueWithoutThousandsSeperator];
+    }
+  };
+}
+function getDataTypeProperties(dataType) {
+  return dataTypes[dataType ?? "text"] ?? dataTypes.text;
+}
+function getSortingFn(dataType, customFnOrBuiltIn) {
+  if (typeof customFnOrBuiltIn === "function") {
+    return (rowA, rowB, columnId) => customFnOrBuiltIn(rowA.original, rowB.original, columnId);
+  }
+  if (customFnOrBuiltIn) {
+    return customFnOrBuiltIn;
+  }
+  return getDataTypeProperties(dataType).sortingFn;
+}
 var isArray_1;
 var hasRequiredIsArray;
 function requireIsArray() {
@@ -32993,161 +33150,6 @@ function requireGet() {
 }
 var getExports = requireGet();
 const get = /* @__PURE__ */ getDefaultExportFromCjs(getExports);
-var TableFilterComparator = /* @__PURE__ */ ((TableFilterComparator2) => {
-  TableFilterComparator2[TableFilterComparator2["Contains"] = 0] = "Contains";
-  TableFilterComparator2[TableFilterComparator2["DoesNotContain"] = 1] = "DoesNotContain";
-  TableFilterComparator2[TableFilterComparator2["IsEqualTo"] = 2] = "IsEqualTo";
-  TableFilterComparator2[TableFilterComparator2["IsNotEqualTo"] = 3] = "IsNotEqualTo";
-  TableFilterComparator2[TableFilterComparator2["IsGreaterThan"] = 4] = "IsGreaterThan";
-  TableFilterComparator2[TableFilterComparator2["IsLessThan"] = 5] = "IsLessThan";
-  TableFilterComparator2[TableFilterComparator2["IsBetween"] = 6] = "IsBetween";
-  TableFilterComparator2[TableFilterComparator2["IsEmpty"] = 7] = "IsEmpty";
-  TableFilterComparator2[TableFilterComparator2["IsNotEmpty"] = 8] = "IsNotEmpty";
-  TableFilterComparator2[TableFilterComparator2["IsLessThanOrEqualTo"] = 9] = "IsLessThanOrEqualTo";
-  TableFilterComparator2[TableFilterComparator2["IsGreaterThanOrEqualTo"] = 10] = "IsGreaterThanOrEqualTo";
-  TableFilterComparator2[TableFilterComparator2["HasAnyOf"] = 11] = "HasAnyOf";
-  TableFilterComparator2[TableFilterComparator2["HasAllOf"] = 12] = "HasAllOf";
-  TableFilterComparator2[TableFilterComparator2["HasNoneOf"] = 13] = "HasNoneOf";
-  TableFilterComparator2[TableFilterComparator2["IsOneOf"] = 14] = "IsOneOf";
-  TableFilterComparator2[TableFilterComparator2["IsNoneOf"] = 15] = "IsNoneOf";
-  return TableFilterComparator2;
-})(TableFilterComparator || {});
-const dataTypes = {
-  auto: {
-    sortingFn: "auto",
-    filterComparators: [
-      TableFilterComparator.Contains,
-      TableFilterComparator.DoesNotContain,
-      TableFilterComparator.IsEqualTo,
-      TableFilterComparator.IsNotEqualTo,
-      TableFilterComparator.IsEmpty,
-      TableFilterComparator.IsNotEmpty
-    ]
-  },
-  // base
-  text: {
-    sortingFn: "alphanumeric",
-    filterComparators: [
-      TableFilterComparator.Contains,
-      TableFilterComparator.DoesNotContain,
-      TableFilterComparator.IsEqualTo,
-      TableFilterComparator.IsNotEqualTo,
-      TableFilterComparator.IsEmpty,
-      TableFilterComparator.IsNotEmpty
-    ]
-  },
-  boolean: {
-    sortingFn: "basic",
-    filterComparators: [TableFilterComparator.IsEqualTo, TableFilterComparator.IsNotEqualTo]
-  },
-  // dates
-  date: createDatetimeDataType({
-    day: "2-digit",
-    month: "2-digit",
-    year: "2-digit"
-  }),
-  time: createDatetimeDataType({
-    hour: "2-digit",
-    minute: "2-digit"
-  }),
-  datetime: createDatetimeDataType({
-    day: "2-digit",
-    month: "2-digit",
-    year: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit"
-  }),
-  // numbers
-  number: createNumberDataType("left"),
-  amount: createNumberDataType("right", { decimals: 2, useGrouping: true }),
-  percentage: createNumberDataType("right", { useGrouping: true, percent: true })
-};
-function createDatetimeDataType(defaultOptions2) {
-  return {
-    sortingFn: "datetime",
-    filterComparators: [
-      TableFilterComparator.IsEqualTo,
-      TableFilterComparator.IsNotEqualTo,
-      TableFilterComparator.IsGreaterThan,
-      TableFilterComparator.IsLessThan,
-      TableFilterComparator.IsGreaterThanOrEqualTo,
-      TableFilterComparator.IsLessThanOrEqualTo,
-      TableFilterComparator.IsBetween,
-      TableFilterComparator.IsEmpty,
-      TableFilterComparator.IsNotEmpty
-    ],
-    getDisplayValue: (value, row, options) => {
-      var _a;
-      if (value === void 0) {
-        return "";
-      }
-      return new Intl.DateTimeFormat((_a = options == null ? void 0 : options.localization) == null ? void 0 : _a.locale, defaultOptions2).format(
-        typeof value === "string" ? Date.parse(value) : value
-      );
-    }
-  };
-}
-function createNumberDataType(align, defaultOptions2) {
-  return {
-    align,
-    sortingFn: "basic",
-    filterComparators: [
-      TableFilterComparator.IsEqualTo,
-      TableFilterComparator.IsNotEqualTo,
-      TableFilterComparator.IsGreaterThan,
-      TableFilterComparator.IsLessThan,
-      TableFilterComparator.IsGreaterThanOrEqualTo,
-      TableFilterComparator.IsLessThanOrEqualTo,
-      TableFilterComparator.IsBetween,
-      TableFilterComparator.IsEmpty,
-      TableFilterComparator.IsNotEmpty
-    ],
-    getDisplayValue: (value, row, options) => {
-      var _a, _b;
-      if (value === void 0) {
-        return "";
-      }
-      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 = {
-        // 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)
-      };
-      if (defaultOptions2 == null ? void 0 : defaultOptions2.percent) {
-        numberFormatOptions.style = "percent";
-      } else 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 getDataTypeProperties(dataType) {
-  return dataTypes[dataType ?? "text"] ?? dataTypes.text;
-}
-function getSortingFn(dataType, customFnOrBuiltIn) {
-  if (typeof customFnOrBuiltIn === "function") {
-    return (rowA, rowB, columnId) => customFnOrBuiltIn(rowA.original, rowB.original, columnId);
-  }
-  if (customFnOrBuiltIn) {
-    return customFnOrBuiltIn;
-  }
-  return getDataTypeProperties(dataType).sortingFn;
-}
 const toLowerCase = (value) => String(value ?? "").toLocaleLowerCase();
 const isWeakContains = (left, right) => toLowerCase(left).includes(toLowerCase(right));
 const isWeakEqual = (left, right) => toLowerCase(left) === toLowerCase(right);
@@ -33495,8 +33497,8 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
     );
   } else if (React__default.isValidElement(child) && (child.props.accessor || child.props.id)) {
     const {
-      accessor,
-      id: id2 = accessor,
+      id: untypedId,
+      accessor: accessorKey,
       // renderers
       renderer: renderer2,
       aggregate,
@@ -33521,6 +33523,7 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
       sortFn,
       ...meta
     } = child.props;
+    const id2 = untypedId ?? accessorKey;
     const dataTypeProperties = getDataTypeProperties(child.props.dataType);
     if (defaultHidden && enableHiding) {
       defaultVisibility[id2] = false;
@@ -33537,10 +33540,7 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
     }
     const column = {
       id: id2,
-      accessorKey: accessor,
-      // To avoid errors caused by undefined row data values, we pass accessorFn as a preventive measure
-      // accessor can be dot notated strings, so we use lodash.get to access deeply nested children
-      accessorFn: accessor ? (row) => get(row, accessor) : void 0,
+      accessorKey,
       // The header can be either a string or a JSX.Element, but react-table expects it to be a string or a
       // renderer function, so `() => header` ensures compatibility when header is a JSX.Element.
       // If we just pass `() => header`, then we will loose truncation for string headers.