Skip to content

Commit 619eead

Browse files
Feature: added the ui:enableMarkdownInHelp flag in UiSchema (#4855)
* updated core/Fieldhelp, react-bootstrap/fieldHelpTemplate, antd/HelpField * added the ui:enableMarkdownInHelp flag in UiSchema * Updated Changelog.md * Implemented help field markdown using RichHelp.tsx component, added the tests * updated the tests * updated the changes according to descriptionField * Update CHANGELOG.md Co-authored-by: Heath C <51679588+heath-freenome@users.noreply.github.com> * Update CHANGELOG.md Co-authored-by: Heath C <51679588+heath-freenome@users.noreply.github.com> * Updated * Updated * added the ui:enableMarkdownInHelp flag in UiSchema * added the ui:enableMarkdownInHelp flag in UiSchema * added the ui:enableMarkdownInHelp flag in UiSchema * Updated * updated to pass the test * Updated * updated to pass the test * updated to pass the test * fix(antd): update FieldHelpTemplate to match snapshot expectations * updated the tests * Updated antd HelpField to consistently use Markdown for help text & restored text-danger logic in Bootstrap FieldHelpTemplate & updated core test to expect div.help-block instead of p.help-block --------- Co-authored-by: Heath C <51679588+heath-freenome@users.noreply.github.com>
1 parent 8bbfb0c commit 619eead

File tree

34 files changed

+7530
-3372
lines changed

34 files changed

+7530
-3372
lines changed

CHANGELOG.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,61 @@ it according to semantic versioning. For example, if your PR adds a breaking cha
1515
should change the heading of the (upcoming) version to include a major version bump.
1616
1717
-->
18+
# 6.1.0
19+
20+
## @rjsf/antd
21+
22+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
23+
24+
## @rjsf/antd
25+
26+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
27+
28+
## @rjsf/antd
29+
30+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
31+
32+
## @rjsf/mui
33+
34+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
35+
36+
## @rjsf/shadcn
37+
38+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
39+
40+
## @rjsf/primereact
41+
42+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
43+
44+
## @rjsf/react-bootstrap
45+
46+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
47+
48+
## @rjsf/semantic-ui
49+
50+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
51+
52+
## @rjsf/daisyui
53+
54+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
55+
56+
## @rjsf/fluentui-rc
57+
58+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
59+
60+
## @rjsf/chakra-ui
61+
62+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
63+
64+
## @rjsf/mantine
65+
66+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
67+
68+
## @rjsf/utils
69+
70+
- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
71+
72+
1873
# 6.0.2
1974

2075
## @rjsf/antd
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { helpId, FieldHelpProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
2+
import { RichHelp } from '@rjsf/core';
3+
4+
/** The `FieldHelpTemplate` component renders any help desired for a field
5+
*
6+
* @param props - The `FieldHelpProps` to be rendered
7+
*/
8+
export default function FieldHelpTemplate<
9+
T = any,
10+
S extends StrictRJSFSchema = RJSFSchema,
11+
F extends FormContextType = any,
12+
>(props: FieldHelpProps<T, S, F>) {
13+
const { fieldPathId, help, uiSchema, registry } = props;
14+
if (!help) {
15+
return null;
16+
}
17+
18+
return (
19+
<div id={helpId(fieldPathId)} className='help-block'>
20+
<RichHelp help={help} registry={registry} uiSchema={uiSchema} />
21+
</div>
22+
);
23+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export default function FieldTemplate<
3131
displayLabel,
3232
errors,
3333
help,
34+
rawHelp,
3435
hidden,
3536
id,
3637
label,
@@ -39,7 +40,6 @@ export default function FieldTemplate<
3940
onRemoveProperty,
4041
rawErrors,
4142
rawDescription,
42-
rawHelp,
4343
readonly,
4444
registry,
4545
required,

packages/antd/src/templates/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FormContextType, RJSFSchema, StrictRJSFSchema, TemplatesType } from '@r
33
import ArrayFieldItemTemplate from './ArrayFieldItemTemplate';
44
import ArrayFieldTemplate from './ArrayFieldTemplate';
55
import BaseInputTemplate from './BaseInputTemplate';
6-
import DescriptionField from './DescriptionField';
6+
import DescriptionField from './FieldDescriptionTemplate';
77
import ErrorList from './ErrorList';
88
import { AddButton, CopyButton, MoveDownButton, MoveUpButton, RemoveButton } from './IconButton';
99
import FieldErrorTemplate from './FieldErrorTemplate';

0 commit comments

Comments
 (0)