fix: proper inherit attributes (#3028)

vuestorefront · Nov 3, 2023 · dd5ab48 · dd5ab48
1 parent 4ce0eb3
commit dd5ab48
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.changeset/cyan-carpets-collect.md b/.changeset/cyan-carpets-collect.md
@@ -0,0 +1,5 @@
+---
+'@storefront-ui/react': patch
+---
+
+fix order inherit of attributes
diff --git a/packages/sfui/frameworks/react/components/SfAccordionItem/SfAccordionItem.tsx b/packages/sfui/frameworks/react/components/SfAccordionItem/SfAccordionItem.tsx
@@ -12,7 +12,7 @@ const SfAccordionItem = forwardRef<HTMLDetailsElement, SfAccordionItemProps>((pr
   };
 
   return (
-    <details ref={ref} open={open} {...attributes} data-testid="accordion-item">
+    <details ref={ref} open={open} data-testid="accordion-item" {...attributes}>
       <summary
         onClick={handleClick}
         className={classNames(

diff --git a/packages/sfui/frameworks/react/components/SfSwitch/SfSwitch.tsx b/packages/sfui/frameworks/react/components/SfSwitch/SfSwitch.tsx
@@ -15,9 +15,9 @@ const SfSwitch = forwardRef<HTMLInputElement, SfSwitchProps>(
       )}
       type="checkbox"
       role="switch"
-      {...attributes}
       data-testid="switch"
       aria-checked={attributes?.checked}
+      {...attributes}
     />
   ),
 );

diff --git a/packages/sfui/frameworks/react/components/SfTextarea/SfTextarea.tsx b/packages/sfui/frameworks/react/components/SfTextarea/SfTextarea.tsx
@@ -26,8 +26,8 @@ export default forwardRef<HTMLTextAreaElement, SfTextareaProps>(
           sizeClasses[size],
           className,
         ])}
-        {...attributes}
         data-testid="textarea"
+        {...attributes}
       />
     );
   },