Skip to content

Commit 70f8a25

Browse files
committed
Merge remote-tracking branch 'origin/main' into input-const
2 parents b25315f + b5ce52e commit 70f8a25

File tree

24 files changed

+325
-149
lines changed

24 files changed

+325
-149
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ should change the heading of the (upcoming) version to include a major version b
2323
- Updated `SchemaField` to pass `required` flag to `_AnyOfField`/`_OneOfField`
2424
- Updated `Form` to deal with null objects in `filterErrorsBasedOnSchema()`, fixing [#4306](https://github.com/rjsf-team/react-jsonschema-form/issues/4306)
2525

26+
## @rjsf/utils
27+
28+
- Updated `ErrorSchemaBuilder` to support adding, updating, and removing paths that are numbers, fixing [#4297](https://github.com/rjsf-team/react-jsonschema-form/issues/4297)
29+
- Updated `retrieveSchema` to not merge `contains` properties in `allOf` schema lists, fixing [#2923](https://github.com/rjsf-team/react-jsonschema-form/issues/2923#issuecomment-1946034240)
30+
2631
## Dev / docs / playground
2732

2833
- Updated the `custom-widgets-fields.md` to add examples of wrapping a widget/field

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"packages": ["packages/*"],
3-
"version": "5.21.1",
3+
"version": "5.21.2",
44
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
55
"useNx": true,
66
"useWorkspaces": true

package-lock.json

Lines changed: 68 additions & 68 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/antd/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rjsf/antd",
3-
"version": "5.21.1",
3+
"version": "5.21.2",
44
"description": "Ant Design theme, fields and widgets for react-jsonschema-form",
55
"main": "dist/index.js",
66
"module": "lib/index.js",
@@ -56,10 +56,10 @@
5656
"@babel/preset-env": "^7.23.9",
5757
"@babel/preset-react": "^7.23.3",
5858
"@babel/preset-typescript": "^7.23.3",
59-
"@rjsf/core": "^5.21.1",
60-
"@rjsf/snapshot-tests": "^5.21.1",
61-
"@rjsf/utils": "^5.21.1",
62-
"@rjsf/validator-ajv8": "^5.21.1",
59+
"@rjsf/core": "^5.21.2",
60+
"@rjsf/snapshot-tests": "^5.21.2",
61+
"@rjsf/utils": "^5.21.2",
62+
"@rjsf/validator-ajv8": "^5.21.2",
6363
"@rollup/plugin-replace": "^5.0.5",
6464
"@types/jest": "^29.5.12",
6565
"@types/lodash": "^4.14.202",

packages/bootstrap-4/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rjsf/bootstrap-4",
3-
"version": "5.21.1",
3+
"version": "5.21.2",
44
"main": "dist/index.js",
55
"module": "lib/index.js",
66
"typings": "lib/index.d.ts",
@@ -49,10 +49,10 @@
4949
"@babel/preset-env": "^7.23.9",
5050
"@babel/preset-react": "^7.23.3",
5151
"@babel/preset-typescript": "^7.23.3",
52-
"@rjsf/core": "^5.21.1",
53-
"@rjsf/snapshot-tests": "^5.21.1",
54-
"@rjsf/utils": "^5.21.1",
55-
"@rjsf/validator-ajv8": "^5.21.1",
52+
"@rjsf/core": "^5.21.2",
53+
"@rjsf/snapshot-tests": "^5.21.2",
54+
"@rjsf/utils": "^5.21.2",
55+
"@rjsf/validator-ajv8": "^5.21.2",
5656
"@types/jest": "^29.5.12",
5757
"@types/react": "^18.2.58",
5858
"@types/react-dom": "^18.2.19",

0 commit comments

Comments
 (0)