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

Added Button Shortcut Style Enhancements + Additional Storybook Tests #8947

Merged
merged 9 commits into from
Dec 10, 2024
Merged

Added Button Shortcut Style Enhancements + Additional Storybook Tests #8947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2ab6816
Edit storybook button tests to show shortcuts with each variant and c…
emshyu Dec 7, 2024
1baf059
Change shortcut storybook tests to take in a shortcut value (+ commen…
emshyu Dec 8, 2024
95f2b50
Shortcut separator style modifications
emshyu Dec 8, 2024
e601ddc
More changes to separator and shortcut label styling
emshyu Dec 8, 2024
c0db951
Modifying shortcut styling to match figma
emshyu Dec 8, 2024
5955d09
Changing yarn version back to 4.4.0
emshyu Dec 8, 2024
10691b5
Found the shortcut label color for secondary/tertiary danger
emshyu Dec 8, 2024
611a259
Fixes
FelixMalfait Dec 9, 2024
f4d7cf3
Greptile comment
FelixMalfait Dec 9, 2024
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
50 changes: 39 additions & 11 deletions packages/twenty-ui/src/input/button/components/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,19 +359,45 @@ const StyledSoonPill = styled(Pill)`
margin-left: auto;
`;

const StyledShortcutLabel = styled.div`
color: ${({ theme }) => theme.font.color.light};
font-weight: ${({ theme }) => theme.font.weight.medium};
`;

const StyledSeparator = styled.div<{ buttonSize: ButtonSize }>`
background: ${({ theme }) => theme.border.color.light};
const StyledSeparator = styled.div<{
buttonSize: ButtonSize;
accent: ButtonAccent;
}>`
background: ${({ theme, accent }) => {
switch (accent) {
case 'blue':
return theme.color.blue30;
case 'danger':
return theme.border.color.danger;
default:
return theme.font.color.light;
}
}};
height: ${({ theme, buttonSize }) =>
theme.spacing(buttonSize === 'small' ? 3 : 4)};
margin: 0 ${({ theme }) => theme.spacing(1)};
theme.spacing(buttonSize === 'small' ? 2 : 4)};
margin: 0;
width: 1px;
`;

const StyledShortcutLabel = styled.div<{
variant: ButtonVariant;
accent: ButtonAccent;
}>`
color: ${({ theme, variant, accent }) => {
switch (accent) {
case 'blue':
return theme.color.blue30;
case 'danger':
return variant === 'primary'
? theme.border.color.danger
: theme.color.red40;
default:
return theme.font.color.light;
}
}};
font-weight: ${({ theme }) => theme.font.weight.medium};
`;

export const Button = ({
className,
Icon,
Expand Down Expand Up @@ -416,8 +442,10 @@ export const Button = ({
{title}
{shortcut && (
<>
<StyledSeparator buttonSize={size} />
<StyledShortcutLabel>{shortcut}</StyledShortcutLabel>
<StyledSeparator buttonSize={size} accent={accent} />
<StyledShortcutLabel variant={variant} accent={accent}>
{shortcut}
</StyledShortcutLabel>
</>
)}
{soon && <StyledSoonPill label="Soon" />}
Expand Down
18 changes: 15 additions & 3 deletions packages/twenty-ui/src/input/button/components/__stories__/Button.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const Default: Story = {
};

export const Catalog: CatalogStory<Story, typeof Button> = {
args: { title: 'Filter', Icon: IconSearch },
args: { title: 'Filter', Icon: IconSearch, shortcut: '' },
argTypes: {
size: { control: false },
variant: { control: false },
Expand All @@ -55,7 +55,6 @@ export const Catalog: CatalogStory<Story, typeof Button> = {
soon: { control: false },
position: { control: false },
className: { control: false },
shortcut: { control: false },
},
parameters: {
pseudo: { hover: ['.hover'], active: ['.pressed'], focus: ['.focus'] },
Expand Down Expand Up @@ -277,7 +276,6 @@ export const ShortcutCatalog: CatalogStory<Story, typeof Button> = {
fullWidth: { control: false },
soon: { control: false },
position: { control: false },
shortcut: { control: false },
},
parameters: {
pseudo: { hover: ['.hover'], active: ['.pressed'], focus: ['.focus'] },
Expand All @@ -288,6 +286,20 @@ export const ShortcutCatalog: CatalogStory<Story, typeof Button> = {
values: ['small', 'medium'] satisfies ButtonSize[],
props: (size: ButtonSize) => ({ size }),
},
{
name: 'accents',
values: ['default', 'blue', 'danger'] satisfies ButtonAccent[],
props: (accent: ButtonAccent) => ({ accent }),
},
{
name: 'variants',
values: [
'primary',
'secondary',
'tertiary',
] satisfies ButtonVariant[],
props: (variant: ButtonVariant) => ({ variant }),
},
],
},
},
Expand Down
Loading