thinkasany
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
5 additions and
2 deletions
-
components/button/button.tsx
|
|
@ -237,10 +237,13 @@ const InternalButton: React.ForwardRefRenderFunction< |
|
|
button?.className, |
|
|
button?.className, |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
const fullStyle = { ...button?.style, ...customStyle }; |
|
|
const fullStyle: React.CSSProperties = { ...button?.style, ...customStyle }; |
|
|
|
|
|
|
|
|
const iconClasses = classNames(customClassNames?.icon, button?.classNames?.icon); |
|
|
const iconClasses = classNames(customClassNames?.icon, button?.classNames?.icon); |
|
|
const iconStyle = { ...(styles?.icon || {}), ...(button?.styles?.icon || {}) }; |
|
|
const iconStyle: React.CSSProperties = { |
|
|
|
|
|
...(styles?.icon || {}), |
|
|
|
|
|
...(button?.styles?.icon || {}), |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
const iconNode = |
|
|
const iconNode = |
|
|
icon && !innerLoading ? ( |
|
|
icon && !innerLoading ? ( |
|
|
|
