|
@@ -139,17 +139,17 @@ const Button: FC<IButtonProps> = ({
|
|
|
return null;
|
|
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 (isLoading) {
|
|
|
if(renderLoading) {
|
|
if(renderLoading) {
|
|
@@ -178,11 +178,11 @@ const Button: FC<IButtonProps> = ({
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(!isDisabled && !isLoading) {
|
|
|
|
|
- if(customTextColor) {
|
|
|
|
|
- titleProps.customColor = customTextColor;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // if(!isDisabled && !isLoading) {
|
|
|
|
|
+ if(customTextColor) {
|
|
|
|
|
+ titleProps.customColor = customTextColor;
|
|
|
}
|
|
}
|
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
return <Text
|
|
return <Text
|
|
|
variant={currentSize.fontSize}
|
|
variant={currentSize.fontSize}
|