Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(Table): scope row border removal to parent tr via marker (#1841)

Kenton Quatmanfafe3904011f
diff --git a/packages/core/src/Table/XDSTableCell.tsx b/packages/core/src/Table/XDSTableCell.tsx
index 6e18bb0760..42e4012280 100644
--- a/packages/core/src/Table/XDSTableCell.tsx
+++ b/packages/core/src/Table/XDSTableCell.tsx
@@ -22,7 +22,11 @@ import {
typeScaleVars,
} from '../theme/tokens.stylex';
import type {StyleXStyles} from '../theme/types';
-import {overflowStyles, containerEdgeStyles} from './table.stylex';
+import {
+ overflowStyles,
+ containerEdgeStyles,
+ tableRowMarker,
+} from './table.stylex';
import {
useTableContext,
buildDividerStyles,
@@ -73,7 +77,10 @@ const dividerRowStyles = stylex.create({
default: borderVars['--border-width'],
// Skip border on cells in the last body row to avoid a
// redundant line at the bottom of the table.
- [stylex.when.ancestor(':last-child')]: '0',
+ // Scoped to tableRowMarker so only the parent <tr> is checked —
+ // without the scope, <tbody> (also a :last-child) would match
+ // and suppress borders on every row.
+ [stylex.when.ancestor(':last-child', tableRowMarker)]: '0',
},
borderBottomStyle: 'solid',
borderBottomColor: colorVars['--color-border'],
diff --git a/packages/core/src/Table/XDSTableRow.tsx b/packages/core/src/Table/XDSTableRow.tsx
index 293a6be489..e3ff61c661 100644
--- a/packages/core/src/Table/XDSTableRow.tsx
+++ b/packages/core/src/Table/XDSTableRow.tsx
@@ -17,6 +17,7 @@ import type {XDSBaseProps} from '../XDSBaseProps';
import * as stylex from '@stylexjs/stylex';
import {colorVars, durationVars, easeVars} from '../theme/tokens.stylex';
import type {StyleXStyles} from '../theme/types';
+import {tableRowMarker} from './table.stylex';
import {XDSTableContext} from './XDSTableContext';
import {xdsClassName, mergeProps} from '../utils';
@@ -99,7 +100,10 @@ export function XDSTableRow({
<tr
ref={ref}
{...props}
- {...mergeProps(xdsClassName('table-row'), stylex.props(xstyle))}>
+ {...mergeProps(
+ xdsClassName('table-row'),
+ stylex.props(tableRowMarker, xstyle),
+ )}>
{children}
</tr>
);
@@ -129,7 +133,10 @@ export function XDSTableRow({
<tr
ref={ref}
{...props}
- {...mergeProps(xdsClassName('table-row'), stylex.props(...rowStyles))}>
+ {...mergeProps(
+ xdsClassName('table-row'),
+ stylex.props(tableRowMarker, ...rowStyles),
+ )}>
{children}
</tr>
);
diff --git a/packages/core/src/Table/table.stylex.ts b/packages/core/src/Table/table.stylex.ts
index 454dd7a518..0ed5fd2793 100644
--- a/packages/core/src/Table/table.stylex.ts
+++ b/packages/core/src/Table/table.stylex.ts
@@ -1,17 +1,28 @@
/**
* @file table.stylex.ts
* @input StyleX, theme tokens
- * @output Shared table styles used by XDSTableCell and XDSTableHeaderCell
- * @position Utility styles; consumed by cell components
+ * @output Shared table styles used by XDSTableCell, XDSTableHeaderCell, XDSTableRow
+ * @position Utility styles; consumed by cell and row components
*
* SYNC: When modified, update these files to stay in sync:
* - /packages/core/src/Table/XDSTableCell.tsx
* - /packages/core/src/Table/XDSTableHeaderCell.tsx
+ * - /packages/core/src/Table/XDSTableRow.tsx
*/
import * as stylex from '@stylexjs/stylex';
import {spacingVars} from '../theme/tokens.stylex';
+/**
+ * Scoped marker for table row ancestor selectors.
+ *
+ * Applied to each `<tr>` via XDSTableRow so that cell-level
+ * `stylex.when.ancestor(':last-child', tableRowMarker)` only matches
+ * the parent row — not other ancestors like `<tbody>` or `<table>`.
+ */
+export const tableRowMarker: ReturnType<typeof stylex.defineMarker> =
+ stylex.defineMarker();
+
/**
* Overflow truncation for table cells.
*