Skip to content

Commit 9382f10

Browse files
committed
remove color omitting
1 parent afeb9ce commit 9382f10

3 files changed

Lines changed: 3 additions & 18 deletions

File tree

packages/react/src/Card/Card.test.tsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -210,20 +210,6 @@ describe('Card', () => {
210210
expect(container.querySelector('.Card__label')).toHaveClass('Token--variant-default')
211211
})
212212

213-
it('rejects the legacy color prop in TypeScript and ignores it at runtime', () => {
214-
const {container, getByText} = render(
215-
<Card href={mockHref}>
216-
{/* @ts-expect-error Testing invalid legacy prop */}
217-
<Card.Label color="blue-purple">{mockLabel}</Card.Label>
218-
<Card.Heading>{mockHeading}</Card.Heading>
219-
</Card>,
220-
)
221-
222-
expect(getByText(mockLabel)).toBeInTheDocument()
223-
expect(container.querySelector('.Card__label')).toHaveClass('Token--variant-default')
224-
expect(container.querySelector('.Card__label')).not.toHaveAttribute('color')
225-
})
226-
227213
it('renders an arrow-only cta variant', () => {
228214
const {container, getByText} = render(
229215
<Card href={mockHref} ctaVariant="arrow">

packages/react/src/Card/Card.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,14 +319,13 @@ const CardTokens = forwardRef<HTMLDivElement, CardTokensProps>(
319319
)
320320

321321
type CardLabelProps = Omit<BaseProps<HTMLSpanElement>, 'animate'> &
322-
Omit<React.ComponentPropsWithoutRef<'span'>, 'children' | 'color'> & {
322+
Omit<React.ComponentPropsWithoutRef<'span'>, 'children'> & {
323323
children: React.ReactNode | React.ReactNode[]
324-
color?: never
325324
variant?: CardLabelVariant
326325
}
327326

328327
const CardLabel = forwardRef<HTMLSpanElement, CardLabelProps>(
329-
({children, color: _legacyColor, variant = defaultCardLabelVariant, className, ...rest}, ref) => {
328+
({children, variant = defaultCardLabelVariant, className, ...rest}, ref) => {
330329
if (variant === 'accent-text') {
331330
return (
332331
<EyebrowText ref={ref} className={clsx(styles.Card__label, className)} variant="accent" {...rest}>

packages/react/src/Token/Token.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
max-width: 100%;
99
padding-inline: var(--base-size-8);
1010
padding-block: var(--base-size-6);
11-
padding-block-end: calc(var(--base-size-6)); /* Compensate for 1px border to maintain height */
11+
padding-block-end: var(--base-size-6);
1212
vertical-align: middle;
1313
}
1414

0 commit comments

Comments
 (0)