Skip to content

[pull] main from adobe:main #460

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

Merged
pull merged 1 commit into from
Jul 29, 2026
Merged

[pull] main from adobe:main #460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions packages/@react-spectrum/ai/src/style/prose.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ interface MacroContext {

const marginTop = {
body: getToken('body-margin-multiplier') + 'em',
heading: getToken('heading-margin-top-multiplier') + 'em',
title: getToken('title-margin-top-multiplier') + 'em',
detail: getToken('detail-margin-top-multiplier') + 'em'
heading: 1 + 'em',
title: 1 + 'em',
detail: 1 + 'em'
} as const;

const marginBottom = {
body: getToken('body-margin-multiplier') + 'em',
heading: getToken('heading-margin-bottom-multiplier') + 'em',
title: getToken('title-margin-bottom-multiplier') + 'em',
detail: getToken('detail-margin-bottom-multiplier') + 'em'
detail: 1 + 'em'
} as const;

export function prose(this: MacroContext | void) {
Expand Down Expand Up @@ -99,6 +99,10 @@ export function prose(this: MacroContext | void) {
ol: {
listStyleType: 'decimal'
},
li: {
marginTop: '.25em',
marginBottom: '.25em'
},
'li > p:last-child:not(:first-child)': {
marginBottom: marginBottom.body
},
Expand All @@ -109,8 +113,8 @@ export function prose(this: MacroContext | void) {
borderColor: colorTokenToString(resolveColorToken(colorToken('gray-200'))),
borderInlineStartWidth: getToken('border-width-200'),
// Padding uses px, spacing (margin) uses rem — matching the style macro's maps.
paddingInlineStart: '12px',
marginInlineStart: space(4)
paddingInlineStart: '14px',
marginInlineStart: space(8)
},
hr: {
marginBlock: '32px',
Expand Down Expand Up @@ -174,22 +178,25 @@ export function prose(this: MacroContext | void) {
borderStartEndRadius: getToken('corner-radius-medium-default')
},
th: {
// height behaves like minHeight in a table
height: 32,
paddingInline: '16px',
paddingBlock: '4px',
textAlign: 'start',
fontWeight: 'bold',
borderColor: colorTokenToString(resolveColorToken(colorToken('gray-300'))),
borderWidth: 0,
borderBottomWidth: getToken('border-width-100'),
borderStyle: 'solid',
height: '32px',
boxSizing: 'border-box'
},
td: {
height: 32,
paddingInline: '16px',
paddingBlock: '4px',
borderWidth: 0,
borderBottomWidth: {
default: '1px',
default: getToken('border-width-100'),
':is(tbody:last-child > tr:last-child > *)': 0
},
borderStyle: 'solid',
Expand Down
Loading