Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ should change the heading of the (upcoming) version to include a major version b

- Set peerDependency for `@ant-design/icons` to `^6.0.0`, fixing [#4643](https://github.com/rjsf-team/react-jsonschema-form/issues/4643)

## @rjsf/primereact

- New theme!

## @rjsf/utils

- Fixed issue where oneOf radio button could not be modified when defaults were set, fixing [#4634](https://github.com/rjsf-team/react-jsonschema-form/issues/4634)
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/docs/docs/api-reference/uiSchema.md
Original file line number Diff line number Diff line change
Expand Up @@ -598,4 +598,5 @@ const uiSchema: UiSchema = {

- [AntD Customization](themes/antd/uiSchema.md)
- [Chakra-UI Customization](themes/chakra-ui/uiSchema.md)
- [PrimeReact Customization](themes/primereact/uiSchema.md)
- [Semantic-UI Customization](themes/semantic-ui/uiSchema.md)
3 changes: 2 additions & 1 deletion packages/docs/docs/migration-guides/v6.x upgrade guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

## New packages

There are 3 new packages added in RJSF version 6:
There are 4 new packages added in RJSF version 6:

- `@rjsf/daisyui`: This is new theme based on the `daisyui` toolkit
- `@rjsf/react-bootstrap`: This is rename of the `bootstrap-4` theme with an upgrade to the latest version of `react-bootstrap`
- `@rjsf/primereact`: This is a new theme based on the `PrimeReact` toolkit
- `@rjsf/shadcn`: This is new theme based on the `shadcn` toolkit

## Breaking changes
Expand Down
11 changes: 4 additions & 7 deletions packages/playground/src/samples/layoutGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1985,6 +1985,7 @@ const layoutGrid: Sample = {
children: [
{
'ui:columns': {
style: { marginBottom: '18px' },
children: ['employment'],
},
},
Expand All @@ -2000,13 +2001,9 @@ const layoutGrid: Sample = {
},
},
{
'ui:col': {
children: ['employment.location.city'],
},
},
{
'ui:col': {
children: ['employment.location.state'],
'ui:columns': {
sm: 6,
children: ['employment.location.city', 'employment.location.state'],
},
},
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default function ArrayFieldTemplate<
required={required}
registry={registry}
/>
<Fieldset {...rest} className={`${className} ${isFixedItems<S>(schema) ? '' : 'sortable-form-fields'}`}>
<Fieldset {...rest} className={`${className}${isFixedItems<S>(schema) ? '' : ' sortable-form-fields'}`}>
<ArrayFieldDescriptionTemplate
idSchema={idSchema}
description={uiOptions.description || schema.description}
Expand Down
10 changes: 5 additions & 5 deletions packages/primereact/test/__snapshots__/Array.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ exports[`array fields fixed array 1`] = `

</h5>
<fieldset
className="rjsf-field rjsf-field-array rjsf-field-array-fixed-items p-fieldset p-component"
className="rjsf-field rjsf-field-array rjsf-field-array-fixed-items p-fieldset p-component"
data-pc-name="fieldset"
data-pc-section="root"
errorSchema={{}}
Expand Down Expand Up @@ -1840,7 +1840,7 @@ exports[`with title and description fixed array 1`] = `

</h5>
<fieldset
className="rjsf-field rjsf-field-array rjsf-field-array-fixed-items p-fieldset p-component"
className="rjsf-field rjsf-field-array rjsf-field-array-fixed-items p-fieldset p-component"
data-pc-name="fieldset"
data-pc-section="root"
errorSchema={{}}
Expand Down Expand Up @@ -2711,7 +2711,7 @@ exports[`with title and description from both fixed array 1`] = `

</h5>
<fieldset
className="rjsf-field rjsf-field-array rjsf-field-array-fixed-items p-fieldset p-component"
className="rjsf-field rjsf-field-array rjsf-field-array-fixed-items p-fieldset p-component"
data-pc-name="fieldset"
data-pc-section="root"
errorSchema={{}}
Expand Down Expand Up @@ -3582,7 +3582,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `

</h5>
<fieldset
className="rjsf-field rjsf-field-array rjsf-field-array-fixed-items p-fieldset p-component"
className="rjsf-field rjsf-field-array rjsf-field-array-fixed-items p-fieldset p-component"
data-pc-name="fieldset"
data-pc-section="root"
errorSchema={{}}
Expand Down Expand Up @@ -4415,7 +4415,7 @@ exports[`with title and description with global label off fixed array 1`] = `

</h5>
<fieldset
className="rjsf-field rjsf-field-array rjsf-field-array-fixed-items p-fieldset p-component"
className="rjsf-field rjsf-field-array rjsf-field-array-fixed-items p-fieldset p-component"
data-pc-name="fieldset"
data-pc-section="root"
errorSchema={{}}
Expand Down