Skip to content

Fix Autocomplete loses focus on select #9718

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
erwanMarmelab merged 2 commits into from
Mar 13, 2024
Merged

Fix Autocomplete loses focus on select #9718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
356512d
Fix Autocomplete loses focus on select
fzaninotto Mar 12, 2024
ff4ed52
Fix unit test
fzaninotto Mar 12, 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
4 changes: 3 additions & 1 deletion packages/ra-ui-materialui/src/input/AutocompleteArrayInput.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,9 @@ describe('<AutocompleteArrayInput />', () => {
);
});
expect(screen.getByDisplayValue('Russian')).not.toBeNull();
screen.getAllByRole('textbox')[0].focus();
fireEvent.keyDown(screen.getAllByRole('textbox')[0], {
key: 'ArrowDown',
});
fireEvent.click(await screen.findByText('Victor Hugo'));
await waitFor(() => {
expect(onChange).toHaveBeenCalledWith(
Expand Down
1 change: 0 additions & 1 deletion packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,6 @@ If you provided a React element for the optionText prop, you must also provide t
return (
<>
<StyledAutocomplete
blurOnSelect
className={clsx('ra-input', `ra-input-${source}`, className)}
clearText={translate(clearText, { _: clearText })}
closeText={translate(closeText, { _: closeText })}
Expand Down
19 changes: 12 additions & 7 deletions packages/ra-ui-materialui/src/list/filter/FilterButton.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as React from 'react';
import expect from 'expect';
import { render, fireEvent, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { createTheme } from '@mui/material/styles';

import { AdminContext } from '../../AdminContext';
Expand All @@ -25,6 +26,10 @@ describe('<FilterButton />', () => {
filterValues: {},
};

beforeAll(() => {
window.scrollTo = jest.fn();
});

describe('filter selection menu', () => {
it('should display only hidden filters', () => {
const hiddenFilter = (
Expand Down Expand Up @@ -189,14 +194,14 @@ describe('<FilterButton />', () => {
render(<WithAutoCompleteArrayInput />);

// Open Posts List
fireEvent.click(await screen.findByText('Posts'));
userEvent.click(await screen.findByText('Posts'));

await waitFor(() => {
expect(screen.queryAllByRole('checkbox')).toHaveLength(11);
});

fireEvent.click(await screen.findByLabelText('Open'));
fireEvent.click(await screen.findByText('Sint...'));
userEvent.click(await screen.findByLabelText('Open'));
userEvent.click(await screen.findByText('Sint...'));

await waitFor(
() => {
Expand All @@ -205,15 +210,15 @@ describe('<FilterButton />', () => {
{ timeout: 10000 }
);

fireEvent.click(screen.getByLabelText('Add filter'));
fireEvent.click(screen.getByText('Remove all filters'));
userEvent.click(screen.getByLabelText('Add filter'));
userEvent.click(screen.getByText('Remove all filters'));

await waitFor(() => {
expect(screen.getAllByRole('checkbox')).toHaveLength(11);
});

fireEvent.click(screen.getByLabelText('Open'));
fireEvent.click(screen.getByText('Sint...'));
userEvent.click(screen.getByLabelText('Open'));
userEvent.click(screen.getByText('Sint...'));

await waitFor(() => {
expect(
Expand Down