Skip to content

refactor(ui): migrate Mosaic Card to StyleX #9292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
austincalvelage wants to merge 15 commits into
base: main
Choose a base branch
from
Open

refactor(ui): migrate Mosaic Card to StyleX #9292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ab560c8
refactor(ui): migrate Mosaic Card to StyleX
austincalvelage Jul 30, 2026
4ff280b
feat(ui): align Mosaic Card with updated design
austincalvelage Jul 30, 2026
a45fc86
refactor(ui): align Card compound API
austincalvelage Jul 31, 2026
3e5d932
feat(ui): add Card elevation variants
austincalvelage Jul 31, 2026
c53b67c
docs(ui): expose Card elevation controls
austincalvelage Jul 31, 2026
39a52e8
feat(ui): align Card elevation variants
austincalvelage Jul 31, 2026
7575e06
Merge branch 'main' into austin/mosaic-card-component
austincalvelage Jul 31, 2026
acd3bdd
refactor(ui): separate Card elevation styles
austincalvelage Jul 31, 2026
bcec0e5
Merge branch 'main' into austin/mosaic-card-component
austincalvelage Jul 31, 2026
6bdcfda
refactor(ui): align Card with Mosaic component props
austincalvelage Jul 31, 2026
60221b8
docs(swingset): use Card compound API in Popover examples
austincalvelage Jul 31, 2026
bc43056
refactor: Move ‘rest’ spread after ‘mergeStyleProps’
austincalvelage Jul 31, 2026
1248e1f
refactor(ui): align Card elevation names with Figma
austincalvelage Jul 31, 2026
3546d65
fix(ui): inherit Card footer background
austincalvelage Jul 31, 2026
f70d3bc
fix(ui): adapt Card shadows for dark mode
austincalvelage Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/mosaic-card-stylex.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
4 changes: 2 additions & 2 deletions packages/swingset/src/stories/card.component.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ A styled surface container that groups related content into Header, Content, and
```tsx
import { Card } from '@clerk/ui/mosaic/components/card';

<Card>
<Card.Root>
<Card.Header>Heading</Card.Header>
<Card.Content>Body content.</Card.Content>
<Card.Footer>Footer actions</Card.Footer>
</Card>
</Card.Root>
```

---
Expand Down
24 changes: 17 additions & 7 deletions packages/swingset/src/stories/card.component.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @jsxImportSource @emotion/react */
import { Button } from '@clerk/ui/mosaic/components/button';
import type { CardProps } from '@clerk/ui/mosaic/components/card';
import { Card, cardRecipe } from '@clerk/ui/mosaic/components/card';
import { Card } from '@clerk/ui/mosaic/components/card';
import { Heading } from '@clerk/ui/mosaic/components/heading';
import { Text } from '@clerk/ui/mosaic/components/text';

Expand All @@ -14,8 +14,18 @@ export { default as __source } from './card.component.stories?raw';
export const meta: StoryMeta = {
group: 'Components',
title: 'Card',
source: 'packages/ui/src/mosaic/components/card.tsx',
styles: cardRecipe,
source: 'packages/ui/src/mosaic/components/card/card.tsx',
styleEngine: 'stylex',
styles: {
_variants: {
alignment: { start: {}, center: {} },
elevation: { card: {}, flush: {}, overlay: {} },
},
_defaultVariants: {
alignment: 'start',
elevation: 'card',
},
},
};

