Skip to content

Commit

Permalink
fix: button border width
Browse files Browse the repository at this point in the history
  • Loading branch information
hyochan committed Feb 23, 2024
1 parent d3347f9 commit 7787f28
Showing 1 changed file with 25 additions and 31 deletions.
56 changes: 25 additions & 31 deletions main/uis/Button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const ButtonStyles = ({
? '8px 16px'
: '12px 24px',
backgroundColor,
borderWidth: type === 'outlined' ? '1px' : undefined,
borderWidth: '1px',
borderColor,
textColor,
disabledBackgroundColor:
Expand Down Expand Up @@ -334,36 +334,30 @@ export function Button({
);

return (
<View
style={css`
flex-direction: row;
`}
<TouchableHighlight
activeOpacity={activeOpacity}
delayPressIn={30}
disabled={innerDisabled || loading || !onPress}
hitSlop={hitSlop}
onPress={onPress}
ref={Platform.select({
web: ref,
default: undefined,
})}
style={[
style,
css`
border-radius: ${borderRadius + 'px'};
`,
]}
testID={testID}
underlayColor={type === 'text' ? 'transparent' : theme.role.underlay}
{...touchableHighlightProps}
>
<TouchableHighlight
activeOpacity={activeOpacity}
delayPressIn={30}
disabled={innerDisabled || loading || !onPress}
hitSlop={hitSlop}
onPress={onPress}
ref={Platform.select({
web: ref,
default: undefined,
})}
style={[
style,
css`
border-radius: ${borderRadius + 'px'};
`,
]}
testID={testID}
underlayColor={type === 'text' ? 'transparent' : theme.role.underlay}
{...touchableHighlightProps}
>
{renderContainer({
children: ChildView,
loadingView: LoadingView,
})}
</TouchableHighlight>
</View>
{renderContainer({
children: ChildView,
loadingView: LoadingView,
})}
</TouchableHighlight>
);
}

0 comments on commit 7787f28

Please sign in to comment.