@dbcdk/react-components 0.0.135 → 0.0.137

package/dist/hooks/useTableData.d.ts

@@ -1,3 +1,4 @@
+import type { ColumnDef } from '@tanstack/react-table';
 import type { PageChangeEvent } from '../components/pagination/Pagination';
 import { type PaginationState } from './usePagination';
 import { type SortDirection, type SortState, type ColumnComparators } from './useSorting';
@@ -10,13 +11,14 @@ export interface UseTableDataProps<T> {
         onStateChange?: (next: PaginationState) => void;
     };
     sorting?: {
-        sortBy?: keyof T | null;
+        sortBy?: string | null;
         direction?: SortDirection;
         state?: SortState<T>;
         onStateChange?: (next: SortState<T>) => void;
         columnComparators?: ColumnComparators<T>;
         nulls?: 'first' | 'last';
         allowUnsort?: boolean;
+        columns?: ReadonlyArray<ColumnDef<T, any>>;
     };
     /**
      * Resets to page 1 whenever sorting changes (typical UX).

package/dist/hooks/useTableData.js

@@ -1,7 +1,7 @@
 'use client';
-import { useEffect, useMemo } from 'react';
+import { useMemo, useEffect } from 'react';
 import { usePagination } from './usePagination';
-import { useSorting } from './useSorting';
+import { useSorting, defaultCompare } from './useSorting';
 
 function useTableData({
   data = [],
@@ -10,28 +10,50 @@ function useTableData({
   resetPageOnSortChange = true
 }) {
   var _a, _b, _c, _d, _e, _f;
+  const hasPagination = pagination != null;
+  const nullsMode = (_a = sorting == null ? void 0 : sorting.nulls) != null ? _a : "last";
+  const mergedComparators = useMemo(() => {
+    var _a2, _b2;
+    const derived = {};
+    for (const col of (_a2 = sorting == null ? void 0 : sorting.columns) != null ? _a2 : []) {
+      const colId = (_b2 = col.id) != null ? _b2 : col.accessorKey;
+      if (!colId) continue;
+      const accessorFn = col.accessorFn;
+      const accessorKey = col.accessorKey;
+      if (accessorFn) {
+        derived[colId] = (a, b, dir) => defaultCompare(accessorFn(a, 0), accessorFn(b, 0), dir, nullsMode);
+      } else if (accessorKey) {
+        derived[colId] = (a, b, dir) => defaultCompare(a[accessorKey], b[accessorKey], dir, nullsMode);
+      }
+    }
+    return { ...derived, ...sorting == null ? void 0 : sorting.columnComparators };
+  }, [sorting == null ? void 0 : sorting.columns, sorting == null ? void 0 : sorting.columnComparators, nullsMode]);
   const s = useSorting({
     data,
-    sortBy: (_a = sorting == null ? void 0 : sorting.sortBy) != null ? _a : null,
-    sortDirection: (_b = sorting == null ? void 0 : sorting.direction) != null ? _b : null,
+    sortBy: (_b = sorting == null ? void 0 : sorting.sortBy) != null ? _b : null,
+    sortDirection: (_c = sorting == null ? void 0 : sorting.direction) != null ? _c : null,
     state: sorting == null ? void 0 : sorting.state,
     onStateChange: sorting == null ? void 0 : sorting.onStateChange,
-    columnComparators: sorting == null ? void 0 : sorting.columnComparators,
-    nulls: (_c = sorting == null ? void 0 : sorting.nulls) != null ? _c : "last",
+    columnComparators: mergedComparators,
+    nulls: nullsMode,
     allowUnsort: (_d = sorting == null ? void 0 : sorting.allowUnsort) != null ? _d : true
   });
   const p = usePagination({
     data: s.sortedData,
     skip: (_e = pagination == null ? void 0 : pagination.skip) != null ? _e : 0,
-    take: (_f = pagination == null ? void 0 : pagination.take) != null ? _f : 10,
+    take: (_f = pagination == null ? void 0 : pagination.take) != null ? _f : Math.max(s.sortedData.length, 1),
     state: pagination == null ? void 0 : pagination.state,
     onStateChange: pagination == null ? void 0 : pagination.onStateChange
   });
   useEffect(() => {
+    if (!hasPagination) return;
     if (!resetPageOnSortChange) return;
     p.resetPage();
-  }, [resetPageOnSortChange, s.sortState.sortBy, s.sortState.sortDirection]);
-  const rows = useMemo(() => p.paginatedData, [p.paginatedData]);
+  }, [hasPagination, resetPageOnSortChange, s.sortState.sortBy, s.sortState.sortDirection]);
+  const rows = useMemo(
+    () => hasPagination ? p.paginatedData : s.sortedData,
+    [hasPagination, p.paginatedData, s.sortedData]
+  );
   return {
     rows,
     totalCount: s.sortedData.length,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbcdk/react-components",
-  "version": "0.0.135",
+  "version": "0.0.137",
   "description": "Reusable React components for DBC projects",
   "license": "ISC",
   "author": "",