Skip to content

UI: Fix keyboard navigation bug for "reset" option in Select #33268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valentinpalkovic merged 1 commit into from
Dec 9, 2025
+50 −4
Merged

UI: Fix keyboard navigation bug for "reset" option in Select #33268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions code/core/src/components/components/Select/Select.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,47 @@ export const KeyboardSelectionMultiSS = meta.story({
play: kbMultiSelectionTest(' ', ' '),
});

export const FullArrowNavigation = meta.story({
play: async ({ canvas, step }) => {
const selectButton = await canvas.findByRole('button');
await step('Open select', async () => {
selectButton.focus();
await userEvent.keyboard('{ArrowDown}');
expect(selectButton).toHaveTextContent('Tadpole');
});

await step('Navigate to option 2 with ArrowDown', async () => {
await userEvent.keyboard('{ArrowDown}');
expect(selectButton).toHaveTextContent('Pollywog');
});

await step('Navigate to option 3 with ArrowDown', async () => {
await userEvent.keyboard('{ArrowDown}');
expect(selectButton).toHaveTextContent('Frog');
});

await step('Loop back to option 1 with ArrowDown', async () => {
await userEvent.keyboard('{ArrowDown}');
expect(selectButton).toHaveTextContent('Tadpole');
});

await step('Navigate backwards with ArrowUp', async () => {
await userEvent.keyboard('{ArrowUp}');
expect(selectButton).toHaveTextContent('Frog');
});

await step('Navigate backwards with ArrowUp', async () => {
await userEvent.keyboard('{ArrowUp}');
expect(selectButton).toHaveTextContent('Pollywog');
});

await step('Navigate back to option 1 with ArrowUp', async () => {
await userEvent.keyboard('{ArrowUp}');
expect(selectButton).toHaveTextContent('Tadpole');
});
},
});

export const MouseOpenNoAutoselect = meta.story({
name: 'AutoSelect - nothing selected on Mouse open (single)',
play: async ({ canvas, args, step }) => {
Expand Down
13 changes: 9 additions & 4 deletions code/core/src/components/components/Select/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,10 @@ export const Select = forwardRef<HTMLButtonElement, SelectProps>(
return;
}

const currentIndex = options.findIndex(
(option) => externalToValue(option.value) === activeOption.value
const currentIndex = options.findIndex((option) =>
activeOption.type === 'reset'
? 'type' in option && option.type === 'reset'
: externalToValue(option.value) === activeOption.value
);
const nextIndex = currentIndex + step;

Expand All @@ -349,8 +351,11 @@ export const Select = forwardRef<HTMLButtonElement, SelectProps>(
setActiveOption(options[Math.max(0, options.length - step)]);
return;
}
const currentIndex = options.findIndex(
(option) => externalToValue(option.value) === activeOption.value

const currentIndex = options.findIndex((option) =>
activeOption.type === 'reset'
? 'type' in option && option.type === 'reset'
: externalToValue(option.value) === activeOption.value
);
const nextIndex = currentIndex - step;

Expand Down