From 8043505f3a128c759572b7a7eafbfb7ff5ea9d9a Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Fri, 14 Nov 2025 17:17:34 +0530 Subject: [PATCH] fix: prevent modal clicks from closing when used in booking list (#25153) --- packages/features/data-table/components/DataTable.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/features/data-table/components/DataTable.tsx b/packages/features/data-table/components/DataTable.tsx index 587cda4a4e..98680df8dd 100644 --- a/packages/features/data-table/components/DataTable.tsx +++ b/packages/features/data-table/components/DataTable.tsx @@ -400,7 +400,14 @@ function DataTableBody({ {...computedDataAttributes} data-index={virtualItem?.index} // needed for dynamic row height measurement data-state={row.getIsSelected() && "selected"} - onClick={() => onRowMouseclick && onRowMouseclick(row)} + onClick={(e) => { + if (!onRowMouseclick) return; + const target = e.target as Node | null; + const current = e.currentTarget as HTMLElement | null; + // Only invoke the handler when the event target is inside the row element. + if (!target || !current || !current.contains(target)) return; + onRowMouseclick(row); + }} style={{ display: "flex", ...(virtualItem && {