Skip to content

UDS-2042: feat(app-rfi): add legend to fieldset for accessible form group labeling #1572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2025
Merged

UDS-2042: feat(app-rfi): add legend to fieldset for accessible form group labeling #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56f6a92
feat(app-rfi): add legend to fieldset for accessible form group labeling
juanmitriatti Aug 14, 2025
59cd66c
feat(app-rfi): only include space if icon present
scott-williams-az Sep 9, 2025
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: 2 additions & 2 deletions packages/app-rfi/src/components/controls/RfiRadioGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Field } from "formik";
import PropTypes from "prop-types";
import React from "react";

import { RfiError, RfiLabel } from "./controls-helpers";
import { RfiError, RfiLegend } from "./controls-helpers";

const RfiRadioGroup = ({ name, id, options, label, onBlur }) => {
return (
Expand All @@ -19,7 +19,7 @@ const RfiRadioGroup = ({ name, id, options, label, onBlur }) => {
const isError = meta.error;
return (
<fieldset>
<RfiLabel label={label} name={name} id={id} />
<RfiLegend label={label} />
<RfiError isError={isError} metaError={meta.error} />
{options.map(option => (
<div
Expand Down
44 changes: 35 additions & 9 deletions packages/app-rfi/src/components/controls/controls-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,41 @@ const GaEventPropTypes = {

const RfiLabel = ({ label, name, id, requiredIcon }) => (
<label htmlFor={id || name}>
{requiredIcon ? (
<span title="Required">
<i className="fas fa-circle uds-field-required" aria-hidden="true" />
</span>
) : null}
&nbsp;
{requiredIcon && (
<>
<span title="Required">
<i className="fas fa-circle uds-field-required" aria-hidden="true" />
</span>
&nbsp;
</>
)}
{label}
</label>
);

const RfiLegend = ({ label, requiredIcon }) => (
<legend className="fw-bold">
{requiredIcon && (
<>
<span title="Required">
<i className="fas fa-circle uds-field-required" aria-hidden="true" />
</span>
&nbsp;
</>
)}
{label}
</legend>
);

const RfiError = ({ isError, metaError }) => (
<div role="alert">
{isError ? (
{isError && (
<small className="form-text invalid-feedback">
<i className="fas fa-exclamation-triangle" aria-hidden="true" />
&nbsp;
{metaError}
</small>
) : null}
)}
</div>
);

Expand All @@ -55,6 +71,16 @@ RfiLabel.propTypes = {
requiredIcon: PropTypes.bool,
};

RfiLegend.defaultProps = {
label: undefined,
requiredIcon: undefined,
};

RfiLegend.propTypes = {
label: PropTypes.string.isRequired,
requiredIcon: PropTypes.bool,
};

RfiError.defaultProps = {
isError: undefined,
metaError: undefined,
Expand All @@ -64,4 +90,4 @@ RfiError.propTypes = {
isError: PropTypes.bool,
metaError: PropTypes.string,
};
export { RfiLabel, RfiError, GaEventPropTypes };
export { RfiLabel, RfiLegend, RfiError, GaEventPropTypes };