Skip to content

Add support for gap prop to Button #33142

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
ravicious merged 2 commits into from
Oct 9, 2023
Merged

Add support for gap prop to Button #33142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d0d158
Reformat buttons story away from using spacing on individual elements
ravicious Oct 9, 2023
102b959
Add support for gap prop to Button
ravicious Oct 5, 2023
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: 4 additions & 1 deletion web/packages/design/src/Button/Button.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import React from 'react';
import styled from 'styled-components';
import { bool, string } from 'prop-types';

import { space, width, height, alignSelf } from 'design/system';
import { space, width, height, alignSelf, gap } from 'design/system';

const Button = ({ children, setRef, ...props }) => {
return (
Expand Down Expand Up @@ -86,6 +86,9 @@ const themedStyles = props => {
...height(props),
...textTransform(props),
...alignSelf(props),
// Since a Button has `display: inline-flex`, we want to be able to set gap within it in case we
// need to use an icon.
...gap(props),
};
};

Expand Down
68 changes: 39 additions & 29 deletions web/packages/design/src/buttons.story.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,40 @@ export default {
};

export const Buttons = () => (
<>
<ButtonPrimary mr={3}>Primary</ButtonPrimary>
<ButtonSecondary mr={3}>Secondary</ButtonSecondary>
<ButtonBorder mr={3}>Border</ButtonBorder>
<ButtonWarning mb={5}>Warning</ButtonWarning>
<div />
<Button size="large" mr={3}>
Large
</Button>
<Button size="medium" mr={3}>
Medium
</Button>
<Button size="small">Small</Button>
<Button block mb={3} mt={4}>
block = true
</Button>
<Button mr={3} disabled>
Disabled
</Button>
<Button mb={3} autoFocus>
Focused
</Button>
<div />
<ButtonLink href="">Button Link</ButtonLink>
<ButtonText>Button Text</ButtonText>
<Flex mb={3}>
<Flex gap={4} flexDirection="column" alignItems="flex-start">
<Flex gap={3}>
<ButtonPrimary>Primary</ButtonPrimary>
<ButtonSecondary>Secondary</ButtonSecondary>
<ButtonBorder>Border</ButtonBorder>
<ButtonWarning>Warning</ButtonWarning>
</Flex>

<Flex gap={3} alignItems="center">
<Button size="large">Large</Button>
<Button size="medium">Medium</Button>
<Button size="small">Small</Button>
</Flex>

<Button block>block = true</Button>

<Flex gap={3}>
<Button disabled>Disabled</Button>
<Button autoFocus>Focused</Button>
</Flex>

<Flex gap={3}>
<ButtonPrimary gap={2}>
<AddUsers />
Add users
</ButtonPrimary>
</Flex>

<Flex gap={3}>
<ButtonLink href="">Button Link</ButtonLink>
<ButtonText>Button Text</ButtonText>
</Flex>

<Flex gap={3}>
<ButtonIcon size={2}>
<AddUsers />
</ButtonIcon>
Expand All @@ -69,7 +77,8 @@ export const Buttons = () => (
<Trash />
</ButtonIcon>
</Flex>
<Flex mb={4}>

<Flex gap={3}>
<ButtonIcon size={1}>
<AddUsers />
</ButtonIcon>
Expand All @@ -80,7 +89,8 @@ export const Buttons = () => (
<Trash />
</ButtonIcon>
</Flex>
<Flex>

<Flex gap={3}>
<ButtonIcon size={0}>
<AddUsers />
</ButtonIcon>
Expand All @@ -91,5 +101,5 @@ export const Buttons = () => (
<Trash />
</ButtonIcon>
</Flex>
</>
</Flex>
);