From a5bc3a6a00b6931d7c67a9485de7f3ffaa112282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?=
 <60678893+juliajforesti@users.noreply.github.com>
Date: Thu, 23 Jan 2025 12:07:29 -0300
Subject: [PATCH] fix(fuselage): `SelectAria` id prop overwriting (#1533)

Co-authored-by: Douglas Fabris <devfabris@gmail.com>
---
 .changeset/old-shrimps-lick.md                |  5 ++
 .../src/components/Select/SelectAria.tsx      | 74 +++++++------------
 .../src/components/Select/SelectTrigger.tsx   | 45 +++++++++++
 3 files changed, 78 insertions(+), 46 deletions(-)
 create mode 100644 .changeset/old-shrimps-lick.md
 create mode 100644 packages/fuselage/src/components/Select/SelectTrigger.tsx

diff --git a/.changeset/old-shrimps-lick.md b/.changeset/old-shrimps-lick.md
new file mode 100644
index 0000000000..fa44ecc32e
--- /dev/null
+++ b/.changeset/old-shrimps-lick.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/fuselage': patch
+---
+
+fix(fuselage): SelectAria id prop overwriting
diff --git a/packages/fuselage/src/components/Select/SelectAria.tsx b/packages/fuselage/src/components/Select/SelectAria.tsx
index 3c7c56c40e..775daf3e10 100644
--- a/packages/fuselage/src/components/Select/SelectAria.tsx
+++ b/packages/fuselage/src/components/Select/SelectAria.tsx
@@ -2,13 +2,7 @@ import type { AriaSelectProps } from '@react-types/select';
 import { useMergedRefs, useResizeObserver } from '@rocket.chat/fuselage-hooks';
 import type { AllHTMLAttributes, Key, Ref } from 'react';
 import { forwardRef } from 'react';
-import {
-  useSelect,
-  HiddenSelect,
-  useButton,
-  mergeProps,
-  useFocusRing,
-} from 'react-aria';
+import { useSelect, HiddenSelect, mergeProps, useFocusRing } from 'react-aria';
 import { useSelectState } from 'react-stately';
 
 import Box from '../Box/Box';
@@ -17,9 +11,18 @@ import { OptionContainer } from '../Options';
 import { Popover } from '../Popover';
 
 import { ListBox } from './Listbox';
+import { SelectTrigger } from './SelectTrigger';
 
 export { Item } from 'react-stately';
 
+type SelectAriaProps<T extends object> = AriaSelectProps<T> & {
+  error?: string;
+  placeholder?: string;
+  value?: Key | null;
+  onChange?: (key: Key) => void;
+  small?: boolean;
+};
+
 export const SelectAria = forwardRef(function SelectAria<T extends object>(
   {
     error,
@@ -29,14 +32,9 @@ export const SelectAria = forwardRef(function SelectAria<T extends object>(
     small,
     isDisabled: isDisabledProps,
     disabled,
+    id,
     ...props
-  }: Omit<AriaSelectProps<T>, 'value' | 'onChange'> & {
-    error?: string;
-    placeholder?: string;
-    value?: Key | null;
-    onChange?: ((key: Key) => any) | undefined;
-    small?: boolean;
-  } & AllHTMLAttributes<HTMLElement>,
+  }: SelectAriaProps<T> & AllHTMLAttributes<HTMLElement>,
   outerRef: Ref<HTMLElement>,
 ) {
   const isDisabled = isDisabledProps || disabled;
@@ -49,6 +47,7 @@ export const SelectAria = forwardRef(function SelectAria<T extends object>(
   });
 
   const { ref, borderBoxSize } = useResizeObserver<any>();
+  const mergedRef = useMergedRefs(outerRef, ref);
 
   const { triggerProps, valueProps, menuProps } = useSelect(
     { isDisabled, ...props },
@@ -56,56 +55,39 @@ export const SelectAria = forwardRef(function SelectAria<T extends object>(
     ref,
   );
 
-  const { buttonProps } = useButton(triggerProps, ref);
-
   const { focusProps, isFocusVisible } = useFocusRing();
 
-  const mergedRef = useMergedRefs(outerRef, ref);
-
   return (
     <>
-      <Box
-        {...props}
-        disabled={isDisabled}
-        rcx-select
-        {...mergeProps(buttonProps, focusProps)}
-        is='button'
-        display='flex'
-        flexDirection='row'
-        fontScale='p2'
+      <HiddenSelect
+        state={state}
+        triggerRef={ref}
+        label={props.label}
+        name={props.name}
+        isDisabled={isDisabled}
+      />
+      <SelectTrigger
+        {...mergeProps(focusProps, triggerProps)}
         ref={mergedRef}
-        justifyContent='space-between'
-        rcx-input-box--small={small}
-        className={[
-          error && 'invalid',
-          isDisabled && 'disabled',
-          (isFocusVisible || state.isOpen) && 'focus',
-        ]
-          .filter(Boolean)
-          .join(' ')}
+        small={small}
+        focus={isFocusVisible || state.isOpen}
+        error={error}
+        id={id}
       >
-        <HiddenSelect
-          state={state}
-          triggerRef={ref}
-          label={props.label}
-          name={props.name}
-          isDisabled={isDisabled}
-        />
         <Box
           is='span'
-          {...valueProps}
           color={state.selectedItem ? 'default' : 'hint'}
+          {...valueProps}
           {...(small && { fontScale: 'c1' })}
         >
           {state.selectedItem ? state.selectedItem.rendered : placeholder}
         </Box>
-
         <Icon
           color='default'
           name={state.isOpen ? 'chevron-up' : 'chevron-down'}
           size='x20'
         />
-      </Box>
+      </SelectTrigger>
       {state.isOpen && (
         <Popover
           state={state}
diff --git a/packages/fuselage/src/components/Select/SelectTrigger.tsx b/packages/fuselage/src/components/Select/SelectTrigger.tsx
new file mode 100644
index 0000000000..68a9316b4c
--- /dev/null
+++ b/packages/fuselage/src/components/Select/SelectTrigger.tsx
@@ -0,0 +1,45 @@
+import type { AllHTMLAttributes, RefObject } from 'react';
+import { forwardRef } from 'react';
+import { useButton, AriaButtonProps } from 'react-aria';
+
+import Box from '../Box';
+
+type SelectTriggerProps = {
+  small?: boolean;
+  error?: string;
+  focus?: boolean;
+} & AriaButtonProps &
+  AllHTMLAttributes<HTMLButtonElement>;
+
+export const SelectTrigger = forwardRef<HTMLButtonElement, SelectTriggerProps>(
+  ({ small, error, isDisabled, focus, id, ...props }, ref) => {
+    const { buttonProps } = useButton(
+      props,
+      ref as RefObject<HTMLButtonElement | null>,
+    );
+
+    return (
+      <Box
+        {...buttonProps}
+        id={id}
+        rcx-select
+        ref={ref}
+        is='button'
+        display='flex'
+        flexDirection='row'
+        fontScale='p2'
+        justifyContent='space-between'
+        rcx-input-box--small={small}
+        className={[
+          error && 'invalid',
+          isDisabled && 'disabled',
+          focus && 'focus',
+        ]
+          .filter(Boolean)
+          .join(' ')}
+      >
+        {props.children}
+      </Box>
+    );
+  },
+);