Skip to content
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

fix: focus issue in filterable multiselect #16840

Merged
merged 9 commits into from
Jun 26, 2024
Merged

fix: focus issue in filterable multiselect #16840

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3807fbd
fix: focus issue in filterable multiselect
riddhybansal Jun 21, 2024
cef7483
fix: added test cases and focus fixes
riddhybansal Jun 26, 2024
a02e0a3
Merge branch 'main' into Filterable_multiselect_onFocus_issue
riddhybansal Jun 26, 2024
3943d39
Merge branch 'main' into Filterable_multiselect_onFocus_issue
riddhybansal Jun 26, 2024
7530ef8
Update FilterableMultiSelect-test.js
riddhybansal Jun 26, 2024
6646392
Update FilterableMultiSelect-test.js
riddhybansal Jun 26, 2024
96b2504
Update MultiSelect.stories.js
riddhybansal Jun 26, 2024
3047399
Update packages/react/src/components/MultiSelect/FilterableMultiSelec…
tay1orjones Jun 26, 2024
0574970
Merge branch 'main' into Filterable_multiselect_onFocus_issue
tay1orjones Jun 26, 2024
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
7 changes: 5 additions & 2 deletions packages/react/src/components/MultiSelect/FilterableMultiSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 +518,6 @@ const FilterableMultiSelect = React.forwardRef(function FilterableMultiSelect<
return changes;
case InputBlur:
case InputKeyDownEscape:
setInputFocused(false);
setInputValue('');
setIsOpen(false);
return changes;
case FunctionToggleMenu:
Expand Down Expand Up @@ -714,6 +712,11 @@ const FilterableMultiSelect = React.forwardRef(function FilterableMultiSelect<
}
},
onFocus: () => setInputFocused(true),
onBlur: () => {
!isOpen && setInputFocused(false);
setInputValue('');
// setIsOpen(false);
tay1orjones marked this conversation as resolved.
Show resolved Hide resolved
},
})
);
const menuProps = getMenuProps({}, { suppressRefError: true });
Expand Down
14 changes: 14 additions & 0 deletions packages/react/src/components/MultiSelect/__tests__/FilterableMultiSelect-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,20 @@ describe('FilterableMultiSelect', () => {
expect(screen.getByPlaceholderText('test')).toHaveDisplayValue(3);
});

it('should clear input value when clicking on cross button', async () => {
render(<FilterableMultiSelect {...mockProps} placeholder="test" />);
await openMenu();

await userEvent.type(screen.getByPlaceholderText('test'), '3');

const clearButton = screen.getByRole('button', {
name: 'Clear selected item',
});
await userEvent.click(clearButton);

expect(screen.getByPlaceholderText('test')).toHaveDisplayValue('');
});

it('should respect slug prop', async () => {
const { container } = render(
<FilterableMultiSelect {...mockProps} slug={<Slug />} />
Expand Down
Loading