Skip to content

Commit 0533113

Browse files
Fix 2280 by moving the bootstrap 3 marker classes out of SchemaField
Fixed #2280 by moving marker classes from `SchemaField` to `WrapIfAdditionalTemplate` - In `@rjsf/utils`, updated `WrapIfAdditionalTemplateProps` to pick up the `hideError` and `rawErrors` props from `FieldTemplateProps` - In `@rjsf/core`, updated `SchemaField` to move the `form-group` and `field` marker classes to the `WrapIfAdditionalTemplate` - Also moved the `field-error`, `has-error` and `has-danger` error marker classes - Updated the grid snapshot due to the change - Updated the snapshots in other themes due to the removed marker classes - Updated the `CHANGELOG_v6.md` and `v6x upgrade guide.md` to reflect these changes
1 parent 65586f2 commit 0533113

37 files changed

+1644
-1607
lines changed

CHANGELOG_v6.md

+12
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ should change the heading of the (upcoming) version to include a major version b
2525
- BREAKING CHANGE: Removed support for version 4 of `antd`
2626
- Updated `ArrayFieldItemTemplate` to replace `Button.Group` with `Space.Compact` since `Button.Group` is deprecated in `antd` version 5
2727
- Upgraded to `@ant-design/icon@5`
28+
- BREAKING CHANGE: Removed the addition of `Bootstrap 3` marker classes from the `SchemaField`, thereby changing theme `FieldTemplate` className prop output and associated snapshots
2829

2930
## @rjsf/chakra-ui
3031

3132
- BREAKING CHANGE: Refactored `ArrayFieldItemTemplate` to use the new `ArrayFieldItemButtonsTemplate`
3233
- Updated the `ArrayFieldTemplate`, `ObjectFieldTemplate`, and `WrapIfAdditionalTemplate` to a unique id using the `buttonId()` function and adding consistent marker classes
3334
- Implemented the `GridTemplate` component, adding it to the `templates` for the theme
35+
- BREAKING CHANGE: Removed the addition of `Bootstrap 3` marker classes from the `SchemaField`, thereby changing theme `FieldTemplate` className prop output and associated snapshots
3436

3537
## @rjsf/core
3638

@@ -41,6 +43,7 @@ should change the heading of the (upcoming) version to include a major version b
4143
- Implemented the `GridTemplate` component, adding it to the `templates` for the theme
4244
- Implemented the new `LayoutGridField`, `LayoutMultiSchemaField` and `LayoutHeaderField` fields, adding them to the `fields` list
4345
- BREAKING CHANGE: Removed support for the deprecated `schema.enumNames` and `uiSchema.classNames` as well as the deprecated `acceptcharset` prop on `Form`
46+
- BREAKING CHANGE: Moved the addition of `Bootstrap 3` marker classes from the `SchemaField` to the `WrapIfAdditionalTemplate`, thereby affecting all of the other themes, fixing [#2280](https://github.com/rjsf-team/react-jsonschema-form/issues/2280)
4447

4548
## @rjsf/daisyui
4649

@@ -55,19 +58,27 @@ should change the heading of the (upcoming) version to include a major version b
5558
- BREAKING CHANGE: Refactored `ArrayFieldItemTemplate` to use the new `ArrayFieldItemButtonsTemplate`
5659
- Updated the `ArrayFieldTemplate`, `ObjectFieldTemplate`, and `WrapIfAdditionalTemplate` to a unique id using the `buttonId()` function and adding consistent marker classes
5760
- Implemented the `GridTemplate` component, adding it to the `templates` for the theme
61+
- BREAKING CHANGE: Removed the addition of `Bootstrap 3` marker classes from the `SchemaField`, thereby changing theme `FieldTemplate` className prop output and associated snapshots
62+
63+
## @rjsf/material-ui
64+
65+
- BREAKING CHANGE: Deleted this theme in favor of `mui`
5866

5967
## @rjsf/mui
6068

6169
- BREAKING CHANGE: Refactored `ArrayFieldItemTemplate` to use the new `ArrayFieldItemButtonsTemplate`
6270
- Updated the `ArrayFieldTemplate`, `ObjectFieldTemplate`, and `WrapIfAdditionalTemplate` to a unique id using the `buttonId()` function and adding consistent marker classes
6371
- Updated the theme to use `Grid2` instead of the deprecated `Grid`
6472
- Implemented the `GridTemplate` component, adding it to the `templates` for the theme
73+
- BREAKING CHANGE: Removed the addition of `Bootstrap 3` marker classes from the `SchemaField`, thereby changing theme `FieldTemplate` className prop output and associated snapshots
6574

6675
## @rjsf/semantic-ui
6776

6877
- BREAKING CHANGE: Refactored `ArrayFieldItemTemplate` to use the new `ArrayFieldItemButtonsTemplate`
6978
- Updated the `ArrayFieldTemplate`, `ObjectFieldTemplate`, and `WrapIfAdditionalTemplate` to a unique id using the `buttonId()` function and adding consistent marker classes
7079
- Implemented the `GridTemplate` component, adding it to the `templates` for the theme
80+
- BREAKING CHANGE: Removed the addition of `Bootstrap 3` marker classes from the `SchemaField`, thereby changing theme `FieldTemplate` className prop output and associated snapshots
81+
- BREAKING CHANGE: Removed the addition of `Bootstrap 3` marker classes from the `SchemaField`, thereby changing theme `FieldTemplate` className prop output and associated snapshots
7182

7283
## @rjsf/shadcn
7384

@@ -96,6 +107,7 @@ should change the heading of the (upcoming) version to include a major version b
96107
- BREAKING CHANGE: Removed the deprecated `getMatchingOption()` and `mergeValidationData()` from the library export and the `SchemaUtilsType` interface
97108
- BREAKING CHANGE: Removed the deprecated `toErrorList()` function from the `ValidatorType` interface
98109
- BREAKING CHANGE: Removed the deprecated `RJSF_ADDITONAL_PROPERTIES_FLAG` constant
110+
- Updated the `WrapIfAdditionalTemplateProps` to include `hideError` and `rawErrors` in support of moving `Bootstrap 3` marker classes out of `SchemaField`
99111

100112
## @rjsf/validator-ajv6
101113

0 commit comments

Comments
 (0)