Spread state and initialState

StanfordBDHG · Oct 1, 2024 · e5d2b38 · e5d2b38
1 parent efd1c8e
commit e5d2b38
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/design-system/src/components/DataTable/DataTable.utils.ts b/packages/design-system/src/components/DataTable/DataTable.utils.ts
@@ -55,6 +55,8 @@ export const useDataTable = <Data>({
   columns,
   data,
   pageSize = 50,
+  state,
+  initialState,
   ...props
 }: UseDataTableProps<Data>) => {
   const [globalFilter, setGlobalFilter] = useState('')
@@ -75,11 +77,12 @@ export const useDataTable = <Data>({
     getSortedRowModel: getSortedRowModel(),
     getPaginationRowModel: getPaginationRowModel(),
     onGlobalFilterChange: setGlobalFilter,
-    state: { globalFilter },
+    state: { globalFilter, ...state },
     initialState: {
       pagination: {
         pageSize,
       },
+      ...initialState,
     },
     ...props,
   })