From d328eab2efb759c4da69b3c52e839c9275a0e22f Mon Sep 17 00:00:00 2001
From: Quek Ruo Ling <ruoling.quek@ufinity.com>
Date: Wed, 13 May 2026 20:17:51 +0800
Subject: [PATCH] [MISC][RL] Fix missing click trigger from sortable table
 header

---
 src/data-table/data-table.tsx | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/data-table/data-table.tsx b/src/data-table/data-table.tsx
index e6c8fa354f..2ecf1033e9 100644
--- a/src/data-table/data-table.tsx
+++ b/src/data-table/data-table.tsx
@@ -247,6 +247,21 @@ export const DataTable = ({
         );
     };
 
+    // =============================================================================
+    // EVENT HANDLERS
+    // =============================================================================
+    const handleHeaderClick = (fieldKey: string) => {
+        onHeaderClick?.(fieldKey);
+    };
+
+    const handleHeaderButtonClick = (
+        event: React.MouseEvent<HTMLButtonElement>,
+        fieldKey: string
+    ) => {
+        event.stopPropagation();
+        onHeaderClick?.(fieldKey);
+    };
+
     // =============================================================================
     // RENDER FUNCTIONS
     // =============================================================================
@@ -285,6 +300,7 @@ export const DataTable = ({
                 aria-sort={getHeaderAriaSort(fieldKey)}
                 style={style}
                 $isCheckbox={false}
+                onClick={() => handleHeaderClick(fieldKey)}
             >
                 <HeaderCellWrapper id={headerCellWrapperId}>
                     {typeof label === "string" ? (
@@ -298,7 +314,11 @@ export const DataTable = ({
                 </HeaderCellWrapper>
                 {(clickable || isSortable) && (
                     <VisuallyHidden>
-                        <button onClick={() => onHeaderClick?.(fieldKey)}>
+                        <button
+                            onClick={(event) =>
+                                handleHeaderButtonClick(event, fieldKey)
+                            }
+                        >
                             {isSortable && "Sort "}
                             <span aria-labelledby={headerCellWrapperId} />
                             {isSortable && getSortButtonAriaLabel(fieldKey)}