Backport marmelab#9718

mjarosch · Jul 1, 2024 · e2dc458 · e2dc458
1 parent 19e7181
commit e2dc458
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.spec.tsx b/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.spec.tsx
@@ -880,7 +880,9 @@ describe('<AutocompleteArrayInput />', () => {
         });
         expect(screen.getByText('Technical')).not.toBeNull();
         expect(screen.getByText('Programming')).not.toBeNull();
-        expect(screen.getByText('ra.action.create_item')).not.toBeNull();
+        await waitFor(() => {
+            expect(screen.getByText('ra.action.create_item')).not.toBeNull();
+        });
     });
 
     it('should support creation of a new choice through the onCreate event when optionText is a function', async () => {
@@ -1108,8 +1110,9 @@ describe('<AutocompleteArrayInput />', () => {
                 ]
             );
         });
+        screen.getByRole('combobox').blur();
         expect(screen.getByDisplayValue('Russian')).not.toBeNull();
-        screen.getAllByRole('combobox')[0].focus();
+        screen.getByRole('combobox').focus();
         fireEvent.click(await screen.findByText('Victor Hugo'));
         await waitFor(() => {
             expect(onChange).toHaveBeenCalledWith(

diff --git a/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx b/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
@@ -557,7 +557,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 })}

diff --git a/packages/ra-ui-materialui/src/list/filter/FilterButton.spec.tsx b/packages/ra-ui-materialui/src/list/filter/FilterButton.spec.tsx
@@ -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 {
     ListContextProvider,
@@ -234,14 +235,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 screen.findByLabelText('Add filter');
             await waitFor(