Skip to content

pass raw errors to field widgets #826

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
glasserc merged 5 commits into from
Feb 7, 2018
Merged

pass raw errors to field widgets #826

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12faf7c
pass raw errors to field widgets
llamamoray Jan 29, 2018
62ad2da
fixed formatting
llamamoray Jan 29, 2018
2e1ff4c
fixing line endings
llamamoray Jan 29, 2018
27b38ec
Pass raw errors into Field at creation; object destructuring; added t…
llamamoray Feb 2, 2018
2386255
fix lineEndings
llamamoray Feb 2, 2018
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
5 changes: 5 additions & 0 deletions src/components/fields/ArrayField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ class ArrayField extends Component {
onBlur,
onFocus,
registry = getDefaultRegistry(),
rawErrors,
} = this.props;
const items = this.props.formData;
const { widgets, definitions, formContext } = registry;
Expand All @@ -455,6 +456,7 @@ class ArrayField extends Component {
readonly={readonly}
formContext={formContext}
autofocus={autofocus}
rawErrors={rawErrors}
/>
);
}
Expand All @@ -471,6 +473,7 @@ class ArrayField extends Component {
onBlur,
onFocus,
registry = getDefaultRegistry(),
rawErrors,
} = this.props;
const title = schema.title || name;
const items = this.props.formData;
Expand All @@ -492,6 +495,7 @@ class ArrayField extends Component {
readonly={readonly}
formContext={formContext}
autofocus={autofocus}
rawErrors={rawErrors}
/>
);
}
Expand Down Expand Up @@ -697,6 +701,7 @@ if (process.env.NODE_ENV !== "production") {
definitions: PropTypes.object.isRequired,
formContext: PropTypes.object.isRequired,
}),
rawErrors: PropTypes.arrayOf(PropTypes.string),
};
}

Expand Down
3 changes: 3 additions & 0 deletions src/components/fields/BooleanField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ function BooleanField(props) {
readonly,
autofocus,
onChange,
rawErrors,
} = props;
const { title } = schema;
const { widgets, formContext } = registry;
Expand All @@ -44,6 +45,7 @@ function BooleanField(props) {
registry={registry}
formContext={formContext}
autofocus={autofocus}
rawErrors={rawErrors}
/>
);
}
Expand All @@ -67,6 +69,7 @@ if (process.env.NODE_ENV !== "production") {
definitions: PropTypes.object.isRequired,
formContext: PropTypes.object.isRequired,
}),
rawErrors: PropTypes.arrayOf(PropTypes.string),
};
}

Expand Down
4 changes: 3 additions & 1 deletion src/components/fields/SchemaField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ function DefaultTemplate(props) {
<div className={classNames}>
{displayLabel && <Label label={label} required={required} id={id} />}
{displayLabel && description ? description : null}
{children}
{React.Children.map(children, child => {
return React.cloneElement(child, { rawErrors: props.rawErrors });
})}

@glasserc glasserc Feb 1, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This seems a bit heavy. Why is this necessary? Wouldn't it be better to pass the rawErrors prop when we constructed widgets?

@llamamoray llamamoray Feb 2, 2018

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I've just reviewed the code again and I see that this can be passed through the SchemaFieldRender function. I'll update this.

{errors}
{help}
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/components/fields/StringField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function StringField(props) {
onBlur,
onFocus,
registry = getDefaultRegistry(),
rawErrors,
} = props;
const { title, format } = schema;
const { widgets, formContext } = registry;
Expand Down Expand Up @@ -51,6 +52,7 @@ function StringField(props) {
autofocus={autofocus}
registry={registry}
placeholder={placeholder}
rawErrors={rawErrors}
/>
);
}
Expand All @@ -77,6 +79,7 @@ if (process.env.NODE_ENV !== "production") {
disabled: PropTypes.bool,
readonly: PropTypes.bool,
autofocus: PropTypes.bool,
rawErrors: PropTypes.arrayOf(PropTypes.string),
};
}

Expand Down
6 changes: 5 additions & 1 deletion src/components/widgets/BaseInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,18 @@ function BaseInput(props) {
const _onChange = ({ target: { value } }) => {
return props.onChange(value === "" ? options.emptyValue : value);
};

const cleanProps = { ...inputProps };
delete cleanProps.rawErrors;

@glasserc glasserc Feb 1, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think you can do const {rawErrors, ...cleanProps} = inputProps; See the "Rest in object destructuring section" of https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment#Object_destructuring.


return (
<input
className="form-control"
readOnly={readonly}
disabled={disabled}
autoFocus={autofocus}
value={value == null ? "" : value}
{...inputProps}
{...cleanProps}
onChange={_onChange}
onBlur={onBlur && (event => onBlur(inputProps.id, event.target.value))}
onFocus={onFocus && (event => onFocus(inputProps.id, event.target.value))}
Expand Down