Skip to content

Commit 94848b4

Browse files
Merge pull request #251 from ZeroGachis/SORD-565-Fix-styling-props
🐛 Button - fix style & labelStyle props
2 parents 19d8b06 + 1c0f9fb commit 94848b4

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

src/components/buttons/Button.tsx

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export const Button = ({
3131
variant = 'filled',
3232
status = 'default',
3333
disabled = false,
34+
style,
35+
labelStyle,
3436
...props
3537
}: customButtonProps) => {
3638
const theme = useTheme();
@@ -83,8 +85,18 @@ export const Button = ({
8385
<ButtonBase
8486
{...props}
8587
mode={mode}
86-
style={[commonStyle.button, customStyle.button, disabled && disabledStyle.button]}
87-
labelStyle={[commonStyle.label, customStyle.label, disabled && disabledStyle.label]}
88+
style={[
89+
commonStyle.button,
90+
customStyle.button,
91+
disabled && disabledStyle.button,
92+
style,
93+
]}
94+
labelStyle={[
95+
commonStyle.label,
96+
customStyle.label,
97+
disabled && disabledStyle.label,
98+
labelStyle,
99+
]}
88100
disabled={disabled}
89101
/>
90102
);

0 commit comments

Comments
 (0)