Skip to content

Fix #3608 by removing ternary and ensuring AntD FieldTemplate wraps root in Form.Item #3621

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
nickgros merged 2 commits into from
Apr 22, 2023
Merged

Fix #3608 by removing ternary and ensuring AntD FieldTemplate wraps root in Form.Item #3621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
924365e
Fix #3608
nickgros Apr 22, 2023
932fe27
Update CHANGELOG.md
nickgros Apr 22, 2023
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ should change the heading of the (upcoming) version to include a major version b

-->

# 5.6.3

## @rjsf/antd

- Fix [#3608](https://github.com/rjsf-team/react-jsonschema-form/issues/3608) by ensuring the root field is always wrapped in Form.Item

# 5.6.2

## Dev / docs / playground
Expand Down
34 changes: 15 additions & 19 deletions packages/antd/src/templates/FieldTemplate/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,25 +94,21 @@ export default function FieldTemplate<
uiSchema={uiSchema}
registry={registry}
>
{id === 'root' ? (
children
) : (
Comment on lines -97 to -99
Copy link
Contributor Author

@nickgros nickgros Apr 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

The reason the error didn't show up is because the example in #3608 had a String field as the root, and the error rendering is handled by Form.Item. Since there was no Form.Item, there was no visible error message.

<Form.Item
colon={colon}
hasFeedback={schema.type !== 'array' && schema.type !== 'object'}
help={(!!rawHelp && help) || (rawErrors?.length ? errors : undefined)}
htmlFor={id}
label={displayLabel && label}
labelCol={labelCol}
required={required}
style={wrapperStyle}
validateStatus={rawErrors?.length ? 'error' : undefined}
wrapperCol={wrapperCol}
{...descriptionProps}
>
{children}
</Form.Item>
)}
<Form.Item
colon={colon}
hasFeedback={schema.type !== 'array' && schema.type !== 'object'}
help={(!!rawHelp && help) || (rawErrors?.length ? errors : undefined)}
htmlFor={id}
label={displayLabel && label}
labelCol={labelCol}
required={required}
style={wrapperStyle}
validateStatus={rawErrors?.length ? 'error' : undefined}
wrapperCol={wrapperCol}
{...descriptionProps}
>
{children}
</Form.Item>
</WrapIfAdditionalTemplate>
);
}
Loading