Skip to content

Refactor: Disclosure button label size update to match new sizes from Spectrum #8006

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
merged 2 commits into from
Apr 9, 2025
Merged

Refactor: Disclosure button label size update to match new sizes from Spectrum #8006

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
603a5e5
Disclosure button label size update to match new sizes from Specturm
ktabors Mar 28, 2025
d77227a
Merge branch 'main' into disclosure-size-shift
dannify Apr 1, 2025
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
42 changes: 18 additions & 24 deletions packages/@react-spectrum/s2/src/Disclosure.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ const buttonStyles = style({
fontWeight: 'bold',
fontSize: {
size: {
S: 'heading-xs',
M: 'heading-sm',
L: 'heading',
XL: 'heading-lg'
S: 'title-sm',
M: 'title',
L: 'title-lg',
XL: 'title-xl'
}
},
lineHeight: 'ui',
Copy link
Member

@snowystinger snowystinger Apr 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

shouldn't this be lineHeight: 'title' as well?
I see that's not the case in the figma spec, but I don't follow why

Copy link
Member

Choose a reason for hiding this comment

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

let's ask spectrum and we can make it a follow up

Expand All @@ -147,32 +147,32 @@ const buttonStyles = style({
// compact is equivalent to 'control', but other densities have more padding.
size: {
S: {
density: {
compact: 18,
regular: 24,
spacious: 32
}
},
M: {
density: {
compact: 24,
regular: 32,
spacious: 40
}
},
M: {
L: {
density: {
compact: 32,
regular: 40,
spacious: 48
}
},
L: {
XL: {
density: {
compact: 40,
regular: 48,
spacious: 56
}
},
XL: {
density: {
compact: 48,
regular: 56,
spacious: 64
}
}
}
},
Expand Down Expand Up @@ -219,18 +219,12 @@ function DisclosureHeaderWithForwardRef(props: DisclosureHeaderProps, ref: DOMRe
let domRef = useDOMRef(ref);
let {size, isQuiet, density} = useSlottedContext(DisclosureContext)!;

let mapSize = {
S: 'XS',
M: 'S',
L: 'M',
XL: 'L'
};

// maps to one size smaller in the compact density to ensure there is space between the top and bottom of the action button and container
// Shift button size down by 2 for compact density, 1 for regular/spacious to ensure there is space between the top and bottom of the action button and container
let newSize : 'XS' | 'S' | 'M' | 'L' | 'XL' | undefined = size;
if (density === 'compact') {
newSize = mapSize[size ?? 'M'] as 'XS' | 'S' | 'M' | 'L';
}
const sizes = ['XS', 'S', 'M', 'L', 'XL'];
const currentIndex = sizes.indexOf(size ?? 'M');
const shift = density === 'compact' ? 2 : 1;
newSize = sizes[Math.max(0, currentIndex - shift)] as 'XS' | 'S' | 'M' | 'L' | 'XL';

return (
<Provider
Expand Down