From abd2663758678c448062ea44dedf76a91fbd8003 Mon Sep 17 00:00:00 2001
From: Shreyag02 <shreyagupta72484@gmail.com>
Date: Thu, 25 Jun 2026 17:47:52 +0530
Subject: [PATCH] fix(data-table): align defaultSort optionality across
 internal types and fix sort icon direction

---
 .../components/data-table/components/ordering.tsx   | 13 +++++++------
 .../raystack/components/data-table/data-table.tsx   |  2 +-
 .../components/data-table/data-table.types.tsx      |  2 +-
 .../raystack/components/data-table/utils/index.tsx  |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/raystack/components/data-table/components/ordering.tsx b/packages/raystack/components/data-table/components/ordering.tsx
index 326a7db53..4d68d1967 100644
--- a/packages/raystack/components/data-table/components/ordering.tsx
+++ b/packages/raystack/components/data-table/components/ordering.tsx
@@ -17,15 +17,16 @@ import {
 export interface OrderingProps {
   columnList: ColumnData[];
   onChange: (columnId: string, order: SortOrdersValues) => void;
-  value: DataTableSort;
+  value?: DataTableSort;
 }
 
 export function Ordering({ columnList, onChange, value }: OrderingProps) {
   function handleColumnChange(columnId: string) {
-    onChange(columnId, value.order);
+    onChange(columnId, value?.order ?? SortOrders.ASC);
   }
 
   function handleOrderChange() {
+    if (!value) return;
     const newOrder =
       value.order === SortOrders.ASC ? SortOrders.DESC : SortOrders.ASC;
     onChange(value.name, newOrder);
@@ -48,7 +49,7 @@ export function Ordering({ columnList, onChange, value }: OrderingProps) {
       >
         <Select
           onValueChange={handleColumnChange}
-          value={value.name}
+          value={value?.name}
           disabled={columnList.length === 0}
         >
           <Select.Trigger
@@ -70,12 +71,12 @@ export function Ordering({ columnList, onChange, value }: OrderingProps) {
           size={4}
           disabled={columnList.length === 0}
         >
-          {value.order === SortOrders?.ASC ? (
+          {value?.order === SortOrders?.ASC ? (
+            <TextAlignTopIcon className={styles['display-popover-sort-icon']} />
+          ) : (
             <TextAlignBottomIcon
               className={styles['display-popover-sort-icon']}
             />
-          ) : (
-            <TextAlignTopIcon className={styles['display-popover-sort-icon']} />
           )}
         </IconButton>
       </Flex>
diff --git a/packages/raystack/components/data-table/data-table.tsx b/packages/raystack/components/data-table/data-table.tsx
index d1957af19..adb714634 100644
--- a/packages/raystack/components/data-table/data-table.tsx
+++ b/packages/raystack/components/data-table/data-table.tsx
@@ -86,7 +86,7 @@ function DataTableRoot<TData, TValue>({
     setTableQuery(prev => ({
       ...prev,
       ...defaultTableQuery,
-      sort: [defaultSort],
+      sort: defaultSort ? [defaultSort] : [],
       group_by: [defaultGroupOption.id]
     }));
     handleColumnVisibilityChange(initialColumnVisibility);
diff --git a/packages/raystack/components/data-table/data-table.types.tsx b/packages/raystack/components/data-table/data-table.types.tsx
index 44b92fee7..83821f9cc 100644
--- a/packages/raystack/components/data-table/data-table.types.tsx
+++ b/packages/raystack/components/data-table/data-table.types.tsx
@@ -157,7 +157,7 @@ export type TableContextType<TData, TValue> = {
   isLoading?: boolean;
   loadMoreData: () => void;
   mode: DataTableMode;
-  defaultSort: DataTableSort;
+  defaultSort?: DataTableSort;
   tableQuery?: InternalQuery;
   totalRowCount?: number;
   loadingRowCount?: number;
diff --git a/packages/raystack/components/data-table/utils/index.tsx b/packages/raystack/components/data-table/utils/index.tsx
index 730126778..299093d42 100644
--- a/packages/raystack/components/data-table/utils/index.tsx
+++ b/packages/raystack/components/data-table/utils/index.tsx
@@ -168,7 +168,7 @@ const isSearchChanged = (oldSearch?: string, newSearch?: string): boolean => {
  */
 export const hasActiveQuery = (
   tableQuery: InternalQuery,
-  defaultSort: DataTableSort
+  defaultSort?: DataTableSort
 ): boolean => {
   const hasFilters =
     (tableQuery?.filters && tableQuery.filters.length > 0) || false;
@@ -345,7 +345,7 @@ export function hasActiveTableFiltering<T>(table: Table<T>): boolean {
 }
 
 export function getDefaultTableQuery(
-  defaultSort: DataTableSort,
+  defaultSort?: DataTableSort,
   oldQuery: DataTableQuery = {}
 ): InternalQuery {
   // Convert DataTableQuery to InternalQuery