fix: change props spread order

gravity-ui · May 20, 2024 · 45116a9 · 45116a9
1 parent a7576c6
commit 45116a9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx
@@ -154,13 +154,13 @@ const ButtonWithHandlers = React.forwardRef<HTMLElement, ButtonProps>(function B
             component,
             {
                 ...commonProps,
-                ...restProps,
-                ...extraProps,
                 ref,
                 tabIndex: disabled ? undefined : 0,
                 role: 'button',
                 'aria-disabled': disabled,
                 'aria-pressed': selected,
+                ...restProps,
+                ...extraProps,
             },
             content,
         );
@@ -170,15 +170,15 @@ const ButtonWithHandlers = React.forwardRef<HTMLElement, ButtonProps>(function B
         return (
             <a
                 {...commonProps}
-                {...linkProps}
-                {...(extraProps as React.AnchorHTMLAttributes<HTMLAnchorElement>)}
                 ref={ref as React.Ref<HTMLAnchorElement>}
                 rel={
                     linkProps.target === '_blank' && !linkProps.rel
                         ? 'noopener noreferrer'
                         : linkProps.rel
                 }
                 aria-disabled={disabled}
+                {...linkProps}
+                {...(extraProps as React.AnchorHTMLAttributes<HTMLAnchorElement>)}
             >
                 {content}
             </a>
@@ -189,12 +189,12 @@ const ButtonWithHandlers = React.forwardRef<HTMLElement, ButtonProps>(function B
         return (
             <button
                 {...commonProps}
-                {...buttonProps}
-                {...(extraProps as React.ButtonHTMLAttributes<HTMLButtonElement>)}
                 ref={ref as React.Ref<HTMLButtonElement>}
                 type={buttonProps.type ?? 'button'}
                 disabled={disabled}
                 aria-pressed={selected}
+                {...buttonProps}
+                {...(extraProps as React.ButtonHTMLAttributes<HTMLButtonElement>)}
             >
                 {content}
             </button>