Skip to content

Commit cbbb564

Browse files
authored
[Layout] Remove Columns default spacing (#8484)
### WHY are these changes introduced? Fixes #8366 ### WHAT is this pull request doing? Removes default spacing from `Columns` and updates instances of `Columns` with adjusted `gap` values
1 parent cc706f4 commit cbbb564

File tree

6 files changed

+839
-849
lines changed

6 files changed

+839
-849
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/polaris': minor
3+
---
4+
5+
Removed default `gap` from `Columns`

polaris-react/src/components/Columns/Columns.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@ export interface ColumnsProps {
2525
*/
2626
columns?: Columns;
2727
/** The spacing between children. Accepts a spacing token or an object of spacing tokens for different screen sizes.
28-
* @default '4'
2928
* @example
3029
* gap='2'
3130
* gap={{xs: '1', sm: '2', md: '3', lg: '4', xl: '5'}}
3231
*/
3332
gap?: Gap;
3433
}
3534

36-
export function Columns({children, columns, gap = '4'}: ColumnsProps) {
35+
export function Columns({children, columns, gap}: ColumnsProps) {
3736
const style = {
3837
...getResponsiveValue(
3938
'columns',

polaris-react/src/components/Columns/tests/Columns.test.tsx

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@ import {mountWithApp} from 'tests/utilities';
44
import {Columns} from '..';
55

66
describe('Columns', () => {
7-
it('renders custom properties with default values', () => {
8-
const columns = mountWithApp(<Columns />);
9-
10-
expect(columns).toContainReactComponent('div', {
11-
style: {
12-
'--pc-columns-gap-xs': 'var(--p-space-4)',
13-
} as React.CSSProperties,
14-
});
15-
});
16-
177
it('only renders custom properties that match the properties passed in', () => {
188
const columns = mountWithApp(<Columns gap={{md: '1'}} />);
199

@@ -33,7 +23,6 @@ describe('Columns', () => {
3323
style: {
3424
'--pc-columns-grid-template-columns-xs': '1fr 1fr',
3525
'--pc-columns-grid-template-columns-lg': '1.5fr 0.5fr',
36-
'--pc-columns-gap-xs': 'var(--p-space-4)',
3726
} as React.CSSProperties,
3827
});
3928
});
@@ -45,7 +34,6 @@ describe('Columns', () => {
4534
style: {
4635
'--pc-columns-grid-template-columns-xs': 'repeat(1, minmax(0, 1fr))',
4736
'--pc-columns-grid-template-columns-md': 'repeat(4, minmax(0, 1fr))',
48-
'--pc-columns-gap-xs': 'var(--p-space-4)',
4937
} as React.CSSProperties,
5038
});
5139
});
@@ -63,7 +51,6 @@ describe('Columns', () => {
6351
'minmax(0, 1fr) minmax(0, 1fr)',
6452
'--pc-columns-grid-template-columns-md':
6553
'minmax(0, 1fr) minmax(0, 2fr)',
66-
'--pc-columns-gap-xs': 'var(--p-space-4)',
6754
} as React.CSSProperties,
6855
});
6956
});

polaris-react/src/components/Modal/components/Header/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export function Header({
4141
paddingInlineEnd="5"
4242
borderBlockEnd="divider"
4343
>
44-
<Columns columns={{xs: '1fr auto'}}>
44+
<Columns columns={{xs: '1fr auto'}} gap="4">
4545
<Inline gap="4">
4646
<Text id={id} as="h2" variant="headingLg" breakWord>
4747
{children}

polaris-react/src/components/ResourceItem/ResourceItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ class BaseResourceItem extends Component<CombinedProps, State> {
290290
paddingInlineEnd={{xs: '4', sm: '5'}}
291291
zIndex="var(--pc-resource-item-content-stacking-order)"
292292
>
293-
<Columns columns={{xs: '1fr auto'}} gap="0">
293+
<Columns columns={{xs: '1fr auto'}}>
294294
<Columns
295295
columns={{xs: media || selectable ? 'auto 1fr' : '1fr'}}
296296
gap="5"

0 commit comments

Comments
 (0)