From c94ec7eafa3a9478a43096603b0bb8ab1d9d2c75 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Fri, 6 Mar 2020 12:09:55 +0100 Subject: [PATCH] Add error state --- .../MultiAutocompleteSelectField.stories.tsx | 7 +++--- .../MultiAutocompleteSelectField.tsx | 23 ++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.stories.tsx b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.stories.tsx index ff7e70fc0..7b6763e7e 100644 --- a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.stories.tsx +++ b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.stories.tsx @@ -30,7 +30,7 @@ const Story: React.FC> = ({ allowCustomValues, enableLoadMore }) => { +>> = ({ enableLoadMore, ...rest }) => { const { change, data: countries } = useMultiAutocomplete([suggestions[0]]); return ( @@ -49,7 +49,7 @@ const Story: React.FC )} @@ -84,4 +84,5 @@ storiesOf("Generics / Multiple select with autocomplete", module) .add("interactive with custom option", () => ( )) - .add("interactive with load more", () => ); + .add("interactive with load more", () => ) + .add("interactive with error", () => ); diff --git a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx index 61aabf8ba..fc1fcc625 100644 --- a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx +++ b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx @@ -59,6 +59,7 @@ export interface MultiAutocompleteSelectFieldProps extends Partial { allowCustomValues?: boolean; displayValues: MultiAutocompleteChoiceType[]; + error?: boolean; name: string; choices: MultiAutocompleteChoiceType[]; value: string[]; @@ -70,19 +71,16 @@ export interface MultiAutocompleteSelectFieldProps onChange: (event: React.ChangeEvent) => void; } -const DebounceAutocomplete: React.ComponentType< - DebounceProps -> = Debounce; +const DebounceAutocomplete: React.ComponentType> = Debounce; -const MultiAutocompleteSelectFieldComponent: React.FC< - MultiAutocompleteSelectFieldProps -> = props => { +const MultiAutocompleteSelectFieldComponent: React.FC = props => { const { allowCustomValues, choices, - displayValues, - + error, hasMore, helperText, label, @@ -147,6 +145,7 @@ const MultiAutocompleteSelectFieldComponent: React.FC< id: undefined, onClick: toggleMenu }} + error={error} helperText={helperText} label={label} fullWidth={true} @@ -191,9 +190,11 @@ const MultiAutocompleteSelectFieldComponent: React.FC< ); }; -const MultiAutocompleteSelectField: React.FC< - MultiAutocompleteSelectFieldProps -> = ({ choices, fetchChoices, ...props }) => { +const MultiAutocompleteSelectField: React.FC = ({ + choices, + fetchChoices, + ...props +}) => { const [query, setQuery] = React.useState(""); if (fetchChoices) {