function knobsAsProps(props: Record<string, unknown>) {
Expand All @@ -24,7 +34,7 @@ function knobsAsProps(props: Record<string, unknown>) {

export function Default(props: Record<string, unknown>) {
return (
<Card
<Card.Root
{...knobsAsProps(props)}
style={{ maxWidth: 400 }}
>
Expand All @@ -36,13 +46,13 @@ export function Default(props: Record<string, unknown>) {
<Card.Footer>
<Button fullWidth>Continue</Button>
</Card.Footer>
</Card>
</Card.Root>
);
}

export function Centered() {
return (
<Card
<Card.Root
alignment='center'
style={{ maxWidth: 400 }}
>
Expand All @@ -54,6 +64,6 @@ export function Centered() {
<Card.Footer>
<Button fullWidth>Verify</Button>
</Card.Footer>
</Card>
</Card.Root>
);
}
20 changes: 10 additions & 10 deletions packages/swingset/src/stories/popover.component.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { Popover } from '@clerk/ui/mosaic/components/popover';
<Popover.Root>
<Popover.Trigger render={props => <Button {...props}>Open popover</Button>} />
<Popover.Popup aria-label='Account'>
<Card>
<Card.Root>
<Card.Content>Flexible inner content.</Card.Content>
<Card.Footer>
<Button
Expand All @@ -39,7 +39,7 @@ import { Popover } from '@clerk/ui/mosaic/components/popover';
Sign out of all accounts
</Button>
</Card.Footer>
</Card>
</Card.Root>
</Popover.Popup>
</Popover.Root>;
```
Expand All @@ -61,9 +61,9 @@ neither logs a development warning.
<Popover.Root>
<Popover.Trigger>Open</Popover.Trigger>
<Popover.Popup aria-label='Account'>
<Card>
<Card.Root>
<Card.Content>Flexible inner content.</Card.Content>
</Card>
</Card.Root>
</Popover.Popup>
</Popover.Root>;
```
Expand All @@ -79,9 +79,9 @@ const [open, setOpen] = useState(false);
>
<Popover.Trigger>Open</Popover.Trigger>
<Popover.Popup aria-label='Account'>
<Card>
<Card.Root>
<Card.Content>Flexible inner content.</Card.Content>
</Card>
</Card.Root>
</Popover.Popup>
</Popover.Root>;
```
Expand All @@ -97,9 +97,9 @@ region.
<Popover.Root>
<Popover.Trigger>Open</Popover.Trigger>
<Popover.Popup size='lg'>
<Card>
<Card.Root>
<Card.Content>A wider panel.</Card.Content>
</Card>
</Card.Root>
</Popover.Popup>
</Popover.Root>;
```
Expand Down Expand Up @@ -135,9 +135,9 @@ centering on it.
>
<Popover.Trigger>Open</Popover.Trigger>
<Popover.Popup aria-label='Account'>
<Card>
<Card.Root>
<Card.Content>Aligned to the trigger's end edge.</Card.Content>
</Card>
</Card.Root>
</Popover.Popup>
</Popover.Root>;
```
Expand Down
8 changes: 4 additions & 4 deletions packages/swingset/src/stories/popover.component.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function Default() {
<Popover.Root>
<Popover.Trigger render={props => <Button {...props}>Open popover</Button>} />
<Popover.Popup aria-label='Account'>
<Card>
<Card.Root>
<Card.Header>
<Heading size='sm'>Ada Lovelace</Heading>
<Text>ada@example.com</Text>
Expand All @@ -36,7 +36,7 @@ export function Default() {
Sign out of all accounts
</Button>
</Card.Footer>
</Card>
</Card.Root>
</Popover.Popup>
</Popover.Root>
);
Expand All @@ -48,11 +48,11 @@ export function Default() {
const labelledTrigger = (label: string) => <Button variant='outline'>{label}</Button>;

const panel = (label: string) => (
<Card>
<Card.Root>
<Card.Content style={{ paddingBlock: '1rem' }}>
<Text>{label}</Text>
</Card.Content>
</Card>
</Card.Root>
);

export function Placement() {
Expand Down
134 changes: 0 additions & 134 deletions packages/ui/src/mosaic/components/card.tsx
View file
Open in desktop

This file was deleted.

75 changes: 75 additions & 0 deletions packages/ui/src/mosaic/components/card/card.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import * as stylex from '@stylexjs/stylex';

import { colorVars, radiusVars, space } from '../../tokens.stylex';

export const styles = stylex.create({
root: {
color: colorVars['--cl-color-card-foreground'],
display: 'flex',
flexDirection: 'column',
rowGap: space['5'],
width: '100%',
},
header: {
paddingInline: space['4'],
display: 'flex',
flexDirection: 'column',
paddingBlockStart: space['5'],
},
content: {
paddingInline: space['4'],
flexBasis: 'auto',
flexGrow: '1',
flexShrink: '1',
},
footer: {
gap: space['2'],
paddingBlock: space['4'],
paddingInline: space['6'],
alignItems: 'center',
boxSizing: 'border-box',
display: 'flex',
flexShrink: 0,
justifyContent: 'space-between',
borderTopColor: colorVars['--cl-color-border'],
borderTopStyle: 'solid',
borderTopWidth: '1px',
width: '100%',
},
});

export const elevations = stylex.create({
card: {
borderRadius: radiusVars['--cl-radius-container'],
overflow: 'hidden',
backgroundColor: colorVars['--cl-color-card'],
boxShadow: `0 12px 12px -7px light-dark(oklch(0.2046 0 0 / 12%), transparent),
0 24px 24px -10px light-dark(oklch(0.2046 0 0 / 4%), transparent),
0 0 0 1px light-dark(oklch(0.2046 0 0 / 4%), oklch(1 0 0 / 10%))`,
},
flush: {
borderRadius: radiusVars['--cl-radius-container'],
overflow: 'visible',
backgroundColor: 'transparent',
boxShadow: 'none',
},
overlay: {
borderRadius: radiusVars['--cl-radius-container'],
overflow: 'hidden',
backgroundColor: colorVars['--cl-color-card'],
boxShadow: `0 12px 12px -7px light-dark(oklch(0.2046 0 0 / 12%), transparent),
0 24px 24px -10px light-dark(oklch(0.2046 0 0 / 4%), transparent),
0 0 0 1px light-dark(oklch(0.2046 0 0 / 4%), oklch(1 0 0 / 10%))`,
},
Comment on lines +56 to +63

@maxyinger maxyinger Jul 31, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this a placeholder for now? or a backwards compatibility thing? (noticing it mirrors raised)

@austincalvelage austincalvelage Jul 31, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So in the Figma, these currently mirror each other. I'd assume these eventually would differ?

@maxyinger maxyinger Jul 31, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool cool. yea I'm guessing so too 🤷 . so basically just a placeholder for now I guess while a shadowing system is still tbd

@maxyinger maxyinger Jul 31, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want to move away from that 0 0 0 1px oklch(0.2046 0 0 / 4%) shadow tho.. maybe worth syncing up with @stvhayes here

});

export const headerAlignments = stylex.create({
start: {
alignItems: 'flex-start',
textAlign: 'start',
},
center: {
alignItems: 'center',
textAlign: 'center',
},
});
Loading
Loading