From dd5ab48d0f3b153d719004350249a87a6a7335ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Dziewo=C5=84ski?= <szymon.dziewonski@gmail.com>
Date: Fri, 3 Nov 2023 10:57:26 +0100
Subject: [PATCH] fix: proper inherit attributes (#3028)

---
 .changeset/cyan-carpets-collect.md                           | 5 +++++
 .../react/components/SfAccordionItem/SfAccordionItem.tsx     | 2 +-
 .../sfui/frameworks/react/components/SfSwitch/SfSwitch.tsx   | 2 +-
 .../frameworks/react/components/SfTextarea/SfTextarea.tsx    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/cyan-carpets-collect.md

diff --git a/.changeset/cyan-carpets-collect.md b/.changeset/cyan-carpets-collect.md
new file mode 100644
index 0000000000..467c8dba54
--- /dev/null
+++ 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
index 22e0162f59..9dbaa881a9 100644
--- 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
index d6864df66f..5e5e4447dd 100644
--- 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
index c4d3a48362..8679f95846 100644
--- 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}
       />
     );
   },