From 7e757898e7716f1a397a732bd871bb363e939a70 Mon Sep 17 00:00:00 2001
From: Rohan Chakraborty <irohan1999@gmail.com>
Date: Fri, 13 Mar 2026 16:57:31 +0530
Subject: [PATCH] feat: add defaultValue support in datatable filters

---
 apps/www/src/components/datatable-demo.tsx             | 10 ++++++++--
 .../components/data-table/data-table.types.tsx         |  1 +
 .../components/data-table/hooks/useFilters.tsx         |  5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/www/src/components/datatable-demo.tsx b/apps/www/src/components/datatable-demo.tsx
index d23cdf8f6..b56516ad0 100644
--- a/apps/www/src/components/datatable-demo.tsx
+++ b/apps/www/src/components/datatable-demo.tsx
@@ -72,9 +72,15 @@ export const columns: DataTableColumnDef<Payment, unknown>[] = [
         value: 'failed'
       }
     ],
-    filterType: 'multiselect',
+    filterType: 'select',
     enableColumnFilter: true,
-    enableHiding: true
+    enableHiding: true,
+    defaultFilterValue: '',
+    filterProps: {
+      select: {
+        autocomplete: true
+      }
+    }
   },
   {
     accessorKey: 'email',
diff --git a/packages/raystack/components/data-table/data-table.types.tsx b/packages/raystack/components/data-table/data-table.types.tsx
index b1ea82154..649236403 100644
--- a/packages/raystack/components/data-table/data-table.types.tsx
+++ b/packages/raystack/components/data-table/data-table.types.tsx
@@ -81,6 +81,7 @@ export type DataTableColumnDef<TData, TValue> = ColumnDef<TData, TValue> & {
   enableHiding?: boolean;
   defaultHidden?: boolean;
   filterOptions?: FilterSelectOption[];
+  defaultFilterValue?: unknown;
   filterProps?: {
     select?: BaseSelectProps;
   };
diff --git a/packages/raystack/components/data-table/hooks/useFilters.tsx b/packages/raystack/components/data-table/hooks/useFilters.tsx
index 25621052a..e3ab44aed 100644
--- a/packages/raystack/components/data-table/hooks/useFilters.tsx
+++ b/packages/raystack/components/data-table/hooks/useFilters.tsx
@@ -18,11 +18,12 @@ export function useFilters<TData, TValue>() {
     const dataType = getDataType({ filterType, dataType: columnDef.dataType });
     const defaultFilter = filterOperators[filterType][0];
     const defaultValue =
-      filterType === FilterType.date
+      columnDef.defaultFilterValue ??
+      (filterType === FilterType.date
         ? new Date()
         : filterType === FilterType.select
           ? options[0].value
-          : '';
+          : '');
 
     updateTableQuery(query => {
       return {