[Form lib] Prevent idAria prop to be passed on EuiFormRow components (#84079)

This commit is contained in:
Christos Nasikas 2020-11-23 19:43:05 +02:00 committed by GitHub
parent a9a949366e
commit f52fbdc703
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 27 additions and 22 deletions

View file

@ -30,7 +30,7 @@ interface Props {
[key: string]: any;
}
export const CheckBoxField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const CheckBoxField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
return (
@ -39,7 +39,7 @@ export const CheckBoxField = ({ field, euiFieldProps = {}, ...rest }: Props) =>
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiCheckbox

View file

@ -30,7 +30,7 @@ interface Props {
[key: string]: any;
}
export const ComboBoxField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const ComboBoxField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
// Errors for the comboBox value (the "array")
const errorMessageField = field.getErrorsMessages();
@ -87,7 +87,7 @@ export const ComboBoxField = ({ field, euiFieldProps = {}, ...rest }: Props) =>
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiComboBox

View file

@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}
export const MultiSelectField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const MultiSelectField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
return (
@ -39,7 +39,7 @@ export const MultiSelectField = ({ field, euiFieldProps = {}, ...rest }: Props)
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiSelectable

View file

@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}
export const NumericField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const NumericField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
return (
@ -39,7 +39,7 @@ export const NumericField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiFieldNumber

View file

@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}
export const RadioGroupField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const RadioGroupField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
return (
@ -39,7 +39,7 @@ export const RadioGroupField = ({ field, euiFieldProps = {}, ...rest }: Props) =
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiRadioGroup

View file

@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}
export const RangeField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const RangeField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
const { onChange: onFieldChange } = field;
@ -50,7 +50,7 @@ export const RangeField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiRange

View file

@ -34,7 +34,7 @@ interface Props {
[key: string]: any;
}
export const SelectField = ({ field, euiFieldProps, ...rest }: Props) => {
export const SelectField = ({ field, euiFieldProps, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
return (
@ -44,7 +44,7 @@ export const SelectField = ({ field, euiFieldProps, ...rest }: Props) => {
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiSelect

View file

@ -32,7 +32,12 @@ interface Props {
[key: string]: any;
}
export const SuperSelectField = ({ field, euiFieldProps = { options: [] }, ...rest }: Props) => {
export const SuperSelectField = ({
field,
euiFieldProps = { options: [] },
idAria,
...rest
}: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
return (
@ -42,7 +47,7 @@ export const SuperSelectField = ({ field, euiFieldProps = { options: [] }, ...re
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiSuperSelect

View file

@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}
export const TextAreaField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const TextAreaField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
return (
@ -39,7 +39,7 @@ export const TextAreaField = ({ field, euiFieldProps = {}, ...rest }: Props) =>
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiTextArea

View file

@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}
export const TextField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const TextField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
return (
@ -39,7 +39,7 @@ export const TextField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiFieldText

View file

@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}
export const ToggleField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const ToggleField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
// Shim for sufficient overlap between EuiSwitchEvent and FieldHook[onChange] event
@ -46,7 +46,7 @@ export const ToggleField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiSwitch