@economic/taco 2.58.1 → 2.58.2-EC-64962.0

package/dist/taco.d.ts

@@ -3150,49 +3150,62 @@ export declare type TableColumnDataType = 'text' | 'number' | 'datetime' | 'bool
 
 export declare type TableColumnFilter = ColumnFilter;
 
-export declare type TableColumnMenu = ((columnId: string) => React.ReactNode | null)[];
-
-export declare type TableColumnProps<TType = unknown> = ValueOf<{
+export declare type TableColumnIdentifierProps<TType = unknown> = {
     [Key in keyof TType]: {
-        accessor?: Key;
-        id: StringWithAutocompleteOptions<Key>;
+        accessor: Key;
+        id?: string;
         renderer?: TableColumnRenderer<TType, TType[Key]>;
-        /** Renderer to use if the cell is an aggregate cell and part of a grouped row */
         aggregate?: TableColumnRendererAggregate<TType, TType[Key]>;
-        control?: TableColumnRendererControl<TType>;
-        footer?: TableColumnRendererFooter<TType>;
-        header: TableColumnRendererHeader;
-        /** Aggregation function to be used when the column is part of a grouped row */
-        aggregationFn?: 'auto' | BuiltInAggregationFn;
-        align?: TableColumnAlignment;
-        className?: TableColumnClassNameHandler<TType>;
-        dataType?: TableColumnDataType;
-        defaultHidden?: boolean;
-        defaultWidth?: TableColumnWidth;
-        enableEditing?: boolean;
-        enableFiltering?: boolean;
-        enableGrouping?: boolean;
-        enableHiding?: boolean;
-        enableOrdering?: boolean;
-        enablePrinting?: boolean;
-        enableResizing?: boolean;
-        enableSearch?: boolean;
-        enableSorting?: boolean;
-        enableTruncate?: boolean;
-        filters?: TableFilterComparator[];
-        headerClassName?: string;
-        menu?: TableColumnMenu;
-        minWidth?: number;
-        sort?: TableColumnSortDirection;
-        sortFn?: TableColumnSortFn<TType>;
-        tooltip?: string;
     };
-}>;
+}[keyof TType] | {
+    accessor?: never;
+    id: string;
+    renderer?: TableColumnRenderer<TType, unknown>;
+    aggregate?: TableColumnRendererAggregate<TType, unknown>;
+};
+
+export declare type TableColumnMenu = ((columnId: string) => React.ReactNode | null)[];
+
+export declare type TableColumnProps<TType = unknown> = TableColumnIdentifierProps<TType> & {
+    control?: TableColumnRendererControl<TType>;
+    footer?: TableColumnRendererFooter<TType>;
+    header: TableColumnRendererHeader;
+    /** Aggregation function to be used when the column is part of a grouped row */
+    aggregationFn?: 'auto' | BuiltInAggregationFn;
+    align?: TableColumnAlignment;
+    className?: TableColumnClassNameHandler<TType>;
+    dataType?: TableColumnDataType;
+    defaultHidden?: boolean;
+    defaultWidth?: TableColumnWidth;
+    enableEditing?: boolean;
+    enableFiltering?: boolean;
+    enableGrouping?: boolean;
+    enableHiding?: boolean;
+    enableOrdering?: boolean;
+    enablePrinting?: boolean;
+    enableResizing?: boolean;
+    enableSearch?: boolean;
+    enableSorting?: boolean;
+    enableTruncate?: boolean;
+    filters?: TableFilterComparator[];
+    headerClassName?: string;
+    menu?: TableColumnMenu;
+    minWidth?: number;
+    sort?: TableColumnSortDirection;
+    sortFn?: TableColumnSortFn<TType>;
+    tooltip?: string;
+};
 
-export declare type TableColumnRenderer<TType, TValue> = (value: TValue, row: TType) => JSX.Element | string | number | null;
+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 TableColumnRendererArgs<TType, TValue> = {
+    formattedValue: string;
+    row: TType;
+    value: TValue;
+};
+
 export declare type TableColumnRendererControl<TType = unknown> = ((props: TableColumnRendererControlProps, row?: TType, filterState?: TableFilter[]) => JSX.Element) | 'datepicker' | 'input' | 'switch' | 'checkbox' | 'textarea';
 
 export declare type TableColumnRendererControlProps = {
@@ -3991,8 +4004,6 @@ export declare const useTableRowCreation: <TRow extends {}>(data: Row<TRow>[], t
 
 export declare const useToast: () => Toaster<ToastReference>;
 
-export declare type ValueOf<T> = T[keyof T];
-
 export declare const VisuallyHidden: React_2.ForwardRefExoticComponent<Props & React_2.RefAttributes<HTMLSpanElement>>;
 
 export declare const WindowedTable: ForwardedGenericTableWithStatics;
@@ -4045,7 +4056,6 @@ declare module '@tanstack/table-core' {
         header: string;
         headerClassName?: string;
         menu?: TableColumnMenu;
-        renderer?: TableColumnRenderer<TValue, TData>;
         tooltip?: string;
     }
 }

package/dist/taco.js

@@ -33516,23 +33516,27 @@ function processChildren(child, columns, defaultSizing, defaultSorting, defaultV
         enablePrinting,
         enableTruncate,
         enableEditing,
-        header,
-        renderer: renderer2
+        header
       }
     };
