Skip to content

Commit a7b09d5

Browse files
committed
fix: resolve conflict
1 parent 3e968ff commit a7b09d5

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/theme/components/button.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ const baseStyle = (props: any) => {
1919
alignItems: 'center',
2020

2121
_web: {
22-
cursor: props.isDisabled
23-
? 'not-allowed'
24-
: props.isLoading
25-
? 'default'
26-
: 'pointer',
22+
_disabled: {
23+
cursor: 'not-allowed',
24+
},
25+
_loading: {
26+
cursor: 'not-allowed',
27+
},
28+
cursor: 'pointer',
2729
userSelect: 'none',
2830
},
2931
_text: {

0 commit comments

Comments
 (0)