Skip to content

Update: Support all icon usage directly in Button #552

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update: Support all icon usage directly in Button #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
128 changes: 82 additions & 46 deletions src/components/Button/Button.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Meta, StoryObj } from '@storybook/react'

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

const meta: Meta<typeof Button> = {
component: Button,
Expand All @@ -9,78 +10,113 @@ const meta: Meta<typeof Button> = {
export default meta
type Story = StoryObj<typeof Button>

export const Primary: Story = {
decorators: [
(Story) => (
<div className='grid grid-cols-4 gap-x-4 gap-y-2 items-center justify-items-center'>
<div>base</div>
<div>hover</div>
<div>active</div>
<div>disabled</div>
<Story />
</div>
),
],
render: () => (
function ButtonRow(control: {
disabled?: boolean
pressed?: boolean
hovered?: boolean
}) {
return (
<>
<Button variant='filled'>Button</Button>
<Button variant='filled' className='C9Y-hover'>
<Button variant='filled' {...control}>
Button
</Button>
<Button variant='filled' className='C9Y-active'>
<Button variant='filled' {...control}>
<Icon id='code' />
Button
</Button>
<Button variant='filled' disabled>
<Button variant='filled' {...control}>
Button
<Icon id='code' />
</Button>
<Button variant='filled' {...control}>
<Icon id='code' />
</Button>
<Button variant='outlined'>Button</Button>
<Button variant='outlined' className='C9Y-hover'>
<Button variant='outlined' {...control}>
Button
</Button>
<Button variant='outlined' className='C9Y-active'>
<Button variant='outlined' {...control}>
<Icon id='code' />
Button
</Button>
<Button variant='outlined' disabled>
<Button variant='outlined' {...control}>
Button
<Icon id='code' />
</Button>
<Button variant='outlined' {...control}>
<Icon id='code' />
</Button>
</>
),
)
}

export const WithIcon: Story = {
export const Primary: Story = {
render: () => (
<div className='flex flex-row items-center gap-4'>
<Button variant='filled' size='small' startIcon='code' endIcon='code'>
Button
</Button>
<Button variant='filled' startIcon='code' endIcon='code'>
Button
</Button>
<Button variant='filled' size='large' startIcon='code' endIcon='code'>
Button
</Button>
<div
className='grid gap-x-4 gap-y-2 items-center justify-items-center'
style={{ gridTemplateColumns: '70px repeat(8, auto)' }}
>
<div>base</div>
<ButtonRow />

<div>hover</div>
<ButtonRow hovered />

<div>pressed</div>
<ButtonRow pressed />

<div>disabled</div>
<ButtonRow disabled />
</div>
),
}

export const Sizes: Story = {
render: () => (
<div className='flex flex-row items-center gap-4'>
<div
className='grid gap-x-4 gap-y-2 items-center justify-items-start'
style={{ gridTemplateColumns: '60px repeat(4, auto)' }}
>
<div>small</div>
<Button size='small'>Button</Button>
<Button size='small'>
<Icon id='code' />
Button
</Button>
<Button size='small'>
Button
<Icon id='code' />
</Button>
<Button size='small'>
<Icon id='code' />
</Button>

<div>default</div>
<Button>Button</Button>
<Button>
<Icon id='code' />
Button
</Button>
<Button>
Button
<Icon id='code' />
</Button>
<Button>
<Icon id='code' />
</Button>

<div>large</div>
<Button size='large'>Button</Button>
<Button size='large'>
<Icon id='code' />
Button
</Button>
<Button size='large'>
Button
<Icon id='code' />
</Button>
<Button size='large'>
<Icon id='code' />
</Button>
</div>
),
}

export const WithAnchor: Story = {
args: {
href: '#test',
children: 'Button',
},
parameters: {
docs: {
description: 'Buttons with an `href` will be rendered as anchors',
},
},
}
107 changes: 71 additions & 36 deletions src/components/Button/Button.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { Theme } from '../../theme/theme'
export const buttonStyles = (theme: Theme): ButtonStyles => ({
// BASE
'.C9Y-Button-base': {
height: '2rem',
padding: '0 1rem',
alignItems: 'center',
display: 'inline-flex',
justifyContent: 'center',
Expand All @@ -21,47 +23,56 @@ export const buttonStyles = (theme: Theme): ButtonStyles => ({
'&:disabled, &.C9Y-disabled': {
cursor: 'not-allowed',
},

// ICONS
'&:has(> svg:last-child)': {
paddingRight: '0.75rem',
},

'&:has(> svg:first-child)': {
paddingLeft: '0.75rem',
},

'&:has(> svg:only-child)': {
width: '2rem',
padding: 0,
},
},

// VARIANTS
'.C9Y-Button-filled': {
height: '2rem',
padding: '0 1rem',
backgroundColor: theme.colors.primary[500],
borderRadius: theme.borderRadius.DEFAULT,
color: theme.colors.inverse,

transition: 'background-color 0.15s linear',

'&:hover, &.C9Y-hover': {
'&:hover, &.C9Y-hovered': {
backgroundColor: theme.colors.primary[700],
},
'&:active, &.C9Y-active': {
'&:active, &.C9Y-pressed': {
backgroundColor: theme.colors.primary[900],
},
'&:disabled, &.C9Y-disabled': {
backgroundColor: theme.colors.primary[300],
},

// For buttons with color options you'll typically define them in each variant
// like:
// For buttons with color options you can define them in each variant, eg:
// '&.C9Y-Button-errorColor': { ... }
},
'.C9Y-Button-outlined': {
height: '2rem',
padding: '0 1rem',
backgroundColor: 'transparent',
border: `1px solid ${theme.colors.primary[500]}`,
borderRadius: theme.borderRadius.DEFAULT,
color: theme.colors.primary[500],

transition: 'color, border-color 0.15s linear',

'&:hover, &.C9Y-hover': {
'&:hover, &.C9Y-hovered': {
borderColor: theme.colors.primary[700],
color: theme.colors.primary[700],
},
'&:active, &.C9Y-active': {
'&:active, &.C9Y-pressed': {
borderColor: theme.colors.primary[900],
color: theme.colors.primary[900],
},
Expand All @@ -74,55 +85,79 @@ export const buttonStyles = (theme: Theme): ButtonStyles => ({
// SIZES
'.C9Y-Button-smallSize': {
height: '1.5rem',
gap: '0.375rem',
padding: '0rem 0.5rem',
borderRadius: theme.borderRadius.DEFAULT,
fontSize: '0.75rem',
padding: '0rem 0.5rem',

'&:has(> svg:last-child)': {
paddingRight: '0.5rem',
},

'&:has(> svg:first-child)': {
paddingLeft: '0.5rem',
},

'&:has(> svg:only-child)': {
width: '1.5rem',
padding: 0,
},
},

'.C9Y-Button-largeSize': {
height: '2.5rem',
gap: '0.625rem',
padding: '0 1.5rem',
borderRadius: theme.borderRadius.md,
fontSize: '1rem',
padding: '0 2rem',
},

// ICONS
'.C9Y-Button-icon': {
fontSize: '1rem',
},
'.C9Y-Button-smallSizeIcon': {
fontSize: '0.75rem',
},
'.C9Y-Button-largeSizeIcon': {
fontSize: '1.25rem',
'&:has(> svg:last-child)': {
paddingRight: '1.25rem',
},

'&:has(> svg:first-child)': {
paddingLeft: '1.25rem',
},

'&:has(> svg:only-child)': {
width: '2.5rem',
padding: 0,
},
},
})

export interface ButtonStyles {
/** Base class applied to all variants for shared structural styles */
'.C9Y-Button-base': { '&:disabled, &.C9Y-disabled': CSSProperties } & CSSProperties
'.C9Y-Button-base': {
'&:has(> svg:last-child)': CSSProperties
'&:has(> svg:first-child)': CSSProperties
'&:has(> svg:only-child)': CSSProperties
'&:disabled, &.C9Y-disabled': CSSProperties
} & CSSProperties

/** Variant class applied when `variant="filled"` */
'.C9Y-Button-filled': {
'&:hover, &.C9Y-hover': CSSProperties
'&:active, &.C9Y-active': CSSProperties
'&:hover, &.C9Y-hovered': CSSProperties
'&:active, &.C9Y-pressed': CSSProperties
'&:disabled, &.C9Y-disabled': CSSProperties
} & CSSProperties
/** Variant class applied when `variant="outlined"` */
'.C9Y-Button-outlined': {
'&:hover, &.C9Y-hover': CSSProperties
'&:active, &.C9Y-active': CSSProperties
'&:hover, &.C9Y-hovered': CSSProperties
'&:active, &.C9Y-pressed': CSSProperties
'&:disabled, &.C9Y-disabled': CSSProperties
} & CSSProperties

/** Sizing class applied when `size="small"` */
'.C9Y-Button-smallSize': CSSProperties
'.C9Y-Button-smallSize': {
'&:has(> svg:last-child)': CSSProperties
'&:has(> svg:first-child)': CSSProperties
'&:has(> svg:only-child)': CSSProperties
} & CSSProperties
/** Sizing class applied when `size="large"` */
'.C9Y-Button-largeSize': CSSProperties

/** Base class applied to all Button Icons */
'.C9Y-Button-icon': CSSProperties
/** Sizing class applied to Button Icons when `size="small"` */
'.C9Y-Button-smallSizeIcon': CSSProperties
/** Sizing class applied Button Icons when `size="large"` */
'.C9Y-Button-largeSizeIcon': CSSProperties
'.C9Y-Button-largeSize': {
'&:has(> svg:last-child)': CSSProperties
'&:has(> svg:first-child)': CSSProperties
'&:has(> svg:only-child)': CSSProperties
} & CSSProperties
}
Loading