From 820539a6b9c0ce3e110e149fbfbc424b84420aeb Mon Sep 17 00:00:00 2001
From: Pareder <ruskc2beat@gmail.com>
Date: Wed, 24 Dec 2025 16:53:34 +0200
Subject: [PATCH] fix: prevent aria props from being passed to wrapper div

---
 src/BaseSelect/index.tsx                 |  6 ++++-
 src/SelectInput/index.tsx                |  5 ++++-
 src/hooks/useBaseProps.ts                |  1 -
 tests/Accessibility.test.tsx             | 28 ++++++++++++++++++++++++
 tests/Select.test.tsx                    |  3 +--
 tests/__snapshots__/Select.test.tsx.snap |  3 ---
 6 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/BaseSelect/index.tsx b/src/BaseSelect/index.tsx
index cb2ac94a6..1c65c2501 100644
--- a/src/BaseSelect/index.tsx
+++ b/src/BaseSelect/index.tsx
@@ -129,7 +129,11 @@ export interface BaseSelectPrivateProps {
 
 export type BaseSelectPropsWithoutPrivate = Omit<BaseSelectProps, keyof BaseSelectPrivateProps>;
 
-export interface BaseSelectProps extends BaseSelectPrivateProps, React.AriaAttributes {
+export interface BaseSelectProps
+  extends
+    BaseSelectPrivateProps,
+    React.AriaAttributes,
+    Pick<React.HTMLAttributes<HTMLElement>, 'role'> {
   // Style
   className?: string;
   style?: React.CSSProperties;
diff --git a/src/SelectInput/index.tsx b/src/SelectInput/index.tsx
index 799809560..6a11895a0 100644
--- a/src/SelectInput/index.tsx
+++ b/src/SelectInput/index.tsx
@@ -11,6 +11,7 @@ import { clsx } from 'clsx';
 import type { ComponentsConfig } from '../hooks/useComponents';
 import { getDOM } from '@rc-component/util/lib/Dom/findDOMNode';
 import { composeRef } from '@rc-component/util/lib/ref';
+import pickAttrs from '@rc-component/util/lib/pickAttrs';
 
 export interface SelectInputRef {
   focus: (options?: FocusOptions) => void;
@@ -207,6 +208,8 @@ export default React.forwardRef<SelectInputRef, SelectInputProps>(function Selec
 
   // ===================== Render =====================
   const domProps = omit(restProps, DEFAULT_OMIT_PROPS as any);
+  const ariaProps = pickAttrs(domProps, { aria: true });
+  const ariaKeys = Object.keys(ariaProps) as (keyof typeof domProps)[];
 
   // Create context value with wrapped callbacks
   const contextValue = {
@@ -228,7 +231,7 @@ export default React.forwardRef<SelectInputRef, SelectInputProps>(function Selec
   return (
     <SelectInputContext.Provider value={contextValue}>
       <div
-        {...domProps}
+        {...omit(domProps, ariaKeys)}
         // Style
         ref={rootRef}
         className={className}
diff --git a/src/hooks/useBaseProps.ts b/src/hooks/useBaseProps.ts
index 70bbe6097..827157440 100644
--- a/src/hooks/useBaseProps.ts
+++ b/src/hooks/useBaseProps.ts
@@ -10,7 +10,6 @@ export interface BaseSelectContextProps extends BaseSelectProps {
   triggerOpen: boolean;
   multiple: boolean;
   toggleOpen: (open?: boolean) => void;
-  role?: React.AriaRole;
 }
 
 export const BaseSelectContext = React.createContext<BaseSelectContextProps>(null);
diff --git a/tests/Accessibility.test.tsx b/tests/Accessibility.test.tsx
index 379405614..364cc37d6 100644
--- a/tests/Accessibility.test.tsx
+++ b/tests/Accessibility.test.tsx
@@ -213,6 +213,34 @@ describe('Select.Accessibility', () => {
         }
       });
     });
+
+    it('should pass aria and role attributes to Input component', async () => {
+      const { container } = render(
+        <Select
+          role="group"
+          aria-required="true"
+          options={[
+            {
+              value: '123',
+            },
+            {
+              value: '1234',
+            },
+            {
+              value: '12345',
+            },
+          ]}
+        />,
+      );
+
+      const wrapper = container.querySelector('.rc-select');
+      expect(wrapper).not.toHaveAttribute('role');
+      expect(wrapper).not.toHaveAttribute('aria-required');
+
+      const input = container.querySelector('input');
+      expect(input).toHaveAttribute('role', 'group');
+      expect(input).toHaveAttribute('aria-required', 'true');
+    });
   });
 
   describe('Select Input attributes', () => {
diff --git a/tests/Select.test.tsx b/tests/Select.test.tsx
index 34afca48c..9eca10556 100644
--- a/tests/Select.test.tsx
+++ b/tests/Select.test.tsx
@@ -136,12 +136,11 @@ describe('Select.Basic', () => {
       expect(container.firstChild).toMatchSnapshot();
     });
 
-    // [Legacy] Should not use `role` since it's meaningless
     it('renders role prop correctly', () => {
       const { container } = render(
         genSelect({
           role: 'button',
-        } as any),
+        }),
       );
       expect(container.firstChild).toMatchSnapshot();
     });
diff --git a/tests/__snapshots__/Select.test.tsx.snap b/tests/__snapshots__/Select.test.tsx.snap
index 14bf0353a..83ac22c3d 100644
--- a/tests/__snapshots__/Select.test.tsx.snap
+++ b/tests/__snapshots__/Select.test.tsx.snap
@@ -108,8 +108,6 @@ exports[`Select.Basic filterOption could be true as described in default value 1
 
 exports[`Select.Basic render renders aria-attributes correctly 1`] = `
 <div
-  aria-label="some-label"
-  aria-labelledby="test-id"
   class="antd select-test antd-single antd-allow-clear antd-show-search"
 >
   <div
@@ -249,7 +247,6 @@ exports[`Select.Basic render renders dropdown correctly 1`] = `null`;
 exports[`Select.Basic render renders role prop correctly 1`] = `
 <div
   class="antd select-test antd-single antd-allow-clear antd-show-search"
-  role="button"
 >
   <div
     class="antd-content"