Skip to content

Commit 238a38f

Browse files
fix(deps): update dependency @rjsf/core to v5 (#1409)
* fix(deps): update dependency @rjsf/core to v5 * redux-devtools-ui * Update * Update * Update --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Nathan Bierema <nbierema@gmail.com>
1 parent 76183cf commit 238a38f

File tree

10 files changed

+187
-79
lines changed

10 files changed

+187
-79
lines changed

packages/redux-devtools-app-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@babel/preset-typescript": "^7.24.7",
6363
"@emotion/react": "^11.13.3",
6464
"@reduxjs/toolkit": "^2.2.7",
65-
"@rjsf/core": "^4.2.3",
65+
"@rjsf/core": "^5.20.0",
6666
"@testing-library/dom": "^10.4.0",
6767
"@testing-library/jest-dom": "^6.5.0",
6868
"@testing-library/react": "^16.0.0",

packages/redux-devtools-app-core/src/actions/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ interface ChangeThemeFormData {
5555
readonly colorPreference: 'auto' | 'light' | 'dark';
5656
}
5757
interface ChangeThemeData {
58-
readonly formData: ChangeThemeFormData;
58+
readonly formData?: ChangeThemeFormData;
5959
}
6060
export interface ChangeThemeAction {
6161
readonly type: typeof CHANGE_THEME;
@@ -64,7 +64,7 @@ export interface ChangeThemeAction {
6464
readonly colorPreference: 'auto' | 'light' | 'dark';
6565
}
6666
export function changeTheme(data: ChangeThemeData): ChangeThemeAction {
67-
return { type: CHANGE_THEME, ...data.formData };
67+
return { type: CHANGE_THEME, ...data.formData! };
6868
}
6969

7070
interface ChangeStateTreeSettingsFormData {
@@ -73,7 +73,7 @@ interface ChangeStateTreeSettingsFormData {
7373
}
7474

7575
interface ChangeStateTreeSettingsData {
76-
readonly formData: ChangeStateTreeSettingsFormData;
76+
readonly formData?: ChangeStateTreeSettingsFormData;
7777
}
7878

7979
export interface ChangeStateTreeSettingsAction {
@@ -85,7 +85,7 @@ export interface ChangeStateTreeSettingsAction {
8585
export function changeStateTreeSettings(
8686
data: ChangeStateTreeSettingsData,
8787
): ChangeStateTreeSettingsAction {
88-
return { type: CHANGE_STATE_TREE_SETTINGS, ...data.formData };
88+
return { type: CHANGE_STATE_TREE_SETTINGS, ...data.formData! };
8989
}
9090

9191
export interface InitMonitorAction {

packages/redux-devtools-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@babel/preset-typescript": "^7.24.7",
6060
"@emotion/react": "^11.13.3",
6161
"@reduxjs/toolkit": "^2.2.7",
62-
"@rjsf/core": "^4.2.3",
62+
"@rjsf/core": "^5.20.0",
6363
"@types/jsan": "^3.1.5",
6464
"@types/json-schema": "^7.0.15",
6565
"@types/lodash": "^4.17.7",

packages/redux-devtools-app/src/components/Settings/Connection.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
import React, { Component } from 'react';
22
import { connect, ResolveThunks } from 'react-redux';
33
import { Container, Form } from '@redux-devtools/ui';
4-
import {
5-
JSONSchema7Definition,
6-
JSONSchema7Type,
7-
JSONSchema7TypeName,
8-
} from 'json-schema';
4+
import { JSONSchema7Definition, JSONSchema7TypeName } from 'json-schema';
95
import { ConnectionType, saveSocketSettings } from '../../actions';
106
import { StoreState } from '../../reducers';
117
import { ConnectionStateOptions } from '../../reducers/connection';
12-
import { IChangeEvent, ISubmitEvent } from '@rjsf/core';
8+
import { IChangeEvent } from '@rjsf/core';
139

1410
declare module 'json-schema' {
1511
export interface JSONSchema7 {
@@ -104,13 +100,13 @@ export class Connection extends Component<Props, State> {
104100
}
105101
}
106102

107-
handleSave = (data: ISubmitEvent<FormData>) => {
108-
this.props.saveSettings(data.formData);
103+
handleSave = (data: IChangeEvent<FormData>) => {
104+
this.props.saveSettings(data.formData!);
109105
this.setState({ changed: false });
110106
};
111107

112108
handleChange = (data: IChangeEvent<FormData>) => {
113-
const formData = data.formData;
109+
const formData = data.formData!;
114110
const type = formData.type;
115111
if (type !== this.state.type) {
116112
this.setState(this.setFormData(type, true));

packages/redux-devtools-inspector-monitor-test-tab/src/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@ export class TestTab<S, A extends Action<string>> extends Component<
6464
this.setState({ dialogStatus: null });
6565
};
6666

67-
handleSubmit = ({ formData: template }: { formData: Template }) => {
67+
handleSubmit = ({ formData: template }: { formData?: Template }) => {
6868
const { templates = getDefaultTemplates(), selected = 0 } =
6969
this.getPersistedState();
7070
if (this.state.dialogStatus === 'Add') {
7171
this.updateState({
7272
selected: templates.length,
73-
templates: [...templates, template],
73+
templates: [...templates, template!],
7474
});
7575
} else {
7676
const editedTemplates = [...templates];
77-
editedTemplates[selected] = template;
77+
editedTemplates[selected] = template!;
7878
this.updateState({
7979
templates: editedTemplates,
8080
});

packages/redux-devtools-ui/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
},
4444
"dependencies": {
4545
"@babel/runtime": "^7.25.4",
46-
"@rjsf/core": "^4.2.3",
46+
"@rjsf/core": "^5.20.0",
47+
"@rjsf/utils": "^5.20.0",
48+
"@rjsf/validator-ajv8": "^5.20.0",
4749
"@types/codemirror": "^5.60.15",
4850
"@types/json-schema": "^7.0.15",
4951
"@types/simple-element-resize-detector": "^1.3.3",

packages/redux-devtools-ui/src/Form/Form.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { PureComponent, Component } from 'react';
22
import JSONSchemaForm, { FormProps } from '@rjsf/core';
3+
import validator from '@rjsf/validator-ajv8';
34
import type { Base16Theme } from 'react-base16-styling';
45
import createStyledComponent from '../utils/createStyledComponent';
56
import styles from './styles';
@@ -8,7 +9,7 @@ import customWidgets from './widgets';
89

910
const FormContainer = createStyledComponent(styles, JSONSchemaForm);
1011

11-
export interface Props<T> extends FormProps<T> {
12+
export interface Props<T> extends Omit<FormProps<T>, 'validator'> {
1213
children?: React.ReactNode;
1314
submitText?: string;
1415
primaryButton?: boolean;
@@ -26,6 +27,7 @@ export default class Form<T> extends (PureComponent || Component)<Props<T>> {
2627
return (
2728
<FormContainer
2829
{...(rest as Props<unknown>)}
30+
validator={validator}
2931
widgets={{ ...customWidgets, ...widgets }}
3032
>
3133
{noSubmit ? (

packages/redux-devtools-ui/src/Form/widgets.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { FieldProps, Widget, WidgetProps } from '@rjsf/core';
2+
import { FieldProps, Widget, WidgetProps } from '@rjsf/utils';
33
import Select from '../Select';
44
import Slider from '../Slider';
55

0 commit comments

Comments
 (0)