Skip to content

Commit 18912c1

Browse files
authored
Fix Select autoFocus (#8262)
1 parent 30c8693 commit 18912c1

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

packages/react-aria-components/src/Select.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ function SelectInner<T extends object>({props, selectRef: ref, collection}: Sele
178178
[SelectStateContext, state],
179179
[SelectValueContext, valueProps],
180180
[LabelContext, {...labelProps, ref: labelRef, elementType: 'span'}],
181-
[ButtonContext, {...triggerProps, ref: buttonRef, isPressed: state.isOpen}],
181+
[ButtonContext, {...triggerProps, ref: buttonRef, isPressed: state.isOpen, autoFocus: props.autoFocus}],
182182
[OverlayTriggerStateContext, state],
183183
[PopoverContext, {
184184
trigger: 'Select',

packages/react-aria-components/test/Select.test.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,4 +368,13 @@ describe('Select', () => {
368368
await selectTester.selectOption({option: 'Kangaroo'});
369369
expect(trigger).toHaveTextContent('Kangaroo');
370370
});
371+
372+
it('should support autoFocus', () => {
373+
let {getByTestId} = render(<TestSelect autoFocus />);
374+
let selectTester = testUtilUser.createTester('Select', {
375+
root: getByTestId('select')
376+
});
377+
let trigger = selectTester.trigger;
378+
expect(document.activeElement).toBe(trigger);
379+
});
371380
});

0 commit comments

Comments
 (0)