Merge branch 'main' into patch-1

rjsf-team · Dec 21, 2022 · 9584991 · 9584991
2 parents 2221b78 + 3f896f2
commit 9584991
Show file tree

Hide file tree

Showing 31 changed files with 342 additions and 2,177 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,17 @@ it according to semantic versioning. For example, if your PR adds a breaking cha
 should change the heading of the (upcoming) version to include a major version bump.
 
 -->
+# 5.0.0-beta-15
+
+# @rjsf/core
+- Pass the `schema` along to the `ArrayFieldItemTemplate` as part of the fix for [#3253](https://github.com/rjsf-team/react-jsonschema-form/issues/3253)
+
+# @rjsf/utils
+- Update the `ArrayFieldItemTemplate` to add `schema` as part of the fix for [#3253](https://github.com/rjsf-team/react-jsonschema-form/issues/3253)
+
+## Dev / docs / playground
+- Fixed the documentation for `ArrayFieldItemTemplate` as part of the fix for [#3253](https://github.com/rjsf-team/react-jsonschema-form/issues/3253)
+
 # 5.0.0-beta.14
 
 ## @rjsf/antd

diff --git a/docs/advanced-customization/custom-templates.md b/docs/advanced-customization/custom-templates.md
@@ -222,6 +222,7 @@ The following props are passed to each `ArrayFieldItemTemplate`:
 - `onDropIndexClick: (index) => (event?) => void`: Returns a function that removes the item at `index`.
 - `onReorderClick: (index, newIndex) => (event?) => void`: Returns a function that swaps the items at `index` with `newIndex`.
 - `readonly`: A boolean value stating if the array item is read-only.
+- `schema`: The schema object for this array item.
 - `uiSchema`: The uiSchema object for this array item.
 - `registry`: The `registry` object.
 

diff --git a/docs/api-reference/uiSchema.md b/docs/api-reference/uiSchema.md
@@ -90,7 +90,7 @@ See [Custom Widgets and Fields](https://react-jsonschema-form.readthedocs.io/en/
 
 ### classNames
 
-The uiSchema object accepts a `classNames` property for each field of the schema:
+The uiSchema object accepts a `ui:classNames` property for each field of the schema:
 
 ```tsx
 import { UiSchema } from "@rjsf/utils";

diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -63,7 +63,7 @@ const schema: RJSFSchema = {
 };
 
 const uiSchema: UiSchema = {
-  classNames: "custom-css-class"
+  "ui:classNames": "custom-css-class"
 };
 
 render((
@@ -94,10 +94,10 @@ const schema: RJSFSchema = {
 
 const uiSchema: UiSchema = {
   name: {
-    classNames: "custom-class-name"
+    "ui:classNames": "custom-class-name"
   },
   age: {
-    classNames: "custom-class-age"
+    "ui:classNames": "custom-class-age"
   }
 }
 

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.14",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": true,
   "useWorkspaces": false

diff --git a/packages/antd/package-lock.json b/packages/antd/package-lock.json
diff --git a/packages/antd/package.json b/packages/antd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/antd",
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.14",
   "description": "Ant Design theme, fields and widgets for react-jsonschema-form",
   "main": "dist/index.js",
   "module": "dist/antd.esm.js",
@@ -46,9 +46,9 @@
     "@babel/preset-env": "^7.19.4",
     "@babel/preset-react": "^7.18.6",
     "@babel/register": "^7.18.9",
-    "@rjsf/core": "^5.0.0-beta.13",
-    "@rjsf/utils": "^5.0.0-beta.13",
-    "@rjsf/validator-ajv8": "^5.0.0-beta.13",
+    "@rjsf/core": "^5.0.0-beta.14",
+    "@rjsf/utils": "^5.0.0-beta.14",
+    "@rjsf/validator-ajv8": "^5.0.0-beta.14",
     "@rollup/plugin-replace": "^5.0.1",
     "@types/lodash": "^4.14.186",
     "@types/react": "^17.0.39",

diff --git a/packages/bootstrap-4/package-lock.json b/packages/bootstrap-4/package-lock.json
diff --git a/packages/bootstrap-4/package.json b/packages/bootstrap-4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/bootstrap-4",
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.14",
   "main": "dist/index.js",
   "module": "dist/bootstrap-4.esm.js",
   "typings": "dist/index.d.ts",
@@ -44,9 +44,9 @@
     "@babel/plugin-transform-modules-commonjs": "^7.19.6",
     "@babel/preset-env": "^7.19.4",
     "@babel/preset-react": "^7.18.6",
-    "@rjsf/core": "^5.0.0-beta.13",
-    "@rjsf/utils": "^5.0.0-beta.13",
-    "@rjsf/validator-ajv8": "^5.0.0-beta.13",
+    "@rjsf/core": "^5.0.0-beta.14",
+    "@rjsf/utils": "^5.0.0-beta.14",
+    "@rjsf/validator-ajv8": "^5.0.0-beta.14",
     "@types/react": "^17.0.48",
     "@types/react-dom": "^17.0.17",
     "@types/react-test-renderer": "^17.0.2",

diff --git a/packages/chakra-ui/package-lock.json b/packages/chakra-ui/package-lock.json
diff --git a/packages/chakra-ui/package.json b/packages/chakra-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/chakra-ui",
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.14",
   "description": "Chakra UI theme, fields, and widgets for react-jsonschema-form",
   "main": "dist/index.js",
   "module": "dist/chakra-ui.esm.js",
@@ -60,9 +60,9 @@
     "@emotion/jest": "^11.10.0",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
-    "@rjsf/core": "^5.0.0-beta.13",
-    "@rjsf/utils": "^5.0.0-beta.13",
-    "@rjsf/validator-ajv8": "^5.0.0-beta.13",
+    "@rjsf/core": "^5.0.0-beta.14",
+    "@rjsf/utils": "^5.0.0-beta.14",
+    "@rjsf/validator-ajv8": "^5.0.0-beta.14",
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",
     "@types/react-test-renderer": "^17.0.1",

diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/core",
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.14",
   "description": "A simple React component capable of building HTML forms out of a JSON schema.",
   "scripts": {
     "build": "rimraf dist && dts build --rollupTypes --format cjs,esm,umd",
@@ -52,9 +52,9 @@
     "@babel/preset-env": "^7.19.4",
     "@babel/preset-react": "^7.18.6",
     "@babel/register": "^7.18.9",
-    "@rjsf/utils": "^5.0.0-beta.13",
-    "@rjsf/validator-ajv6": "^5.0.0-beta.13",
-    "@rjsf/validator-ajv8": "^5.0.0-beta.13",
+    "@rjsf/utils": "^5.0.0-beta.14",
+    "@rjsf/validator-ajv6": "^5.0.0-beta.14",
+    "@rjsf/validator-ajv8": "^5.0.0-beta.14",
     "@types/lodash": "^4.14.186",
     "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.11",

diff --git a/packages/core/src/components/fields/ArrayField.tsx b/packages/core/src/components/fields/ArrayField.tsx
@@ -862,6 +862,7 @@ class ArrayField<
       onReorderClick: this.onReorderClick,
       readonly,
       registry,
+      schema: itemSchema,
       uiSchema: itemUiSchema,
     };
   }

diff --git a/packages/fluent-ui/package-lock.json b/packages/fluent-ui/package-lock.json
diff --git a/packages/fluent-ui/package.json b/packages/fluent-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/fluent-ui",
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.14",
   "main": "dist/index.js",
   "module": "dist/fluent-ui.esm.js",
   "typings": "dist/index.d.ts",
@@ -41,9 +41,9 @@
     "@babel/preset-env": "^7.19.4",
     "@babel/preset-react": "^7.18.6",
     "@fluentui/react": "^7.190.3",
-    "@rjsf/core": "^5.0.0-beta.13",
-    "@rjsf/utils": "^5.0.0-beta.13",
-    "@rjsf/validator-ajv8": "^5.0.0-beta.13",
+    "@rjsf/core": "^5.0.0-beta.14",
+    "@rjsf/utils": "^5.0.0-beta.14",
+    "@rjsf/validator-ajv8": "^5.0.0-beta.14",
     "@types/lodash": "^4.14.186",
     "@types/react": "^17.0.48",
     "@types/react-dom": "^17.0.17",

diff --git a/packages/material-ui/package-lock.json b/packages/material-ui/package-lock.json
diff --git a/packages/material-ui/package.json b/packages/material-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/material-ui",
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.14",
   "module": "./dist/material-ui.esm.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -43,9 +43,9 @@
     "@babel/preset-react": "^7.18.6",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
-    "@rjsf/core": "^5.0.0-beta.13",
-    "@rjsf/utils": "^5.0.0-beta.13",
-    "@rjsf/validator-ajv8": "^5.0.0-beta.13",
+    "@rjsf/core": "^5.0.0-beta.14",
+    "@rjsf/utils": "^5.0.0-beta.14",
+    "@rjsf/validator-ajv8": "^5.0.0-beta.14",
     "@types/material-ui": "^0.21.12",
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",

diff --git a/packages/mui/package-lock.json b/packages/mui/package-lock.json
diff --git a/packages/mui/package.json b/packages/mui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/mui",
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.14",
   "module": "./dist/mui.esm.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -48,9 +48,9 @@
     "@emotion/styled": "^11.10.0",
     "@mui/icons-material": "^5.10.2",
     "@mui/material": "^5.10.2",
-    "@rjsf/core": "^5.0.0-beta.13",
-    "@rjsf/utils": "^5.0.0-beta.13",
-    "@rjsf/validator-ajv8": "^5.0.0-beta.13",
+    "@rjsf/core": "^5.0.0-beta.14",
+    "@rjsf/utils": "^5.0.0-beta.14",
+    "@rjsf/validator-ajv8": "^5.0.0-beta.14",
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",
     "@types/react-test-renderer": "^17.0.1",