Merge changes in main to rjsf-v6

.github/workflows/ci.yml

@@ -52,12 +52,12 @@ jobs:
           NODE_OPTIONS: --max_old_space_size=4096
 
       - if: matrix.node-version == '18.x'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: playground
           path: packages/playground/dist
       - if: matrix.node-version == '18.x'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docs
           path: packages/docs/build
@@ -69,12 +69,12 @@ jobs:
     needs: [build]
     steps:
       - name: Download built playground
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: playground
           path: dist
       - name: Download built docs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docs
           path: dist/docs

.github/workflows/release-docs.yml

@@ -28,7 +28,7 @@ jobs:
         with:
           ref: main
       - name: Setup Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - run: pip install -r requirements.docs.txt

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "5.15.0",
+  "version": "5.18.2",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": true,
   "useWorkspaces": true

package.json

@@ -10,7 +10,7 @@
     "changed": "lerna changed",
     "test": "lerna run --concurrency 2 --stream test",
     "test:update": "lerna run --concurrency 2 --stream test:update",
-    "lint": "eslint './packages/**/*.{ts,js,tsx,jsx}' --quiet",
+    "lint": "eslint './packages/**/*.{ts,tsx}' --quiet",
     "cs-check": "lerna run cs-check",
     "cs-format": "lerna run cs-format",
     "build": "lerna run --stream build",
@@ -20,7 +20,7 @@
     "prepare": "husky install",
     "format": "prettier --write .",
     "format-check": "prettier --check .",
-    "bump-all-packages": "echo 'NOTE: Make sure to sanity check the playground locally before commiting changes' && npm update --save && npm install && npm run build && npm run test && npm run lint",
+    "bump-all-packages": "echo 'NOTE: Make sure to sanity check the playground locally before commiting changes' && npm update --save && npm install && npm run lint && npm run build && npm run test",
     "bump-peer-deps": "node scripts/bump-peer-deps.js",
     "refresh-node-modules": "rimraf packages/*/node_modules && rimraf node_modules && npm install",
     "commit-package-changes": "git add package-lock.json packages/*/package*.json && cross-env CI=skipPrecommit git commit -m 'updated package*.json after versioning' && git push",
@@ -30,32 +30,32 @@
   "license": "Apache-2.0",
   "homepage": "https://github.com/rjsf-team/react-jsonschema-form",
   "devDependencies": {
-    "@babel/eslint-parser": "^7.22.15",
+    "@babel/eslint-parser": "^7.23.10",
     "@nrwl/nx-cloud": "^15.3.5",
-    "@types/estree": "^1.0.1",
-    "@types/jest": "^29.5.5",
-    "@types/node": "^18.17.14",
+    "@types/estree": "^1.0.5",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^18.19.14",
     "@types/prettier": "^2.7.3",
-    "@types/react": "^17.0.65",
-    "@types/react-dom": "^17.0.20",
+    "@types/react": "^17.0.75",
+    "@types/react-dom": "^17.0.25",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.48.0",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.10.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",
-    "jest-environment-jsdom": "^29.6.4",
+    "jest-environment-jsdom": "^29.7.0",
     "lerna": "^6.6.2",
     "lint-staged": "^13.3.0",
     "nx": "^15.9.2",
     "prettier": "^2.8.8",
-    "rimraf": "^5.0.1",
-    "ts-jest": "^29.1.1",
+    "rimraf": "^5.0.5",
+    "ts-jest": "^29.1.2",
     "tslib": "^2.6.2",
     "typescript": "^4.9.5"
   },

packages/antd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/antd",
-  "version": "5.15.0",
+  "version": "5.18.2",
   "description": "Ant Design theme, fields and widgets for react-jsonschema-form",
   "main": "dist/index.js",
   "module": "lib/index.js",
