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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI: Update Button types to allow for no children on iconOnly buttons #23735

Merged
merged 4 commits into from
Aug 7, 2023
Merged

UI: Update Button types to allow for no children on iconOnly buttons #23735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2d5ce9
Update Button.tsx
cdedreuille Aug 7, 2023
147e878
Update Button.tsx
cdedreuille Aug 7, 2023
36f7014
Update Button.tsx
cdedreuille Aug 7, 2023
8fda868
Fix stories
cdedreuille Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 14 additions & 42 deletions code/ui/components/src/new/Button/Button.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,11 @@ export const Sizes: Story = {
<Button size="small" icon={<Icon.FaceHappy />}>
Small Button
</Button>
<Button size="small" icon={<Icon.FaceHappy />} iconOnly>
Small Button
</Button>
<Button size="small" icon={<Icon.FaceHappy />} iconOnly />
<Button size="medium" icon={<Icon.FaceHappy />}>
Medium Button
</Button>
<Button size="medium" icon={<Icon.FaceHappy />} iconOnly>
Medium Button
</Button>
<Button size="medium" icon={<Icon.FaceHappy />} iconOnly />
</div>
),
};
Expand All @@ -91,24 +87,12 @@ export const IconOnly: Story = {
},
render: () => (
<>
<Button size="small" variant="primary" iconOnly icon={<Icon.FaceHappy />}>
Primary
</Button>
<Button size="small" variant="secondary" iconOnly icon={<Icon.FaceHappy />}>
Secondary
</Button>
<Button size="small" variant="tertiary" iconOnly icon={<Icon.FaceHappy />}>
Tertiary
</Button>
<Button size="medium" variant="primary" iconOnly icon={<Icon.FaceHappy />}>
Primary
</Button>
<Button size="medium" variant="secondary" iconOnly icon={<Icon.FaceHappy />}>
Secondary
</Button>
<Button size="medium" variant="tertiary" iconOnly icon={<Icon.FaceHappy />}>
Tertiary
</Button>
<Button size="small" variant="primary" iconOnly icon={<Icon.FaceHappy />} />
<Button size="small" variant="secondary" iconOnly icon={<Icon.FaceHappy />} />
<Button size="small" variant="tertiary" iconOnly icon={<Icon.FaceHappy />} />
<Button size="medium" variant="primary" iconOnly icon={<Icon.FaceHappy />} />
<Button size="medium" variant="secondary" iconOnly icon={<Icon.FaceHappy />} />
<Button size="medium" variant="tertiary" iconOnly icon={<Icon.FaceHappy />} />
</>
),
decorators: [
Expand All @@ -119,24 +103,12 @@ export const IconOnly: Story = {
export const IconOnlyActive: Story = {
render: () => (
<div style={{ display: 'flex', alignItems: 'center', gap: '1rem' }}>
<Button size="small" variant="primary" iconOnly icon={<Icon.FaceHappy />} active>
Primary
</Button>
<Button size="small" variant="secondary" iconOnly icon={<Icon.FaceHappy />} active>
Secondary
</Button>
<Button size="small" variant="tertiary" iconOnly icon={<Icon.FaceHappy />} active>
Tertiary
</Button>
<Button size="medium" variant="primary" iconOnly icon={<Icon.FaceHappy />} active>
Primary
</Button>
<Button size="medium" variant="secondary" iconOnly icon={<Icon.FaceHappy />} active>
Secondary
</Button>
<Button size="medium" variant="tertiary" iconOnly icon={<Icon.FaceHappy />} active>
Tertiary
</Button>
<Button size="small" variant="primary" iconOnly icon={<Icon.FaceHappy />} active />
<Button size="small" variant="secondary" iconOnly icon={<Icon.FaceHappy />} active />
<Button size="small" variant="tertiary" iconOnly icon={<Icon.FaceHappy />} active />
<Button size="medium" variant="primary" iconOnly icon={<Icon.FaceHappy />} active />
<Button size="medium" variant="secondary" iconOnly icon={<Icon.FaceHappy />} active />
<Button size="medium" variant="tertiary" iconOnly icon={<Icon.FaceHappy />} active />
</div>
),
};
Expand Down
20 changes: 16 additions & 4 deletions code/ui/components/src/new/Button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,30 @@ import { styled } from '@storybook/theming';
import { darken, lighten, rgba, transparentize } from 'polished';
import type { PropsOf } from '../utils/types';

export interface ButtonProps<T extends React.ElementType = React.ElementType> {
interface CommonProps<T extends React.ElementType = React.ElementType> {
as?: T;
children: string;
size?: 'small' | 'medium';
variant?: 'primary' | 'secondary' | 'tertiary';
icon?: ReactNode;
iconOnly?: boolean;
onClick?: () => void;
disabled?: boolean;
active?: boolean;
}

type ButtonIconOnlyProps = {
iconOnly: true;
icon: ReactNode;
children?: never;
};

type ButtonWithTextProps = {
iconOnly?: false;
icon?: ReactNode;
children: string;
};

type ButtonProps<T extends React.ElementType = React.ElementType> = CommonProps<T> &
(ButtonIconOnlyProps | ButtonWithTextProps);

export const Button: {
<E extends React.ElementType = 'button'>(
props: ButtonProps<E> & Omit<PropsOf<E>, keyof ButtonProps>
Expand Down