Skip to content

Commit 73a2800

Browse files
authored
Merge pull request #250 from DogusErdem/feat/button-border-color
feat: Added border color of the Button component to the theme.
2 parents fff86e8 + 7a7166a commit 73a2800

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/components/Button/Button.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,12 @@ export const Button: FCCWD<ButtonProps & PressableProps> = (
4646
style={({ pressed }) =>
4747
[
4848
styles.container,
49-
5049
label ?
5150
sizes[size]
5251
:
5352
{ padding: (fontStyles[size].lineHeight - fontStyles[size].fontSize) / 2 + 10 },
5453
style,
55-
{ backgroundColor: statusTheme.background },
54+
{ backgroundColor: statusTheme.background, borderColor: statusTheme.border },
5655
{ opacity: pressed ? activeOpacity : 1 },
5756
]}
5857
disabled={disabled}

src/core/theme/colors.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,17 @@ export const COLOR_COMPONENTS_LIGHT = (COLOR_SYSTEM:{colors:typeof COLOR_SYSTEM_
146146
default: {
147147
background: COLOR_SYSTEM.colors.system.primary,
148148
label: COLOR_SYSTEM.colors.button.text,
149+
border: COLOR_SYSTEM.colors.system.primary,
149150
},
150151
pressed: {
151152
background: COLOR_SYSTEM.colors.status.focused,
152153
label: COLOR_SYSTEM.colors.button.text,
154+
border: COLOR_SYSTEM.colors.status.focused,
153155
},
154156
disabled: {
155157
background: COLOR_SYSTEM.colors.button.disabled,
156158
label: COLOR_SYSTEM.colors.button.disabledText,
159+
border: COLOR_SYSTEM.colors.button.disabled,
157160
},
158161
},
159162
checkbox: {
@@ -469,14 +472,17 @@ export const COLOR_COMPONENTS_DARK = (COLOR_SYSTEM:{colors:typeof COLOR_SYSTEM_D
469472
default: {
470473
background: COLOR_SYSTEM.colors.system.primary,
471474
label: COLOR_SYSTEM.colors.button.text,
475+
border: COLOR_SYSTEM.colors.system.primary,
472476
},
473477
pressed: {
474478
background: COLOR_SYSTEM.colors.status.focused,
475479
label: COLOR_SYSTEM.colors.button.text,
480+
border: COLOR_SYSTEM.colors.status.focused,
476481
},
477482
disabled: {
478483
background: COLOR_SYSTEM.colors.button.disabled,
479484
label: COLOR_SYSTEM.colors.button.disabledText,
485+
border: COLOR_SYSTEM.colors.button.disabled,
480486
},
481487
},
482488
checkbox: {

0 commit comments

Comments
 (0)