Selaa lähdekoodia

Bugfix: Button customtext color style updated.

lfabl 2 viikkoa sitten
vanhempi
commit
21c705f2a8
1 muutettua tiedostoa jossa 13 lisäystä ja 13 poistoa
  1. 13 13
      src/components/button/index.tsx

+ 13 - 13
src/components/button/index.tsx

@@ -139,17 +139,17 @@ const Button: FC<IButtonProps> = ({
             return null;
         }
 
-        if(!isDisabled && !isLoading) {
-            if(customTextColor) {
-                const _customTextColor = customTextColor as keyof NCoreUIKit.ProjectColorPalette;
-                iconProps.customColor = colors.project[_customTextColor] ? colors.project[_customTextColor] : customTextColor;
-            }
+        // if(!isDisabled && !isLoading) {
+        if(customTextColor) {
+            const _customTextColor = customTextColor as keyof NCoreUIKit.ProjectColorPalette;
+            iconProps.customColor = colors.project[_customTextColor] ? colors.project[_customTextColor] : customTextColor;
+        }
 
-            if(customIconColor) {
-                const _customIconColor = customIconColor as keyof NCoreUIKit.ProjectColorPalette;
-                iconProps.customColor = colors.project[_customIconColor] ? colors.project[_customIconColor] : customIconColor;
-            }
+        if(customIconColor) {
+            const _customIconColor = customIconColor as keyof NCoreUIKit.ProjectColorPalette;
+            iconProps.customColor = colors.project[_customIconColor] ? colors.project[_customIconColor] : customIconColor;
         }
+        // }
 
         if (isLoading) {
             if(renderLoading) {
@@ -178,11 +178,11 @@ const Button: FC<IButtonProps> = ({
             return null;
         }
 
-        if(!isDisabled && !isLoading) {
-            if(customTextColor) {
-                titleProps.customColor = customTextColor;
-            }
+        // if(!isDisabled && !isLoading) {
+        if(customTextColor) {
+            titleProps.customColor = customTextColor;
         }
+        // }
 
         return <Text
             variant={currentSize.fontSize}