+    const formattedValueRenderer = (value) => {
+      var _a;
+      const displayValue = (_a = dataTypeProperties.getDisplayValue) == null ? void 0 : _a.call(dataTypeProperties, value, { localization });
+      const safeValue = value !== void 0 && value !== null ? String(value) : value;
+      if (Array.isArray(displayValue)) {
+        return displayValue[0] ?? safeValue;
+      }
+      return displayValue ?? safeValue;
+    };
+    const rendererArgs = (info) => ({
+      formattedValue: formattedValueRenderer(info.getValue()),
+      row: info.row.original,
+      value: info.getValue()
+    });
     if (typeof renderer2 === "function") {
-      column.cell = (info) => renderer2(info.getValue(), info.row.original);
-    } else if (dataTypeProperties.getDisplayValue) {
-      const dataTypeRenderer = (value) => {
-        var _a;
-        const displayValue = (_a = dataTypeProperties.getDisplayValue) == null ? void 0 : _a.call(dataTypeProperties, value, { localization });
-        if (Array.isArray(displayValue)) {
-          return displayValue[0] ?? value;
-        }
-        return displayValue ?? value;
-      };
-      column.cell = (info) => dataTypeRenderer(info.getValue());
-      column.meta.renderer = dataTypeRenderer;
+      column.cell = (info) => renderer2(rendererArgs(info));
+    } else {
+      column.cell = (info) => formattedValueRenderer(info.getValue());
     }
     if (typeof footer === "function") {
       column.footer = (info) => footer(info.table.getRowModel().rows.flatMap((row) => row.original !== void 0 ? row.original : []));
@@ -36440,17 +36444,14 @@ function useSearchHighlighting(cell, cellIndex, ref) {
   return isHighlighted;
 }
 function GroupedCell(props) {
-  var _a;
   const { cell, cellRef, index: index2, isHighlighted } = props;
   const { table } = cell.getContext();
   const tableMeta = table.options.meta;
-  const columnMeta = cell.column.columnDef.meta;
   const attributes = getCellAttributes(cell, index2, isHighlighted);
   const { isHovered, rowIndex } = React__default.useContext(RowContext);
   const isActiveRow = tableMeta.rowActive.rowActiveIndex === rowIndex;
   const canShowActions = isActiveRow || isHovered && !tableMeta.rowActive.isHoverStatePaused;
   const colSpan = cell.row.getVisibleCells().filter((c3) => c3.column.id === "__actions" || !isInternalColumn(c3.column.id)).length - 1;
-  const content = ((_a = columnMeta.renderer) == null ? void 0 : _a.call(columnMeta, cell.getValue(), cell.row.original)) ?? cell.getValue() ?? null;
   const subRows = cell.getContext().row.subRows.map((row) => row.original);
   return /* @__PURE__ */ React__default.createElement(
     MemoedGroupedCell,
@@ -36464,7 +36465,7 @@ function GroupedCell(props) {
       subRows,
       table
     },
-    content
+    flexRender(cell.column.columnDef.cell, cell.getContext())
   );
 }
 const MemoedGroupedCell = React__default.memo(function MemoedGroupedCell2(props) {
@@ -36610,19 +36611,11 @@ const DisplayRow = React__default.memo(function DisplayRow2(props) {
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement("tr", { ...attributes, className, ref }, children, row.getVisibleCells().filter((cell) => !(isGrouped && cell.column.id === "__actions")).map((cell, cellIndex) => /* @__PURE__ */ React__default.createElement(Cell$2, { key: cell.id, cell, index: cellIndex, renderer: CellRenderer }))), expandedRow ? /* @__PURE__ */ React__default.createElement("tr", { "data-row-parent-id": row.id, ref: expansionRef }, /* @__PURE__ */ React__default.createElement("td", { className: "col-span-full" }, expandedRow)) : null);
 });
 function DisplayCell(props) {
-  var _a;
   const { cell, cellRef, index: index2, isHighlighted, ...cellAttributes } = props;
   const columnMeta = cell.column.columnDef.meta;
   const attributes = getCellAttributes(cell, index2, isHighlighted);
   const isTruncated = !!columnMeta.enableTruncate;
-  const value = cell.getValue();
-  let content;
-  if (isInternalColumn(cell.column.id)) {
-    content = flexRender(cell.column.columnDef.cell, cell.getContext());
-  } else {
-    content = ((_a = columnMeta.renderer) == null ? void 0 : _a.call(columnMeta, value, cell.row.original)) ?? value ?? null;
-  }
-  return /* @__PURE__ */ React__default.createElement(MemoedDisplayCell, { ...cellAttributes, ...attributes, cellRef, isTruncated }, content);
+  return /* @__PURE__ */ React__default.createElement(MemoedDisplayCell, { ...cellAttributes, ...attributes, cellRef, isTruncated }, flexRender(cell.column.columnDef.cell, cell.getContext()));
 }
 const MemoedDisplayCell = React__default.memo(function MemoedDisplayCell2(props) {
   const { cellRef, children, isTruncated, ...cellAttributes } = props;