Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/mighty-parrots-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

`StackItem` responsive grow bug fix
18 changes: 13 additions & 5 deletions packages/react/src/Stack/Stack.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -377,23 +377,31 @@ const StyledStackItem = styled.div`
flex: 0 1 auto;
min-inline-size: 0;

&[data-grow],
&[data-grow-narrow] {
&[data-grow='true'],
&[data-grow-narrow='true'] {
flex-grow: 1;
}

// @custom-media --veiwportRange-regular
@media (min-width: 48rem) {
&[data-grow-regular] {
&[data-grow-regular='true'] {
flex-grow: 1;
}

&[data-grow-regular='false'] {
flex-grow: 0;
}
}

// @custom-media --viewportRange-wide
@media (min-width: 87.5rem) {
&[data-grow-wide] {
&[data-grow-wide='true'] {
flex-grow: 1;
}

&[data-grow-wide='false'] {
flex-grow: 0;
}
}
`

Expand All @@ -413,7 +421,7 @@ type StackItemProps<As> = React.PropsWithChildren<{
function StackItem<As extends ElementType>({
as,
children,
grow = false,
grow,
...rest
}: StackItemProps<As> & React.ComponentPropsWithoutRef<ElementType extends As ? As : 'div'>) {
const BaseComponent = as ?? 'div'
Expand Down
10 changes: 5 additions & 5 deletions packages/react/src/Stack/__tests__/StackItem.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ describe('StackItem', () => {
<StackItem data-testid="grow-false" />
</Stack>,
)
expect(screen.getByTestId('grow-true')).toHaveAttribute('data-grow', '')
expect(screen.getByTestId('grow-false')).not.toHaveAttribute('data-grow')
expect(screen.getByTestId('grow-true')).toHaveAttribute('data-grow', 'true')
expect(screen.getByTestId('grow-false')).not.toHaveAttribute('data-grow', 'false')
})

it('should support responsive `grow` values', () => {
Expand All @@ -29,9 +29,9 @@ describe('StackItem', () => {
<StackItem data-testid="responsive-grow" grow={{narrow: true, regular: false, wide: true}} />
</Stack>,
)
expect(screen.getByTestId('responsive-grow')).toHaveAttribute('data-grow-narrow', '')
expect(screen.getByTestId('responsive-grow')).not.toHaveAttribute('data-grow-regular')
expect(screen.getByTestId('responsive-grow')).toHaveAttribute('data-grow-wide', '')
expect(screen.getByTestId('responsive-grow')).toHaveAttribute('data-grow-narrow', 'true')
expect(screen.getByTestId('responsive-grow')).toHaveAttribute('data-grow-regular', 'false')
expect(screen.getByTestId('responsive-grow')).toHaveAttribute('data-grow-wide', 'true')
})

it('should render a custom component with the `as` prop', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe('getResponsiveAttributes', () => {

test('property with boolean value', () => {
expect(getResponsiveAttributes('grow', true)).toMatchObject({
'data-grow': '',
'data-grow': true,
})

expect(getResponsiveAttributes('grow', false)).toMatchObject({})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,5 @@ export function getResponsiveAttributes<T>(
}

function serialize<T>(property: string, value: T) {
if (typeof value === 'boolean') {
if (value) {
return [property, '']
}
return []
}

return [property, value]
}