Skip to content
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

feat: ButtonWrapper prop in Button to customise rendering #41

Merged
merged 5 commits into from
Jun 29, 2019
Merged

feat: ButtonWrapper prop in Button to customise rendering #41

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7fe082
feat: ButtonWrapper prop in Button to customise rendering
jsomsanith Jun 27, 2019
a20100e
Add wrapper in Button stories
jsomsanith Jun 28, 2019
4379c88
refactor: use StoryLinkWrapper for ButtonWrapper link implementation
kylesuss Jun 28, 2019
3bb78f2
Remove non native attributes
jsomsanith Jun 28, 2019
75a6d3d
Remove unnecessary if
jsomsanith Jun 28, 2019
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
35 changes: 23 additions & 12 deletions src/components/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const SIZES = {
MEDIUM: 'medium',
};

const ButtonWrapper = styled.button`
const StyledButton = styled.button`
border: 0;
border-radius: 3em;
cursor: pointer;
Expand Down Expand Up @@ -305,27 +305,36 @@ const ButtonWrapper = styled.button`

`;

const ButtonLink = ButtonWrapper.withComponent('a');

export function Button({ isDisabled, isLoading, loadingText, isLink, children, ...props }) {
const ButtonLink = StyledButton.withComponent('a');

export function Button({
isDisabled,
isLoading,
loadingText,
isLink,
children,
ButtonWrapper,
...props
}) {
const buttonInner = (
<Fragment>
<Text>{children}</Text>
{isLoading && <Loading>{loadingText || 'Loading...'}</Loading>}
</Fragment>
);

if (isLink) {
return (
<ButtonLink isLoading={isLoading} disabled={isDisabled} {...props}>
{buttonInner}
</ButtonLink>
);
let SelectedButton = StyledButton;
if (ButtonWrapper) {
const StyledButtonWrapper = StyledButton.withComponent(ButtonWrapper);
SelectedButton = StyledButtonWrapper;
} else if (isLink) {
SelectedButton = ButtonLink;
}

return (
<ButtonWrapper isLoading={isLoading} disabled={isDisabled} {...props}>
<SelectedButton isLoading={isLoading} disabled={isDisabled} {...props}>
{buttonInner}
</ButtonWrapper>
</SelectedButton>
);
}

Expand All @@ -351,6 +360,7 @@ Button.propTypes = {
*/
containsIcon: PropTypes.bool,
size: PropTypes.oneOf(Object.values(SIZES)),
ButtonWrapper: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
};

Button.defaultProps = {
Expand All @@ -362,4 +372,5 @@ Button.defaultProps = {
isUnclickable: false,
containsIcon: false,
size: SIZES.MEDIUM,
ButtonWrapper: undefined,
};
227 changes: 227 additions & 0 deletions src/components/Button.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
import React from 'react';
import { storiesOf } from '@storybook/react';
import styled from 'styled-components';
import { action } from '@storybook/addon-actions';

import { Button } from './Button';
import { Icon } from './Icon';
import { StoryLinkWrapper } from './StoryLinkWrapper';

const CustomButton = styled.button`
border: 1px solid green;
background: lightgreen;
color: rebeccapurple;
padding: 1.5em;
font-size: 1.5em;
`;

function ButtonWrapper(props) {
return <CustomButton onClick={action('button action click')} {...props} />;
}

storiesOf('Design System|Button', module)
.addParameters({ component: Button })
Expand Down Expand Up @@ -56,4 +72,215 @@ storiesOf('Design System|Button', module)
Link
</Button>
</div>
))
.add('button wrapper', () => (
<div>
<ButtonWrapper>Original Button Wrapper</ButtonWrapper>
<br />
<Button ButtonWrapper={ButtonWrapper} appearance="primary">
Primary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="secondary">
Secondary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="tertiary">
Tertiary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="outline">
Outline
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="primaryOutline">
Outline primary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="secondaryOutline">
Outline secondary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="primary" isDisabled>
Disabled
</Button>
<br />
<Button ButtonWrapper={ButtonWrapper} appearance="primary" isLoading>
Primary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="secondary" isLoading>
Secondary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="tertiary" isLoading>
Tertiary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="outline" isLoading>
Outline
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="outline" isLoading loadingText="Custom...">
Outline
</Button>
<br />
<Button ButtonWrapper={ButtonWrapper} appearance="primary" size="small">
Primary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="secondary" size="small">
Secondary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="tertiary" size="small">
Tertiary
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="outline" size="small">
Outline
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="primary" isDisabled size="small">
Disabled
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="outline" size="small" containsIcon>
<Icon icon="link" aria-label="Link" />
</Button>
<Button ButtonWrapper={ButtonWrapper} appearance="outline" size="small">
<Icon icon="link" />
Link
</Button>
</div>
))

.add('anchor wrapper', () => (
<div>
<Button ButtonWrapper={StoryLinkWrapper} appearance="primary" href="http://storybook.js.org">
Primary
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="secondary"
href="http://storybook.js.org"
>
Secondary
</Button>
<Button ButtonWrapper={StoryLinkWrapper} appearance="tertiary" href="http://storybook.js.org">
Tertiary
</Button>
<Button ButtonWrapper={StoryLinkWrapper} appearance="outline" href="http://storybook.js.org">
Outline
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="primaryOutline"
href="http://storybook.js.org"
>
Outline primary
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="secondaryOutline"
href="http://storybook.js.org"
>
Outline secondary
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="primary"
isDisabled
href="http://storybook.js.org"
>
Disabled
</Button>
<br />
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="primary"
isLoading
href="http://storybook.js.org"
>
Primary
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="secondary"
isLoading
href="http://storybook.js.org"
>
Secondary
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="tertiary"
isLoading
href="http://storybook.js.org"
>
Tertiary
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="outline"
isLoading
href="http://storybook.js.org"
>
Outline
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="outline"
isLoading
loadingText="Custom..."
href="http://storybook.js.org"
>
Outline
</Button>
<br />
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="primary"
size="small"
href="http://storybook.js.org"
>
Primary
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="secondary"
size="small"
href="http://storybook.js.org"
>
Secondary
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="tertiary"
size="small"
href="http://storybook.js.org"
>
Tertiary
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="outline"
size="small"
href="http://storybook.js.org"
>
Outline
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="primary"
isDisabled
size="small"
href="http://storybook.js.org"
>
Disabled
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="outline"
size="small"
containsIcon
href="http://storybook.js.org"
>
<Icon icon="link" aria-label="Link" />
</Button>
<Button
ButtonWrapper={StoryLinkWrapper}
appearance="outline"
size="small"
href="http://storybook.js.org"
>
<Icon icon="link" />
Link
</Button>
</div>
));
4 changes: 2 additions & 2 deletions src/components/StoryLinkWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import { action } from '@storybook/addon-actions';

const fireClickAction = action('onLinkClick');

export function StoryLinkWrapper({ children, className, href, onClick, to }) {
export function StoryLinkWrapper({ children, className, href, onClick, to, ...rest }) {
const modifiedOnClick = event => {
event.preventDefault();
onClick();
fireClickAction(href || to);
};

return (
<a className={className} href={href || to} onClick={modifiedOnClick}>
<a className={className} href={href || to} onClick={modifiedOnClick} {...rest}>
{children}
</a>
);
Expand Down