diff --git a/plugins/home/package.json b/plugins/home/package.json index 35310158a7..63e5a591d4 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -42,9 +42,10 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@rjsf/core": "^3.2.1", - "@rjsf/material-ui": "^3.2.1", + "@rjsf/core": "5.6.0", + "@rjsf/material-ui": "5.6.0", "@rjsf/utils": "5.6.0", + "@rjsf/validator-ajv8": "5.6.0", "@types/react": "^16.13.1 || ^17.0.0", "lodash": "^4.17.21", "object-hash": "^3.0.0", diff --git a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx index de64695ecb..b3be6503d1 100644 --- a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx +++ b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx @@ -27,7 +27,9 @@ import SettingsIcon from '@material-ui/icons/Settings'; import DeleteIcon from '@material-ui/icons/Delete'; import React from 'react'; import { Widget } from './types'; -import Form from '@rjsf/material-ui'; +import { withTheme } from '@rjsf/core'; + +const Form = withTheme(require('@rjsf/material-ui').Theme); const useStyles = makeStyles((theme: Theme) => createStyles({ diff --git a/yarn.lock b/yarn.lock index a426cab8b5..b8f02c7cbe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6975,9 +6975,10 @@ __metadata: "@material-ui/core": ^4.12.2 "@material-ui/icons": ^4.9.1 "@material-ui/lab": 4.0.0-alpha.61 - "@rjsf/core": ^3.2.1 - "@rjsf/material-ui": ^3.2.1 + "@rjsf/core": 5.6.0 + "@rjsf/material-ui": 5.6.0 "@rjsf/utils": 5.6.0 + "@rjsf/validator-ajv8": 5.6.0 "@testing-library/dom": ^8.0.0 "@testing-library/jest-dom": ^5.10.1 "@testing-library/react": ^12.1.3 @@ -13708,7 +13709,7 @@ __metadata: languageName: node linkType: hard -"@rjsf/core-v5@npm:@rjsf/core@5.6.0": +"@rjsf/core-v5@npm:@rjsf/core@5.6.0, @rjsf/core@npm:5.6.0": version: 5.6.0 resolution: "@rjsf/core@npm:5.6.0" dependencies: @@ -13743,7 +13744,7 @@ __metadata: languageName: node linkType: hard -"@rjsf/material-ui-v5@npm:@rjsf/material-ui@5.6.0": +"@rjsf/material-ui-v5@npm:@rjsf/material-ui@5.6.0, @rjsf/material-ui@npm:5.6.0": version: 5.6.0 resolution: "@rjsf/material-ui@npm:5.6.0" peerDependencies: