Skip to content

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

TypeScript

fix(SegmentedControl): keep hug layout content-sized in flex stacks (#6643)

Cindy Zhangc82ebb865b0b
diff --git a/.changeset/keep-hug-layout-segmented-controls-content-sized-ornf.md b/.changeset/keep-hug-layout-segmented-controls-content-sized-ornf.md
new file mode 100644
index 0000000000..8a99869221
--- /dev/null
+++ b/.changeset/keep-hug-layout-segmented-controls-content-sized-ornf.md
@@ -0,0 +1,6 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] Keep hug-layout segmented controls content-sized in flex containers
+@cixzhang
diff --git a/apps/storybook/stories/SegmentedControl.stories.tsx b/apps/storybook/stories/SegmentedControl.stories.tsx
index 5d973b41f3..16a932f721 100644
--- a/apps/storybook/stories/SegmentedControl.stories.tsx
+++ b/apps/storybook/stories/SegmentedControl.stories.tsx
@@ -7,6 +7,7 @@ import {
SegmentedControlItem,
} from '@astryxdesign/core/SegmentedControl';
import {Icon} from '@astryxdesign/core/Icon';
+import {VStack} from '@astryxdesign/core/Stack';
import {
Squares2X2Icon,
ListBulletIcon,
@@ -60,6 +61,26 @@ export const Default: Story = {
},
};
+export const InVerticalStack: Story = {
+ name: 'Inside a vertical stack',
+ render: () => {
+ const [value, setValue] = useState('viewer');
+ return (
+ <VStack width="100%">
+ <SegmentedControl
+ value={value}
+ onChange={setValue}
+ label="Access level"
+ layout="hug">
+ <SegmentedControlItem value="viewer" label="Viewer" />
+ <SegmentedControlItem value="operator" label="Operator" />
+ <SegmentedControlItem value="owner" label="Owner" />
+ </SegmentedControl>
+ </VStack>
+ );
+ },
+};
+
export const WithIcons: Story = {
args: {
size: 'md',
diff --git a/packages/core/src/SegmentedControl/SegmentedControl.test.tsx b/packages/core/src/SegmentedControl/SegmentedControl.test.tsx
index 699046b8ef..35561f69fe 100644
--- a/packages/core/src/SegmentedControl/SegmentedControl.test.tsx
+++ b/packages/core/src/SegmentedControl/SegmentedControl.test.tsx
@@ -168,6 +168,36 @@ describe('SegmentedControl', () => {
expect(screen.queryByText('Grid view')).not.toBeInTheDocument();
});
+ it('keeps hug layout content-sized inside a stretching flex parent', () => {
+ render(
+ <div style={{display: 'flex', flexDirection: 'column'}}>
+ <SegmentedControl value="grid" onChange={() => {}} label="View mode">
+ <SegmentedControlItem value="grid" label="Grid" />
+ <SegmentedControlItem value="list" label="List" />
+ </SegmentedControl>
+ </div>,
+ );
+
+ expect(getComputedStyle(screen.getByRole('radiogroup')).width).toBe(
+ 'fit-content',
+ );
+ });
+
+ it('fill layout overrides the intrinsic control width', () => {
+ render(
+ <SegmentedControl
+ value="grid"
+ onChange={() => {}}
+ label="View mode"
+ layout="fill">
+ <SegmentedControlItem value="grid" label="Grid" />
+ <SegmentedControlItem value="list" label="List" />
+ </SegmentedControl>,
+ );
+
+ expect(getComputedStyle(screen.getByRole('radiogroup')).width).toBe('100%');
+ });
+
it('fill items can shrink and truncate long labels', () => {
render(
<SegmentedControl
diff --git a/packages/core/src/SegmentedControl/SegmentedControl.tsx b/packages/core/src/SegmentedControl/SegmentedControl.tsx
index f73e304b33..53ef103b6b 100644
--- a/packages/core/src/SegmentedControl/SegmentedControl.tsx
+++ b/packages/core/src/SegmentedControl/SegmentedControl.tsx
@@ -56,7 +56,7 @@ export interface SegmentedControlProps extends Omit<
size?: SegmentedControlSize;
/**
* Layout mode for segment sizing.
- * - `'hug'` (default): each segment hugs its content width.
+ * - `'hug'` (default): the control and each segment hug their content width.
* - `'fill'`: segments stretch equally to fill the container width.
* @default 'hug'
*/
@@ -91,6 +91,7 @@ const styles = stylex.create({
container: {
display: 'inline-flex',
alignItems: 'center',
+ width: 'fit-content',
gap: spacingVars['--spacing-0-5'],
'--_segmented-control-padding': spacingVars['--spacing-0-5'],
padding: 'var(--_segmented-control-padding)',