File tree Expand file tree Collapse file tree 1 file changed +17
-14
lines changed Expand file tree Collapse file tree 1 file changed +17
-14
lines changed Original file line number Diff line number Diff line change @@ -64,12 +64,9 @@ export namespace ButtonProps {
6464 export type AsButton = {
6565 linkProps ?: never ;
6666 onClick ?: React . MouseEventHandler < HTMLButtonElement > ;
67- nativeButtonProps ?: Omit <
68- React . DetailedHTMLProps <
69- React . ButtonHTMLAttributes < HTMLButtonElement > ,
70- HTMLButtonElement
71- > ,
72- "onClick"
67+ nativeButtonProps ?: React . DetailedHTMLProps <
68+ React . ButtonHTMLAttributes < HTMLButtonElement > ,
69+ HTMLButtonElement
7370 > &
7471 Record < `data-${string } `, string | boolean | null | undefined > ;
7572 disabled ?: boolean ;
@@ -130,8 +127,11 @@ export const Button = memo(
130127 < Link
131128 { ...linkProps }
132129 title = { title ?? linkProps . title }
133- className = { className }
134- style = { style }
130+ className = { cx ( linkProps ?. className , className ) }
131+ style = { {
132+ ...linkProps ?. style ,
133+ ...style
134+ } }
135135 ref = { ref as React . ForwardedRef < HTMLAnchorElement > }
136136 { ...rest }
137137 >
@@ -140,12 +140,15 @@ export const Button = memo(
140140 ) : (
141141 < button
142142 { ...nativeButtonProps }
143- className = { className }
144- style = { style }
145- type = { type }
146- title = { title }
147- onClick = { onClick }
148- disabled = { disabled }
143+ className = { cx ( nativeButtonProps ?. className , className ) }
144+ style = { {
145+ ...nativeButtonProps ?. style ,
146+ ...style
147+ } }
148+ type = { type ?? nativeButtonProps ?. type }
149+ title = { title ?? nativeButtonProps ?. title }
150+ onClick = { onClick ?? nativeButtonProps ?. onClick }
151+ disabled = { disabled ?? nativeButtonProps ?. disabled }
149152 ref = { ref as React . ForwardedRef < HTMLButtonElement > }
150153 { ...rest }
151154 >
You can’t perform that action at this time.
0 commit comments