[Button] bugfixes in 0.0.28 release (#372)

The patch did not apply correctly in #371. Fixes in current `PR`.
hyochan · Jan 10, 2021 · 5ccd1db · 5ccd1db
1 parent 7689582
commit 5ccd1db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOGS.md b/CHANGELOGS.md
@@ -1,8 +1,8 @@
 ## Changelogs
 
-## 0.0.28
+## 0.0.29
 
-- Added `TouchableOpacity` style prop to [Button] [#37`](https://github.com/dooboolab/dooboo-ui/pull/371`).
+- Added `TouchableOpacity` style prop to [Button] [#372](https://github.com/dooboolab/dooboo-ui/pull/372).
 
 ## 0.0.27
 

diff --git a/lib/package.json b/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dooboo-ui",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "main": "index.js",
   "types": "index.d.ts",
   "author": "dooboolab",

diff --git a/main/Button.tsx b/main/Button.tsx
@@ -72,7 +72,8 @@ function Button({
   testID,
   disabled,
   loading,
-  styles: style,
+  style,
+  styles,
   indicatorColor = '#ffffff',
   leftElement,
   rightElement,
@@ -94,33 +95,37 @@ function Button({
       onPress={onPress}
       delayPressIn={50}
       disabled={disabled}
-      style={[
-        isHovered && !disabled && [defaultStyles.hovered, style?.hovered],
-        disabled && [defaultStyles.disabledButton, style?.disabledButton],
-      ]}
+      style={style}
       {...touchableOpacityProps}>
       {loading ? (
         <View
           style={[
             defaultStyles.container,
-            style?.container,
+            styles?.container,
             {
               width: layout?.width,
               height: layout?.height,
             },
+            isHovered && !disabled && [defaultStyles.hovered, styles?.hovered],
+            disabled && [defaultStyles.disabledButton, styles?.disabledButton],
           ]}>
           <ActivityIndicator size="small" color={indicatorColor} />
         </View>
       ) : (
         <View
-          style={[defaultStyles.container, style?.container]}
+          style={[
+            defaultStyles.container,
+            styles?.container,
+            isHovered && !disabled && [defaultStyles.hovered, styles?.hovered],
+            disabled && [defaultStyles.disabledButton, styles?.disabledButton],
+          ]}
           onLayout={(e) => setLayout(e.nativeEvent.layout)}>
           {leftElement}
           <Text
             style={[
               defaultStyles.text,
-              style?.text,
-              disabled && [defaultStyles.disabledText, style?.disabledText],
+              styles?.text,
+              disabled && [defaultStyles.disabledText, styles?.disabledText],
             ]}
             {...textProps}>
             {text}