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

Author: Suyog241005

CHANGELOG.md

@@ -87,8 +87,6 @@ should change the heading of the (upcoming) version to include a major version b
 - Fixed duplicate label and description rendering in `CheckboxWidget` by conditionally rendering them based on widget type
   - Updated `CheckboxWidget` to handle label and description rendering consistently
   - Modified `FieldTemplate` to skip label and description rendering for checkbox widgets, fixing ([#4742](https://github.com/rjsf-team/react-jsonschema-form/issues/4742))
-  - Updated `CheckboxWidget` to handle label and description rendering consistently
-  - Modified `FieldTemplate` to skip label and description rendering for checkbox widgets, fixing ([#4742](https://github.com/rjsf-team/react-jsonschema-form/issues/4742))
 - Updated `ObjectField` to change the removal of an additional property to defer the work to the `processPendingChange()` handler in `Form`, fixing [#4850](https://github.com/rjsf-team/react-jsonschema-form/issues/4850)
 - Updated `FallbackField` to support `object` and `array` types, and improved `ArrayField` so that it handles missing items properly with the fallback field
 
@@ -105,7 +103,6 @@ should change the heading of the (upcoming) version to include a major version b
 - Updated `FieldTemplate` to skip label and description rendering for checkbox widgets, fixing ([#4742](https://github.com/rjsf-team/react-jsonschema-form/issues/4742))
 - Updated `ArrayFieldItemTemplate` to switch `size` from 'auto' to responsive values on the `Grid`, fixing [#4838](https://github.com/rjsf-team/react-jsonschema-form/issues/4838)
 
-
 ## @rjsf/primereact
 
 - Updated `FieldTemplate` to skip label and description rendering for checkbox widgets, fixing ([#4742](https://github.com/rjsf-team/react-jsonschema-form/issues/4742))
@@ -126,7 +123,6 @@ should change the heading of the (upcoming) version to include a major version b
 ## @rjsf/utils
 
 - Updated `getDefaultFormState()` to not save an undefined field value into an object when the type is `null` and `excludeObjectChildren` is provided, fixing [#4821](https://github.com/rjsf-team/react-jsonschema-form/issues/4821)
-- Added new `ADDITIONAL_PROPERTY_KEY_REMOVE` constant
 
 ## Dev / docs / playground
 

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

@@ -31,6 +31,7 @@ export default function FieldTemplate<
     displayLabel,
     errors,
     help,
+    rawHelp,
     hidden,
     id,
     label,
@@ -99,7 +100,7 @@ export default function FieldTemplate<
       <Form.Item
         colon={colon}
         hasFeedback={schema.type !== 'array' && schema.type !== 'object'}
-        help={help || (rawErrors?.length ? errors : undefined)}
+        help={(!!rawHelp && help) || (rawErrors?.length ? errors : undefined)}
         htmlFor={id}
         label={displayLabel && !isCheckbox && label}
         labelCol={labelCol}

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

@@ -1,4 +1,4 @@
-import { helpId, FieldHelpProps, FormContextType, RJSFSchema, StrictRJSFSchema, getUiOptions } from '@rjsf/utils';
+import { helpId, FieldHelpProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 import Markdown from 'markdown-to-jsx';
 
 /** The `FieldHelpTemplate` component renders any help desired for a field
@@ -10,29 +10,14 @@ export default function FieldHelpTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: FieldHelpProps<T, S, F>) {
-  const { fieldPathId, help, uiSchema = {}, registry } = props;
+  const { fieldPathId, help } = props;
   if (!help) {
     return null;
   }
   const id = helpId(fieldPathId);
-  const uiOptions = getUiOptions<T, S, F>(uiSchema, registry?.globalUiOptions);
-  if (typeof help === 'string' && uiOptions.enableMarkdownInHelp) {
-    return (
-      <div id={id} className='help-block'>
-        <Markdown options={{ disableParsingRawHTML: true }}>{help}</Markdown>
-      </div>
-    );
-  }
-  if (typeof help === 'string') {
-    return (
-      <p id={id} className='help-block'>
-        {help}
-      </p>
-    );
-  }
   return (
     <div id={id} className='help-block'>
-      {help}
+      <Markdown options={{ disableParsingRawHTML: true }}>{help as string}</Markdown>
     </div>
   );
 }