Merge branch 'rjsf-team:master' into master

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2.4.1
+      uses: actions/setup-node@v2.5.1
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
@@ -74,7 +74,7 @@ jobs:
         uses: crazy-max/[email protected]
         with:
           keep_history: true
-          target-branch: gh-pages
+          target_branch: gh-pages
           build_dir: dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -87,7 +87,7 @@ jobs:
   #   steps:
   #     - uses: actions/checkout@v2
   #     - name: Use Node.js 14.x
-  #       uses: actions/setup-node@v2.4.1
+  #       uses: actions/setup-node@v2.5.1
   #       with:
   #         node-version: 14.x
   #     - run: npm ci
@@ -103,7 +103,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup Python
-      uses: actions/setup-python@v2.2.2
+      uses: actions/setup-python@v2.3.1
       with:
         python-version: 3.6
     - run: pip install -r requirements.docs.txt

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.1
         with:
           node-version: 14.x
       - run: npm ci

.gitignore

@@ -131,4 +131,5 @@ yarn.lock
 coverage
 .nyc_output
 
-venv
+venv
+*.orig

CHANGELOG.md

@@ -15,8 +15,22 @@ 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.
 
 -->
+# v3.3.1 (upcoming)
+
+# v3.3.0
+
+## @rjsf/semantic-ui
+- "semantic-ui-react" dependency updated to v1.3.1 (https://github.com/rjsf-team/react-jsonschema-form/pull/2590)
+- fixed an issue where all semantic props overwritten when a single [semantic theme-specific prop](https://react-jsonschema-form.readthedocs.io/en/latest/api-reference/themes/semantic-ui/uiSchema/) is passed in ([issue 2619](https://github.com/rjsf-team/react-jsonschema-form/issues/2619)) (https://github.com/rjsf-team/react-jsonschema-form/pull/2590)
+
+# v3.2.2 (upcoming)
+
+# v3.2.1
+
+## @rjsf/core
+- Don't crash when non-object formData is passed in to a schema item with additionalProperties (https://github.com/rjsf-team/react-jsonschema-form/pull/2595)
+- Upgrade jsonpointer to 5.0.0 to address security vulnerability (https://github.com/rjsf-team/react-jsonschema-form/pull/2599)
 
-# v3.2.1 (upcoming)
 
 # v3.2.0
 
@@ -25,8 +39,7 @@ should change the heading of the (upcoming) version to include a major version b
 - bootstrap-4 TextWidget wrappers now pull from registry, add rootSchema to Registry, fix FieldProps.onFocus type to match WidgetProps (https://github.com/rjsf-team/react-jsonschema-form/pull/2519)
 - Added global `readonly` flag to the `Form` (https://github.com/rjsf-team/react-jsonschema-form/pull/2554)
 - Fix to allow changing `additionalProperties` to falsy values (https://github.com/rjsf-team/react-jsonschema-form/pull/2540)
-- Pass uiSchema to custom Boolean widget (https://github.com/rjsf-team/react-jsonschema-form/pull/2587)
-
+- Pass uiSchema to custom Boolean widget (https://github.com/rjsf-team/react-jsonschema-form/pull/2587
 ## @rjsf/bootstrap-4
 - bootstrap-4 TextWidget wrappers now pull from registry, add rootSchema to Registry, fix FieldProps.onFocus type to match WidgetProps (https://github.com/rjsf-team/react-jsonschema-form/pull/2519)
 
@@ -45,7 +58,7 @@ should change the heading of the (upcoming) version to include a major version b
 - Take into account implicitly defined types when rendering labels for fields (https://github.com/rjsf-team/react-jsonschema-form/pull/2502)
 
 ## @rjsf/antd
-- Add default Form export to @rjsf/antd (https://github.com/rjsf-team/react-jsonschema-form/pull/2514) 
+- Add default Form export to @rjsf/antd (https://github.com/rjsf-team/react-jsonschema-form/pull/2514)
 
 ## @rjsf/fluent-ui
 - Make material-ui and fluent-ui pull TextWidget from the registry; remove registry prop from <div> in TextWidget (https://github.com/rjsf-team/react-jsonschema-form/pull/2515)

lerna.json

@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "3.2.0"
+  "version": "3.2.1"
 }

packages/antd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/antd",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Ant Design theme, fields and widgets for react-jsonschema-form",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",
@@ -44,7 +44,7 @@
     "@babel/preset-env": "^7.10.3",
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.4.4",
-    "@rjsf/core": "^3.2.0",
+    "@rjsf/core": "^3.2.1",
     "antd": "^4.0.0",
     "atob": "^2.0.3",
     "babel-eslint": "^10.0.1",
@@ -67,7 +67,7 @@
     "react-dom": "^16.8.6",
     "react-test-renderer": "^16.13.1",
     "rimraf": "^3.0.2",
-    "style-loader": "^1.0.0",
+    "style-loader": "^2.0.0",
     "webpack": "^4.20.2",
     "webpack-cli": "^3.1.2",
     "webpack-dev-middleware": "^3.4.0",

packages/antd/src/templates/FieldTemplate/index.js

@@ -22,7 +22,6 @@ const FieldTemplate = ({
   label,
   onDropPropertyClick,
   onKeyChange,
-  rawDescription,
   rawErrors,
   rawHelp,
   readonly,
@@ -64,7 +63,7 @@ const FieldTemplate = ({
       ) : (
         <Form.Item
           colon={colon}
-          // extra={!!rawDescription && description}
+          extra={description}
           hasFeedback={schema.type !== 'array' && schema.type !== 'object'}
           help={(!!rawHelp && help) || (!!rawErrors && renderFieldErrors())}
           htmlFor={id}

packages/antd/test/Form.test.js

@@ -94,4 +94,39 @@ describe("single fields", () => {
       .toJSON();
     expect(tree).toMatchSnapshot();
   });
+  test("field with description", () => {
+    const schema = {
+      type: "object",
+      properties: {
+        "my-field": {
+          type: "string",
+          description: "some description",
+        }
+      }
+    };
+    const tree = renderer
+      .create(<Form schema={schema} />)
+      .toJSON();
+    expect(tree).toMatchSnapshot();
+  });
+  test("field with description in uiSchema", () => {
+    const schema = {
+      type: "object",
+      properties: {
+        "my-field": {
+          type: "string",
+          description: "some description",
+        }
+      }
+    };
+    const uiSchema = {
+      "my-field": {
+        "ui:description": "some other description",
+      },
+    };
+    const tree = renderer
+      .create(<Form schema={schema} uiSchema={uiSchema} />)
+      .toJSON();
+    expect(tree).toMatchSnapshot();
+  });
 });

packages/antd/test/__snapshots__/Array.test.js.snap

@@ -281,6 +281,13 @@ exports[`array fields fixed array 1`] = `
                         />
                       </div>
                     </div>
+                    <div
+                      className="ant-form-item-extra"
+                    >
+                      <span
+                        id="root_0__description"
+                      />
+                    </div>
                   </div>
                 </div>
               </div>
@@ -432,6 +439,13 @@ exports[`array fields fixed array 1`] = `
                         </div>
                       </div>
                     </div>
+                    <div
+                      className="ant-form-item-extra"
+                    >
+                      <span
+                        id="root_1__description"
+                      />
+                    </div>
                   </div>
                 </div>
               </div>