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

package/dist/taco.cjs

@@ -33333,6 +33333,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()) {
@@ -33342,7 +33343,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)) {
@@ -33383,11 +33384,11 @@ const getCellMinWidth = (fontSize = "medium") => {
       return 72;
   }
 };
-function isCellHighlighted(query, value, dataType, localization) {
+function isCellHighlighted(query, value, row, dataType, dataTypeOptions, localization) {
   if (value === void 0 || value === null) {
     return false;
   }
-  return isMatched(query, value, dataType, localization);
+  return isMatched(query, value, row, dataType, dataTypeOptions, localization);
 }
 function orderColumn(column, { orderingDisabled, orderingEnabled }) {
   var _a;
@@ -33512,8 +33513,8 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
     );
   } else if (React.isValidElement(child) && (child.props.accessor || child.props.id)) {
     const {
-      id: untypedId,
-      accessor: accessorKey = untypedId,
+      accessor,
+      id: id2 = accessor,
       // renderers
       renderer: renderer2,
       aggregate,
@@ -33538,7 +33539,6 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
       sortFn,
       ...meta
     } = child.props;
-    const id2 = untypedId;
     const dataTypeProperties = getDataTypeProperties(child.props.dataType);
     if (defaultHidden && enableHiding) {
       defaultVisibility[id2] = false;
@@ -33555,10 +33555,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.
@@ -33615,7 +33615,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) {
@@ -36471,7 +36471,9 @@ function useSearchHighlighting(cell, cellIndex, ref) {
       isHighlighted2 = isCellHighlighted(
         context.table.getState().globalFilter,
         cell.getValue(),
+        cell.row.original,
         columnMeta.dataType,
+        columnMeta.dataTypeOptions,
         localization
       );
     }