@@ -34,51 +34,51 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.0.0 || ^5.0.0",
-    "@rjsf/core": "^5.12.x",
-    "@rjsf/utils": "^5.12.x",
+    "@rjsf/core": "^5.18.x",
+    "@rjsf/utils": "^5.18.x",
     "antd": "^4.24.0 || ^5.8.5",
     "dayjs": "^1.8.0",
     "react": "^16.14.0 || >=17"
   },
   "dependencies": {
-    "classnames": "^2.3.2",
+    "classnames": "^2.5.1",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "rc-picker": "^2.7.6"
   },
   "devDependencies": {
     "@ant-design/icons": "^4.8.1",
-    "@babel/cli": "^7.22.15",
-    "@babel/core": "^7.22.17",
-    "@babel/eslint-parser": "^7.22.15",
+    "@babel/cli": "^7.23.9",
+    "@babel/core": "^7.23.9",
+    "@babel/eslint-parser": "^7.23.10",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-optional-chaining": "^7.21.0",
-    "@babel/preset-env": "^7.22.15",
-    "@babel/preset-react": "^7.22.15",
-    "@babel/preset-typescript": "^7.22.15",
-    "@rjsf/core": "^5.15.0",
-    "@rjsf/snapshot-tests": "^5.15.0",
-    "@rjsf/utils": "^5.15.0",
-    "@rjsf/validator-ajv8": "^5.15.0",
-    "@rollup/plugin-replace": "^5.0.2",
-    "@types/jest": "^29.5.5",
-    "@types/lodash": "^4.14.198",
-    "@types/react": "^17.0.65",
-    "@types/react-dom": "^17.0.20",
-    "@types/react-test-renderer": "^17.0.3",
+    "@babel/preset-env": "^7.23.9",
+    "@babel/preset-react": "^7.23.3",
+    "@babel/preset-typescript": "^7.23.3",
+    "@rjsf/core": "^5.18.2",
+    "@rjsf/snapshot-tests": "^5.18.2",
+    "@rjsf/utils": "^5.18.2",
+    "@rjsf/validator-ajv8": "^5.18.2",
+    "@rollup/plugin-replace": "^5.0.5",
+    "@types/jest": "^29.5.12",
+    "@types/lodash": "^4.14.202",
+    "@types/react": "^17.0.75",
+    "@types/react-dom": "^17.0.25",
+    "@types/react-test-renderer": "^17.0.9",
     "antd": "^5.0.0",
     "atob": "^2.1.2",
-    "babel-jest": "^29.6.4",
-    "dayjs": "^1.11.9",
+    "babel-jest": "^29.7.0",
+    "dayjs": "^1.11.10",
     "esbuild": "^0.18.20",
-    "eslint": "^8.48.0",
-    "jest": "^29.6.4",
-    "jest-environment-jsdom": "^29.6.4",
+    "eslint": "^8.56.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-test-renderer": "^17.0.2",
-    "rimraf": "^5.0.1",
-    "rollup": "^3.29.0",
+    "rimraf": "^5.0.5",
+    "rollup": "^3.29.4",
     "typescript": "^4.9.5"
   },
   "repository": {

packages/antd/src/templates/ArrayFieldItemTemplate/index.tsx

@@ -1,6 +1,4 @@
-import Button from 'antd/lib/button';
-import Col from 'antd/lib/col';
-import Row from 'antd/lib/row';
+import { Button, Col, Row } from 'antd';
 import { ArrayFieldTemplateItemType, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
 const BTN_GRP_STYLE = {

packages/antd/src/templates/ArrayFieldTemplate/index.tsx

@@ -9,9 +9,8 @@ import {
   StrictRJSFSchema,
 } from '@rjsf/utils';
 import classNames from 'classnames';
-import Col from 'antd/lib/col';
-import Row from 'antd/lib/row';
-import { ConfigConsumer, ConfigConsumerProps } from 'antd/lib/config-provider/context';
+import { Col, Row, ConfigProvider } from 'antd';
+import { useContext } from 'react';
 
 const DESCRIPTION_COL_STYLE = {
   paddingBottom: '8px',
@@ -63,70 +62,64 @@ export default function ArrayFieldTemplate<
   } = registry.templates;
   const { labelAlign = 'right', rowGutter = 24 } = formContext as GenericObjectType;
 
+  const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
+  const prefixCls = getPrefixCls('form');
+  const labelClsBasic = `${prefixCls}-item-label`;
+  const labelColClassName = classNames(
+    labelClsBasic,
+    labelAlign === 'left' && `${labelClsBasic}-left`
+    // labelCol.className,
+  );
+
   return (
-    <ConfigConsumer>
-      {(configProps: ConfigConsumerProps) => {
-        const { getPrefixCls } = configProps;
-        const prefixCls = getPrefixCls('form');
-        const labelClsBasic = `${prefixCls}-item-label`;
-        const labelColClassName = classNames(
-          labelClsBasic,
-          labelAlign === 'left' && `${labelClsBasic}-left`
-          // labelCol.className,
-        );
+    <fieldset className={className} id={idSchema.$id}>
+      <Row gutter={rowGutter}>
+        {(uiOptions.title || title) && (
+          <Col className={labelColClassName} span={24}>
+            <ArrayFieldTitleTemplate
+              idSchema={idSchema}
+              required={required}
+              title={uiOptions.title || title}
+              schema={schema}
+              uiSchema={uiSchema}
+              registry={registry}
+            />
+          </Col>
+        )}
+        {(uiOptions.description || schema.description) && (
+          <Col span={24} style={DESCRIPTION_COL_STYLE}>
+            <ArrayFieldDescriptionTemplate
+              description={uiOptions.description || schema.description}
+              idSchema={idSchema}
+              schema={schema}
+              uiSchema={uiSchema}
+              registry={registry}
+            />
+          </Col>
+        )}
+        <Col className='row array-item-list' span={24}>
+          {items &&
+            items.map(({ key, ...itemProps }: ArrayFieldTemplateItemType<T, S, F>) => (
+              <ArrayFieldItemTemplate key={key} {...itemProps} />
+            ))}
+        </Col>
 
-        return (
-          <fieldset className={className} id={idSchema.$id}>
-            <Row gutter={rowGutter}>
-              {(uiOptions.title || title) && (
-                <Col className={labelColClassName} span={24}>
-                  <ArrayFieldTitleTemplate
-                    idSchema={idSchema}
-                    required={required}
-                    title={uiOptions.title || title}
-                    schema={schema}
-                    uiSchema={uiSchema}
-                    registry={registry}
-                  />
-                </Col>
-              )}
-              {(uiOptions.description || schema.description) && (
-                <Col span={24} style={DESCRIPTION_COL_STYLE}>
-                  <ArrayFieldDescriptionTemplate
-                    description={uiOptions.description || schema.description}
-                    idSchema={idSchema}
-                    schema={schema}
-                    uiSchema={uiSchema}
-                    registry={registry}
-                  />
-                </Col>
-              )}
-              <Col className='row array-item-list' span={24}>
-                {items &&
-                  items.map(({ key, ...itemProps }: ArrayFieldTemplateItemType<T, S, F>) => (
-                    <ArrayFieldItemTemplate key={key} {...itemProps} />
-                  ))}
+        {canAdd && (
+          <Col span={24}>
+            <Row gutter={rowGutter} justify='end'>
+              <Col flex='192px'>
+                <AddButton
+                  className='array-item-add'
+                  disabled={disabled || readonly}
+                  onClick={onAddClick}
+                  uiSchema={uiSchema}
+                  registry={registry}
+                />
               </Col>
-
-              {canAdd && (
-                <Col span={24}>
-                  <Row gutter={rowGutter} justify='end'>
-                    <Col flex='192px'>
-                      <AddButton
-                        className='array-item-add'
-                        disabled={disabled || readonly}
-                        onClick={onAddClick}
-                        uiSchema={uiSchema}
-                        registry={registry}
-                      />
-                    </Col>
-                  </Row>
-                </Col>
-              )}
             </Row>
-          </fieldset>
-        );
-      }}
-    </ConfigConsumer>
+          </Col>
+        )}
+      </Row>
+    </fieldset>
   );
 }

packages/antd/src/templates/BaseInputTemplate/index.tsx

@@ -1,6 +1,5 @@
 import { ChangeEvent, FocusEvent } from 'react';
-import Input from 'antd/lib/input';
-import InputNumber from 'antd/lib/input-number';
+import { Input, InputNumber } from 'antd';
 import {
   ariaDescribedByIds,
   BaseInputTemplateProps,

packages/antd/src/templates/ErrorList/index.tsx

@@ -1,6 +1,4 @@
-import Alert from 'antd/lib/alert';
-import List from 'antd/lib/list';
-import Space from 'antd/lib/space';
+import { Alert, List, Space } from 'antd';
 import ExclamationCircleOutlined from '@ant-design/icons/ExclamationCircleOutlined';
 import { ErrorListProps, FormContextType, RJSFSchema, StrictRJSFSchema, TranslatableString } from '@rjsf/utils';
 

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

@@ -1,4 +1,4 @@
-import Form from 'antd/lib/form';
+import { Form } from 'antd';
 import {
   FieldTemplateProps,
   FormContextType,

packages/antd/src/templates/IconButton/index.tsx

@@ -1,4 +1,4 @@
-import Button, { ButtonProps, ButtonType } from 'antd/lib/button';
+import { Button, ButtonProps } from 'antd';
 import ArrowDownOutlined from '@ant-design/icons/ArrowDownOutlined';
 import ArrowUpOutlined from '@ant-design/icons/ArrowUpOutlined';
 import CopyOutlined from '@ant-design/icons/CopyOutlined';
@@ -28,7 +28,7 @@ export default function IconButton<T = any, S extends StrictRJSFSchema = RJSFSch
   return (
     <Button
       onClick={onClick as MouseEventHandler<HTMLAnchorElement> & MouseEventHandler<HTMLButtonElement>}
-      type={iconType as ButtonType}
+      type={iconType as ButtonProps['type']}
       icon={icon}
       {...otherProps}
     />