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

Feature: Blur input on suggestion create #6646

Merged
merged 17 commits into from
Oct 14, 2021
Merged

Feature: Blur input on suggestion create #6646

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3cd9775
Merge remote-tracking branch 'upstream/next' into next
andrico1234 Jun 20, 2021
beeee64
Merge branch 'next' of github.com:andrico1234/react-admin into next
andrico1234 Jun 20, 2021
14958bb
Merge branch 'next' of github.com:andrico1234/react-admin into next
Jun 22, 2021
02c0e92
Merge remote-tracking branch 'upstream/next' into next
Jun 22, 2021
2b0bbff
Merge remote-tracking branch 'upstream/next' into next
Jun 25, 2021
ba95e3b
Merge remote-tracking branch 'upstream/next' into next
Jul 5, 2021
a07ff74
Merge remote-tracking branch 'upstream/next' into next
Sep 29, 2021
55adfbe
Merge remote-tracking branch 'upstream/next' into next
Oct 4, 2021
3ea0e53
blurautocomplete after creting item, don't show create button if valu…
Oct 4, 2021
82aed27
blurautocomplete after creting item, don't show create button if valu…
Oct 4, 2021
be1f464
get it working with string, function, and component
Oct 5, 2021
808abf4
fix broken test
Oct 5, 2021
09de807
fix failing test
andrico1234 Oct 7, 2021
b7c9e27
fix broken e2e test
Oct 12, 2021
ebebd83
Merge branch 'next' into feature/blur-input-on-suggestion-create
Oct 12, 2021
166ddf4
Revert the onCreateNewItem option on useSupportCreateSuggestion
Oct 14, 2021
8d2c5b5
Fix e2e test
Oct 14, 2021
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
19 changes: 18 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 @@ -221,6 +221,16 @@ export const AutocompleteInput = (props: AutocompleteInputProps) => {
[input.value, getSuggestionFromValue]
);

const doesQueryMatchSuggestion = useMemo(() => {
if (typeof optionText !== 'string') {
return false;
}
andrico1234 marked this conversation as resolved.
Show resolved Hide resolved

return choices.some(choice => get(choice, optionText) === filterValue);
}, [choices, optionText, filterValue]);

const shouldAllowCreate = !doesQueryMatchSuggestion;

const { getChoiceText, getChoiceValue, getSuggestions } = useSuggestions({
allowEmpty,
choices,
Expand All @@ -247,6 +257,10 @@ export const AutocompleteInput = (props: AutocompleteInputProps) => {
[filterValue, getChoiceValue, input]
);

const onCreateNewItem = () => {
inputEl.current.blur();
};
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we don't need the onCreateNewItem and we can just call inputEl.current.blur(); at the end of the effect which run when the input value changes at L283.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made the change btw


const {
getCreateItem,
handleChange: handleChangeWithCreateSupport,
Expand All @@ -257,6 +271,7 @@ export const AutocompleteInput = (props: AutocompleteInputProps) => {
createItemLabel,
createValue,
handleChange,
onCreateNewItem,
filter: filterValue,
onCreate,
optionText,
Expand Down Expand Up @@ -494,7 +509,9 @@ export const AutocompleteInput = (props: AutocompleteInputProps) => {
});
const suggestions = [
...getSuggestions(filterValue),
...(onCreate || create ? [getCreateItem()] : []),
...((onCreate || create) && shouldAllowCreate
? [getCreateItem()]
: []),
];

return (
Expand Down
6 changes: 6 additions & 0 deletions packages/ra-ui-materialui/src/input/useSupportCreateSuggestion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export const useSupportCreateSuggestion = (
filter,
handleChange,
onCreate,
onCreateNewItem,
} = options;
const translate = useTranslate();
const [renderOnCreate, setRenderOnCreate] = useState(false);
Expand All @@ -47,6 +48,10 @@ export const useSupportCreateSuggestion = (
onCreate: item => {
setRenderOnCreate(false);
handleChange(undefined, item);

if (onCreateNewItem) {
onCreateNewItem(item);
}
},
};

Expand Down Expand Up @@ -117,6 +122,7 @@ export interface SupportCreateSuggestionOptions {
filter?: string;
handleChange: (value: any, newChoice: any) => void;
onCreate?: OnCreateHandler;
onCreateNewItem?: (value: any) => void;
optionText?: OptionText;
}

Expand Down