Skip to content

Button - Fix padding #588

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
kapantzak merged 2 commits into from
Nov 11, 2025
Merged

Button - Fix padding #588

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
25cef10
Adjust button padding depending on label existence
kapantzak Nov 11, 2025
cb29f1d
Update test snapshots
kapantzak Nov 11, 2025
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
8 changes: 4 additions & 4 deletions src/components/button/__snapshots__/button.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ exports[`Button states renders only icon 1`] = `
word-break: keep-all;
cursor: pointer;
pointer-events: auto;
padding: 4px 12px;
padding: 4px 6px;
transition: all 150ms;
background-color: rgba(255,255,255,0.0);
color: #00AB44;
Expand Down Expand Up @@ -307,7 +307,7 @@ exports[`Button states renders only icon 1`] = `
class="c0"
colors="[object Object]"
flavour="hollow"
padding="1,3"
padding="1,1.5"
round="0.5"
texttransform="firstLetter"
>
Expand Down Expand Up @@ -342,7 +342,7 @@ exports[`Button states renders smaller only icon 1`] = `
word-break: keep-all;
cursor: pointer;
pointer-events: auto;
padding: 4px 12px;
padding: 4px 6px;
transition: all 150ms;
background-color: rgba(255,255,255,0.0);
color: #00AB44;
Expand Down Expand Up @@ -426,7 +426,7 @@ exports[`Button states renders smaller only icon 1`] = `
class="c0"
colors="[object Object]"
flavour="hollow"
padding="1,3"
padding="1,1.5"
round="0.5"
texttransform="firstLetter"
>
Expand Down
1 change: 1 addition & 0 deletions src/components/button/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const Button = ({
flavour={flavour}
textTransform={textTransform}
hasIcon={!!icon || isLoading}
hasLabel={!!children}
onClick={isLoading ? undefined : onClick}
ref={ref}
iconColor={iconColor}
Expand Down
8 changes: 7 additions & 1 deletion src/components/button/styled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,13 @@ const colorsByFlavour = ({ flavour = DEFAULT, danger, warning, iconColor }) => {

export const StyledButton = styled.button.attrs(
({ groupFirst, groupLast, groupMiddle, ...props }) => ({
padding: props.large ? [1.5, 4] : [1, 3],
padding: props.large
? !props.hasLabel
? [1.5, 3]
: [1.5, 4]
: !props.hasLabel
? [1, 1.5]
: [1, 3],
colors: colorsByFlavour(props),
round: groupFirst
? { side: "left", size: 0.5 }
Expand Down