diff --git a/spiffworkflow-frontend/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx b/spiffworkflow-frontend/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx index 7954a0ace..c6f677d29 100644 --- a/spiffworkflow-frontend/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx +++ b/spiffworkflow-frontend/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx @@ -85,6 +85,11 @@ export default function BaseInputTemplate< labelToUse = `${labelToUse}*`; } + let helperText = null; + if (uiSchema && uiSchema['ui:help']) { + helperText = uiSchema['ui:help']; + } + let invalid = false; let errorMessageForField = null; if (rawErrors && rawErrors.length > 0) { @@ -103,6 +108,7 @@ export default function BaseInputTemplate< name={id} className="input" labelText={labelToUse} + helperText={helperText} invalid={invalid} invalidText={errorMessageForField} autoFocus={autofocus} diff --git a/spiffworkflow-frontend/src/themes/carbon/FieldHelpTemplate/FieldHelpTemplate.tsx b/spiffworkflow-frontend/src/themes/carbon/FieldHelpTemplate/FieldHelpTemplate.tsx index 08a61aeb4..da4543f24 100644 --- a/spiffworkflow-frontend/src/themes/carbon/FieldHelpTemplate/FieldHelpTemplate.tsx +++ b/spiffworkflow-frontend/src/themes/carbon/FieldHelpTemplate/FieldHelpTemplate.tsx @@ -7,10 +7,8 @@ import FormHelperText from '@mui/material/FormHelperText'; * @param props - The `FieldHelpProps` to be rendered */ export default function FieldHelpTemplate(props: FieldHelpProps) { - const { idSchema, help } = props; - if (!help) { - return null; - } - const id = `${idSchema.$id}__help`; - return {help}; + // ui:help is handled by helperText in all carbon widgets. + // see BaseInputTemplate/BaseInputTemplate.tsx and + // SelectWidget/SelectWidget.tsx + return null; } diff --git a/spiffworkflow-frontend/src/themes/carbon/SelectWidget/SelectWidget.tsx b/spiffworkflow-frontend/src/themes/carbon/SelectWidget/SelectWidget.tsx index 616b11a75..d74b9b7b2 100644 --- a/spiffworkflow-frontend/src/themes/carbon/SelectWidget/SelectWidget.tsx +++ b/spiffworkflow-frontend/src/themes/carbon/SelectWidget/SelectWidget.tsx @@ -41,6 +41,10 @@ function SelectWidget({ } else if (schema && schema.title) { labelToUse = schema.title; } + let helperText = null; + if (uiSchema && uiSchema['ui:help']) { + helperText = uiSchema['ui:help']; + } if (required) { labelToUse = `${labelToUse}*`; } @@ -52,13 +56,16 @@ function SelectWidget({ errorMessageForField = `${labelToUse.replace(/\*$/, '')} ${rawErrors[0]}`; } + // maybe use placeholder somehow. it was previously jammed into the helperText field, + // but allowing ui:help to grab that spot seems much more appropriate. + return (