From 6a6386a2b1fe56eda40277984f6d300315b1f38a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?=
 <60678893+juliajforesti@users.noreply.github.com>
Date: Fri, 24 Jan 2025 14:54:15 -0300
Subject: [PATCH] fix(fuselage): hidden select should be child of trigger
 (#1537)

---
 .changeset/modern-cycles-reflect.md                |  5 +++++
 .../fuselage/src/components/Select/SelectAria.tsx  | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/modern-cycles-reflect.md

diff --git a/.changeset/modern-cycles-reflect.md b/.changeset/modern-cycles-reflect.md
new file mode 100644
index 0000000000..3eb2c6f1e7
--- /dev/null
+++ b/.changeset/modern-cycles-reflect.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/fuselage': patch
+---
+
+fix: `SelectAria` hidden select should be child of trigger
diff --git a/packages/fuselage/src/components/Select/SelectAria.tsx b/packages/fuselage/src/components/Select/SelectAria.tsx
index 775daf3e10..b4231e15d6 100644
--- a/packages/fuselage/src/components/Select/SelectAria.tsx
+++ b/packages/fuselage/src/components/Select/SelectAria.tsx
@@ -59,13 +59,6 @@ export const SelectAria = forwardRef(function SelectAria<T extends object>(
 
   return (
     <>
-      <HiddenSelect
-        state={state}
-        triggerRef={ref}
-        label={props.label}
-        name={props.name}
-        isDisabled={isDisabled}
-      />
       <SelectTrigger
         {...mergeProps(focusProps, triggerProps)}
         ref={mergedRef}
@@ -74,6 +67,13 @@ export const SelectAria = forwardRef(function SelectAria<T extends object>(
         error={error}
         id={id}
       >
+        <HiddenSelect
+          state={state}
+          triggerRef={ref}
+          label={props.label}
+          name={props.name}
+          isDisabled={isDisabled}
+        />
         <Box
           is='span'
           color={state.selectedItem ? 'default' : 'hint'}