Skip to content

[Layout] Add responsive gap support to Inline #7754

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 10 commits into from
Nov 18, 2022
Merged

[Layout] Add responsive gap support to Inline #7754

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1488330
Add support for responsive `gap` on `Inline`
aveline Nov 17, 2022
f5e5aa0
Run `get-props`
aveline Nov 17, 2022
063a3e0
changeset
aveline Nov 17, 2022
b1cb04d
Update polaris-react/src/components/Inline/Inline.tsx
aveline Nov 18, 2022
2eac440
Update polaris-react/src/components/Inline/Inline.tsx
aveline Nov 18, 2022
011e1d5
Merge branch 'main' into layout-inline-responsive-gap
aveline Nov 18, 2022
2bdbd70
PR feedback
aveline Nov 18, 2022
e3e7486
Update props.json
aveline Nov 18, 2022
39be51f
Merge branch 'main' into layout-inline-responsive-gap
aveline Nov 18, 2022
2b5fe73
Update props.json
aveline Nov 18, 2022
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
6 changes: 6 additions & 0 deletions .changeset/ten-peaches-exist.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@shopify/polaris': minor
'polaris.shopify.com': minor
---

Added support for responsive `gap` on `Inline`
4 changes: 3 additions & 1 deletion polaris-react/src/components/Inline/Inline.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@import '../../styles/common';

.Inline {
@include responsive-props('inline', 'gap', 'gap');
display: flex;
gap: var(--pc-inline-gap);
flex-wrap: var(--pc-inline-wrap);
align-items: var(--pc-inline-block-align);
justify-content: var(--pc-inline-align);
Expand Down
30 changes: 23 additions & 7 deletions polaris-react/src/components/Inline/Inline.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import React from 'react';
import type {ComponentMeta} from '@storybook/react';
import {Box, Badge, Icon, Inline, Thumbnail} from '@shopify/polaris';
import {
Box,
Badge,
Icon,
Inline,
Thumbnail,
AlphaStack,
} from '@shopify/polaris';
import {CapitalMajor, ImageMajor} from '@shopify/polaris-icons';

export default {
Expand Down Expand Up @@ -162,11 +169,20 @@ export function NonWrapping() {

export function Gap() {
return (
<Inline gap="8">
<Badge>Paid</Badge>
<Badge>Processing</Badge>
<Badge>Fulfilled</Badge>
<Badge>Completed</Badge>
</Inline>
<AlphaStack>
<Inline gap="8">
<Badge>Paid</Badge>
<Badge>Processing</Badge>
<Badge>Fulfilled</Badge>
<Badge>Completed</Badge>
</Inline>

<Inline gap={{xs: '2', md: '4'}}>
<Badge>Paid</Badge>
<Badge>Processing</Badge>
<Badge>Fulfilled</Badge>
<Badge>Completed</Badge>
</Inline>
</AlphaStack>
);
}
14 changes: 11 additions & 3 deletions polaris-react/src/components/Inline/Inline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import React from 'react';
import type {SpacingSpaceScale} from '@shopify/polaris-tokens';

import {getResponsiveProps} from '../../utilities/css';
import type {ResponsiveProp} from '../../utilities/css';

import styles from './Inline.scss';

type Align =
Expand All @@ -12,6 +15,8 @@ type Align =
| 'space-evenly';
type BlockAlign = 'start' | 'center' | 'end' | 'baseline' | 'stretch';

type Spacing = ResponsiveProp<SpacingSpaceScale>;

export interface InlineProps {
/** Adjust horizontal alignment of elements
* @default 'start'
Expand All @@ -21,10 +26,13 @@ export interface InlineProps {
* @default 'center'
*/
blockAlign?: BlockAlign;
/** The spacing between elements
/** The spacing between elements. Accepts a spacing token or an object of spacing tokens for different screen sizes.
* @default '4'
* @example
* gap='2'
* gap={{xs: '2', md: '4'}}
*/
gap?: SpacingSpaceScale;
gap?: Spacing;
/** Wrap stack elements to additional rows as needed on small screens
* @default true
*/
Expand All @@ -44,7 +52,7 @@ export const Inline = function Inline({
'--pc-inline-align': align,
'--pc-inline-block-align': blockAlign,
'--pc-inline-wrap': wrap ? 'wrap' : 'nowrap',
'--pc-inline-gap': `var(--p-space-${gap})`,
...getResponsiveProps('inline', 'gap', 'space', gap),
} as React.CSSProperties;

return (
Expand Down
Loading