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

Jump to bottom

fix: ErrorMessage can not be displayed in two expression field. #2278

Merged
merged 3 commits into from
Mar 17, 2020
Merged

fix: ErrorMessage can not be displayed in two expression field. #2278

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23f02e9
fixed
alanlong9278 Mar 16, 2020
ff5fd97
Merge branch 'master' into julong/errInTwoField
alanlong9278 Mar 17, 2020
2aa4d3a
Merge branch 'master' into julong/errInTwoField
a-b-r-o-w-n Mar 17, 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
10 changes: 7 additions & 3 deletions Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/twoSettingFields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ interface TwoSettingFieldsProps extends FieldProps<MicrosoftInputDialog> {
}
export const TwoSettingFields: React.FC<TwoSettingFieldsProps> = props => {
const { fields, formData, idSchema, getSchema, onChange, errorSchema } = props;
const errs: (JSX.Element | string | undefined)[] = [];
const [errorMessage, setErrorMessage] = useState<JSX.Element | string | undefined>();

const onValidate = (err?: JSX.Element | string) => {
setErrorMessage(err);
const onValidate = (index: number, err?: JSX.Element | string | undefined) => {
errs[index] = err;
setErrorMessage(errs.find(err => err || null));
};

return (
Expand All @@ -40,7 +42,9 @@ export const TwoSettingFields: React.FC<TwoSettingFieldsProps> = props => {
formContext={props.formContext}
rawErrors={errorSchema[settingField.name] && errorSchema[settingField.name].__errors}
hiddenErrMessage={true}
onValidate={onValidate}
onValidate={errMsg => {
onValidate(index, errMsg);
}}
/>
</div>
))}
Expand Down