@open-mercato/ui 0.6.8-develop.7016.1.4ed7b1e49d → 0.6.8-develop.7019.1.f4c01c4b5c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/ui",
-  "version": "0.6.8-develop.7016.1.4ed7b1e49d",
+  "version": "0.6.8-develop.7019.1.f4c01c4b5c",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -155,14 +155,14 @@
     "remark-gfm": "^4.0.1"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.8-develop.7016.1.4ed7b1e49d",
+    "@open-mercato/shared": "0.6.8-develop.7019.1.f4c01c4b5c",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
     "react-is": ">=18.0.0"
   },
   "devDependencies": {
     "@figma/code-connect": "^1.3.4",
-    "@open-mercato/shared": "0.6.8-develop.7016.1.4ed7b1e49d",
+    "@open-mercato/shared": "0.6.8-develop.7019.1.f4c01c4b5c",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^7.0.0",
     "@testing-library/react": "^16.3.1",

package/src/backend/DataTable.tsx

@@ -301,7 +301,7 @@ export type DataTableProps<T extends RowData> = {
   emptyState?: React.ReactNode
   error?: React.ReactNode | string | null
   rowActions?: (row: T) => React.ReactNode
-  onRowClick?: (row: T) => void
+  onRowClick?: (row: T, event: React.MouseEvent<HTMLTableRowElement>) => void
   rowClickActionIds?: string[]
   disableRowClick?: boolean
   bulkActions?: BulkAction<T>[]
@@ -3467,7 +3467,7 @@ export function DataTable<T extends RowData>({
                       }
                       
                       if (onRowClick) {
-                        onRowClick(row.original as T)
+                        onRowClick(row.original as T, e)
                       } else if (defaultRowAction) {
                         if (defaultRowAction.href) {
                           router.push(defaultRowAction.href)

package/src/backend/__tests__/DataTable.render.test.tsx

@@ -128,4 +128,41 @@ describe('DataTable SSR render', () => {
       queryClient.clear()
     }
   })
+
+  it('forwards the click event to onRowClick, and skips it when clicking the actions cell', () => {
+    const columns: ColumnDef<Row>[] = [
+      { accessorKey: 'name', header: 'Name' },
+    ]
+    const queryClient = new QueryClient({ defaultOptions: { queries: { gcTime: 0 } } })
+    let capturedRowTagName: string | null = null
+    const onRowClick = jest.fn((_row: Row, event: React.MouseEvent<HTMLTableRowElement>) => {
+      capturedRowTagName = event.currentTarget.tagName
+    })
+    try {
+      render(
+        <QueryClientProvider client={queryClient}>
+          <I18nProvider locale="en" dict={{}}>
+            <DataTable
+              columns={columns}
+              data={[{ id: '1', name: 'Ada' }]}
+              onRowClick={onRowClick}
+              rowActions={() => <button type="button">Edit</button>}
+            />
+          </I18nProvider>
+        </QueryClientProvider>,
+      )
+
+      fireEvent.click(screen.getByText('Ada'))
+      expect(onRowClick).toHaveBeenCalledTimes(1)
+      const [row, event] = onRowClick.mock.calls[0]
+      expect(row).toEqual({ id: '1', name: 'Ada' })
+      expect(event.type).toBe('click')
+      expect(capturedRowTagName).toBe('TR')
+
+      fireEvent.click(screen.getByText('Edit'))
+      expect(onRowClick).toHaveBeenCalledTimes(1)
+    } finally {
+      queryClient.clear()
+    }
+  })
 })