Skip to content

[Autocomplete] Display loading feedback with freeSolo #20869

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
merged 3 commits into from
May 3, 2020
Merged

[Autocomplete] Display loading feedback with freeSolo #20869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5b7e0e
[Autocomplete] Loading feedback with freeSolo
May 1, 2020
f31894a
add new regression test
oliviertassinari May 2, 2020
553f533
fix lint error
oliviertassinari May 2, 2020
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
15 changes: 15 additions & 0 deletions packages/material-ui-lab/src/Autocomplete/Autocomplete.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,21 @@ describe('<Autocomplete />', () => {
});
});

describe('prop: loading', () => {
it('should show a loading message when open', () => {
render(
<Autocomplete
{...defaultProps}
freeSolo
loading
renderInput={(params) => <TextField autoFocus {...params} />}
/>,
);
fireEvent.keyDown(document.activeElement, { key: 'ArrowDown' });
expect(document.querySelector(`.${classes.paper}`).textContent).to.equal('Loading…');
});
});

describe('prop: autoHighlight', () => {
it('should set the focus on the first item', () => {
const options = ['one', 'two'];
Expand Down
8 changes: 3 additions & 5 deletions packages/material-ui-lab/src/useAutocomplete/useAutocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export default function useAutocomplete(props) {
const inputValueIsSelectedValue =
!multiple && value != null && inputValue === getOptionLabel(value);

let popupOpen = open;
const popupOpen = open;

const filteredOptions = popupOpen
? filterOptions(
Expand All @@ -263,8 +263,6 @@ export default function useAutocomplete(props) {
)
: [];

popupOpen = freeSolo && filteredOptions.length === 0 ? false : popupOpen;

if (process.env.NODE_ENV !== 'production') {
if (value !== null && !freeSolo && options.length > 0) {
const missingValue = (multiple ? value : [value]).filter(
Expand Down Expand Up @@ -405,7 +403,7 @@ export default function useAutocomplete(props) {
});

React.useEffect(() => {
if (!open) {
if (!popupOpen) {
return;
}

Expand Down Expand Up @@ -451,7 +449,7 @@ export default function useAutocomplete(props) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [
value,
open,
popupOpen,
filterSelectedOptions,
changeHighlightedIndex,
setHighlightedIndex,
Expand Down