From 62bd57becf5b6d87bee24e6e9d1731625ad418a5 Mon Sep 17 00:00:00 2001 From: han Date: Tue, 8 Nov 2022 16:52:36 +0800 Subject: [PATCH 1/3] fix(#3233): fix rendering 0 when there are no errors. --- packages/antd/src/templates/FieldTemplate/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/antd/src/templates/FieldTemplate/index.tsx b/packages/antd/src/templates/FieldTemplate/index.tsx index 87d8800619..3d2d98fb92 100644 --- a/packages/antd/src/templates/FieldTemplate/index.tsx +++ b/packages/antd/src/templates/FieldTemplate/index.tsx @@ -69,7 +69,7 @@ const FieldTemplate = ({ colon={colon} extra={rawDescription && description} hasFeedback={schema.type !== "array" && schema.type !== "object"} - help={(!!rawHelp && help) || (rawErrors?.length && errors)} + help={(!!rawHelp && help) || (rawErrors?.length ? errors : undefined)} htmlFor={id} label={displayLabel && label} labelCol={labelCol} From 4fa0b92217b64abe2ff846ed29e6e62db12a7479 Mon Sep 17 00:00:00 2001 From: han Date: Fri, 2 Dec 2022 14:33:52 +0800 Subject: [PATCH 2/3] fix: update snapshot and changelog --- CHANGELOG.md | 3 +++ .../antd/test/__snapshots__/Array.test.tsx.snap | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a37377c983..66de3cc817 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,9 @@ should change the heading of the (upcoming) version to include a major version b - For JSON Schemas with `$id`s, use a pre-compiled Ajv validation function when available. - No longer fail to validate inner schemas with `$id`s, fixing [#2821](https://github.com/rjsf-team/react-jsonschema-form/issues/2181). +## @rjsf/antd +- No longer render extra 0 for array without errors, fixing [#3233](https://github.com/rjsf-team/react-jsonschema-form/issues/3233) + # 5.0.0-beta.12 ## @rjsf/antd diff --git a/packages/antd/test/__snapshots__/Array.test.tsx.snap b/packages/antd/test/__snapshots__/Array.test.tsx.snap index 40513b922b..e9c23e4303 100644 --- a/packages/antd/test/__snapshots__/Array.test.tsx.snap +++ b/packages/antd/test/__snapshots__/Array.test.tsx.snap @@ -22,7 +22,7 @@ exports[`array fields array 1`] = ` } } > - +
- +
- +  
@@ -731,7 +731,7 @@ exports[`array fields empty errors array 1`] = ` } } > - +
- +
- +
- +
Date: Mon, 5 Dec 2022 15:48:19 +0800 Subject: [PATCH 3/3] fix: update snapshot --- .../antd/test/__snapshots__/Array.test.tsx.snap | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/antd/test/__snapshots__/Array.test.tsx.snap b/packages/antd/test/__snapshots__/Array.test.tsx.snap index e9c23e4303..1bb419e642 100644 --- a/packages/antd/test/__snapshots__/Array.test.tsx.snap +++ b/packages/antd/test/__snapshots__/Array.test.tsx.snap @@ -22,7 +22,7 @@ exports[`array fields array 1`] = ` } } > - +
- +
- +  
@@ -731,7 +731,7 @@ exports[`array fields empty errors array 1`] = ` } } > - +
- +
- +
- +