@economic/taco 2.58.2-EC-64961.4 → 2.58.2-EC-64961.6

package/dist/taco.d.ts

@@ -3220,7 +3220,7 @@ export declare type TableColumnProps<TType = unknown> = TableColumnIdentifierPro
 
 export declare type TableColumnRenderer<TType, TValue = unknown> = (args: TableColumnRendererArgs<TType, TValue>) => JSX.Element | string | number | unknown | null;
 
-export declare type TableColumnRendererAggregate<TType, TValue> = (value: TValue, row: TType) => JSX.Element | string | number | null;
+export declare type TableColumnRendererAggregate<TType, TValue = unknown> = (args: TableColumnRendererArgs<TType, TValue>) => JSX.Element | string | number | unknown | null;
 
 export declare type TableColumnRendererArgs<TType, TValue> = {
     formattedValue: string;
@@ -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

@@ -33315,6 +33315,7 @@ function resetHighlightedColumnIndexes(searchQuery, table, localization) {
       columns.forEach((column, columnIndex) => {
         var _a, _b;
         try {
+          const key = column.columnDef.accessorKey;
           let allowSearch = true;
           if (rowGrouping == null ? void 0 : rowGrouping.length) {
             if (row.getIsGrouped()) {
@@ -33324,7 +33325,7 @@ function resetHighlightedColumnIndexes(searchQuery, table, localization) {
             }
           }
           if (column.getIsVisible() && column.columnDef.enableGlobalFilter && allowSearch) {
-            const cellValue = get(row.original, column.id);
+            const cellValue = get(row.original, key);
             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, row.original, dataType, dataTypeOptions, localization)) {
@@ -33494,8 +33495,8 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
     );
   } else if (React__default.isValidElement(child) && (child.props.accessor || child.props.id)) {
     const {
-      id: untypedId,
-      accessor: accessorKey = untypedId,
+      accessor,
+      id: id2 = accessor,
       // renderers
       renderer: renderer2,
       aggregate,
@@ -33520,7 +33521,6 @@ 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 +33537,10 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
     }
     const column = {
       id: id2,
-      accessorKey,
+      accessorKey: accessor,
       // To avoid errors caused by undefined row data values, we pass accessorFn as a preventive measure
-      // accessorKey can be dot notated strings, so we use lodash.get to access deeply nested children
-      accessorFn: (row) => get(row, accessorKey),
+      // accessor can be dot notated strings, so we use lodash.get to access deeply nested children
+      accessorFn: accessor ? (row) => get(row, accessor) : void 0,
       // 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.
@@ -33597,7 +33597,7 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
     if (enableGrouping) {
       column.aggregationFn = aggregationFn;
       if (typeof aggregate === "function") {
-        column.aggregatedCell = (info) => aggregate(info.getValue(), info.row.original);
+        column.aggregatedCell = (info) => aggregate(rendererArgs(info));
       }
     }
     if (enableSorting) {