fix(components): mergeprops order

Author: orelus

components/lib/accordion/Accordion.js

@@ -330,12 +330,12 @@ export const Accordion = React.forwardRef((inProps, ref) => {
 
     const tabs = createTabs();
     const rootProps = mergeProps(
+        ptm('root'),
         {
             className: classNames(props.className, cx('root')),
             style: props.style
         },
-        AccordionBase.getOtherProps(props),
-        ptm('root')
+        AccordionBase.getOtherProps(props)
     );
 
     return (

components/lib/autocomplete/AutoComplete.js

@@ -773,14 +773,14 @@ export const AutoComplete = React.memo(
         const input = createInput();
         const dropdown = createDropdown();
         const rootProps = mergeProps(
+            ptm('root'),
             {
                 id: idState,
                 ref: elementRef,
                 style: props.style,
                 className: classNames(props.className, cx('root', { focusedState }))
             },
-            otherProps,
-            ptm('root')
+            otherProps
         );
 
         return (

components/lib/avatar/Avatar.js

@@ -85,13 +85,13 @@ export const Avatar = React.forwardRef((inProps, ref) => {
     }));
 
     const rootProps = mergeProps(
+        ptm('root'),
         {
             ref: elementRef,
             style: props.style,
             className: classNames(props.className, cx('root', { imageFailed }))
         },
-        AvatarBase.getOtherProps(props),
-        ptm('root')
+        AvatarBase.getOtherProps(props)
     );
 
     const content = props.template ? ObjectUtils.getJSXElement(props.template, props) : createContent();

components/lib/avatargroup/AvatarGroup.js

@@ -24,13 +24,13 @@ export const AvatarGroup = React.forwardRef((inProps, ref) => {
     }));
 
     const rootProps = mergeProps(
+        ptm('root'),
         {
             ref: elementRef,
             style: props.style,
             className: classNames(props.className, cx('root'))
         },
-        AvatarGroupBase.getOtherProps(props),
-        ptm('root')
+        AvatarGroupBase.getOtherProps(props)
     );
 
     return <div {...rootProps}>{props.children}</div>;

components/lib/badge/Badge.js

@@ -26,13 +26,13 @@ export const Badge = React.memo(
         }));
 
         const rootProps = mergeProps(
+            ptm('root'),
             {
                 ref: elementRef,
                 style: props.style,
                 className: classNames(props.className, cx('root'))
             },
-            BadgeBase.getOtherProps(props),
-            ptm('root')
+            BadgeBase.getOtherProps(props)
         );
 
         return <span {...rootProps}>{props.value}</span>;

components/lib/blockui/BlockUI.js

@@ -120,15 +120,15 @@ export const BlockUI = React.forwardRef((inProps, ref) => {
     const mask = createMask();
 
     const rootProps = mergeProps(
+        ptm('root'),
         {
             id: props.id,
             ref: elementRef,
             style: props.containerStyle,
             className: classNames(props.containerClassName, cx('root')),
             'aria-busy': props.blocked
         },
-        BlockUIBase.getOtherProps(props),
-        ptm('root')
+        BlockUIBase.getOtherProps(props)
     );
 
     return (

components/lib/breadcrumb/BreadCrumb.js

@@ -250,14 +250,14 @@ export const BreadCrumb = React.memo(
             ptm('menu')
         );
         const rootProps = mergeProps(
+            ptm('root'),
             {
                 id: props.id,
                 ref: elementRef,
                 className: classNames(props.className, cx('root')),
                 style: props.style
             },
-            BreadCrumbBase.getOtherProps(props),
-            ptm('root')
+            BreadCrumbBase.getOtherProps(props)
         );
 
         return (

components/lib/button/Button.js

@@ -113,15 +113,15 @@ export const Button = React.memo(
         const defaultAriaLabel = props.label ? props.label + (props.badge ? ' ' + props.badge : '') : props['aria-label'];
 
         const rootProps = mergeProps(
+            ptm('root'),
             {
                 ref: elementRef,
                 'aria-label': defaultAriaLabel,
                 'data-pc-autofocus': props.autoFocus,
                 className: classNames(props.className, cx('root', { size, disabled })),
                 disabled: disabled
             },
-            ButtonBase.getOtherProps(props),
-            ptm('root')
+            ButtonBase.getOtherProps(props)
         );
 
         return (

components/lib/buttongroup/ButtonGroup.js

@@ -24,13 +24,13 @@ export const ButtonGroup = React.memo(
         const isSingleButton = React.Children.count(props.children) === 1;
 
         const rootProps = mergeProps(
+            ptm('root'),
             {
                 ref: elementRef,
                 className: classNames(cx('root'), { 'p-button-group-single': isSingleButton }),
                 role: 'group'
             },
-            ButtonGroupBase.getOtherProps(props),
-            ptm('root')
+            ButtonGroupBase.getOtherProps(props)
         );
 
         return <span {...rootProps}>{props.children}</span>;

components/lib/calendar/Calendar.js

@@ -4439,13 +4439,13 @@ export const Calendar = React.memo(
         const yearPicker = createYearPicker();
         const isFilled = DomHandler.hasClass(inputRef.current, 'p-filled') && inputRef.current.value !== '';
         const rootProps = mergeProps(
+            ptm('root'),
             {
                 id: props.id,
                 className: classNames(props.className, cx('root', { focusedState, isFilled, panelVisible: visible })),
                 style: props.style
             },
-            CalendarBase.getOtherProps(props),
-            ptm('root')
+            CalendarBase.getOtherProps(props)
         );
 
         return (