Skip to content

Commit f3e4159

Browse files
committed
fix(webapp): honor table cell leading/trailing slots for onClick and plain cells
1 parent 79ece7d commit f3e4159

1 file changed

Lines changed: 29 additions & 6 deletions

File tree

  • apps/webapp/app/components/primitives

apps/webapp/app/components/primitives/Table.tsx

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -431,13 +431,36 @@ export const TableCell = forwardRef<HTMLTableCellElement, TableCellProps>(
431431
</Link>
432432
)
433433
) : onClick ? (
434-
<button
435-
onClick={onClick}
436-
className={cn("cursor-pointer focus:outline-hidden", flexClasses, actionClassName)}
437-
tabIndex={isTabbableCell ? 0 : -1}
438-
>
434+
leadingContent || trailingContent ? (
435+
<div className={cn(flexClasses, "gap-2")}>
436+
{leadingContent}
437+
<button
438+
onClick={onClick}
439+
className={cn(
440+
"inline-flex cursor-pointer items-center gap-2 focus:outline-hidden",
441+
actionClassName
442+
)}
443+
tabIndex={isTabbableCell ? 0 : -1}
444+
>
445+
{children}
446+
</button>
447+
{trailingContent}
448+
</div>
449+
) : (
450+
<button
451+
onClick={onClick}
452+
className={cn("cursor-pointer focus:outline-hidden", flexClasses, actionClassName)}
453+
tabIndex={isTabbableCell ? 0 : -1}
454+
>
455+
{children}
456+
</button>
457+
)
458+
) : leadingContent || trailingContent ? (
459+
<div className={cn(flexClasses, "gap-2")}>
460+
{leadingContent}
439461
{children}
440-
</button>
462+
{trailingContent}
463+
</div>
441464
) : (
442465
<>{children}</>
443466
)}

0 commit comments

Comments
 (0)