Skip to content

AP-7894 # Revert to <label>, remove htmlFor #1036

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
divporter merged 1 commit into from
Apr 1, 2026
Merged

AP-7894 # Revert to <label>, remove htmlFor #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 10 additions & 15 deletions src/components/renderer/FormElementLabelContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,30 @@ function FormElementLabelContainer({
required,
children,
leading,
associateLabelWithInput = true,
associateLabelWithInput = true
}: {
className: string
element: FormTypes.FormElementBase
id: string
required: boolean
children: React.ReactNode
leading?: React.ReactNode
/** When false, render the title as a span (no htmlFor), e.g. repeatable sets with no single control. */
associateLabelWithInput?: boolean
}) {
const labelId = `${id}-label`
const labelClassName = clsx('ob-label', {
'ob-label__required is-required': required,
})

return (
<div className={clsx('ob-form__element', className)}>
<div className="label ob-label__container">
{leading}
{associateLabelWithInput ? (
<label className={labelClassName} htmlFor={id} id={labelId}>
{element.label}
</label>
) : (
<span className={labelClassName} id={labelId}>
{element.label}
</span>
)}
<label
className={clsx('ob-label', {
'ob-label__required is-required': required,
})}
htmlFor={associateLabelWithInput ? id : undefined}
id={`${id}-label`}
>
{element.label}
</label>
{element.hint &&
(element.hintPosition === 'TOOLTIP' || !element.hintPosition) && (
<HintTooltip hint={element.hint} inputId={id} />
Expand Down
2 changes: 2 additions & 0 deletions src/form-elements/FormElementRepeatableSet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ function FormElementRepeatableSet({
onAdd={() => handleAddEntry(0)}
element={element}
classes={['ob-button-repeatable-set-layout__multiple-add-buttons']}
id={id}
/>
)}
{entries.map((entry, index) => {
Expand Down Expand Up @@ -445,6 +446,7 @@ function FormElementRepeatableSet({
<AddButton
onAdd={() => handleAddEntry(entries.length)}
element={element}
id={id}
/>
)}
{(isDirty || displayValidationMessage) &&
Expand Down
Loading