diff --git a/ui/lib/core/addon/components/form-field.hbs b/ui/lib/core/addon/components/form-field.hbs index 273648a36f..8573a2742c 100644 --- a/ui/lib/core/addon/components/form-field.hbs +++ b/ui/lib/core/addon/components/form-field.hbs @@ -395,10 +395,11 @@ @checked={{if @attr.options.isOppositeValue (not this.toggleInputEnabled) this.toggleInputEnabled}} data-test-toggle={{@attr.name}} disabled={{this.disabled}} + aria-describedby={{concat @attr.name "-helper-text"}} > {{this.labelString}}
- + {{#if this.toggleInputEnabled}} {{if @attr.options.isOppositeValue @attr.options.helperTextDisabled @attr.options.helperTextEnabled}} {{else}} @@ -414,8 +415,9 @@ @onChange={{this.toggleTextShow}} @checked={{this.showToggleTextInput}} data-test-toggle={{@attr.name}} + aria-describedby={{concat @attr.name "-helper-text"}} > - {{this.labelString}}
+ {{this.labelString}}
{{#if this.showToggleTextInput}} diff --git a/ui/lib/core/addon/components/string-list.hbs b/ui/lib/core/addon/components/string-list.hbs index 71ee2480d5..f11f2cfb93 100644 --- a/ui/lib/core/addon/components/string-list.hbs +++ b/ui/lib/core/addon/components/string-list.hbs @@ -19,7 +19,7 @@ {{/if}} {{#if @subText}} -

+

{{@subText}}

{{/if}} @@ -33,6 +33,7 @@ @value={{data.value}} name={{concat this.elementId "-" index}} aria-label="{{@label}} list item {{index}}" + aria-describedby={{concat (dasherize @label) "-helper-text"}} {{on "keyup" (action "inputChanged" index)}} {{on "change" (action "inputChanged" index)}} /> diff --git a/ui/lib/core/addon/components/ttl-picker.hbs b/ui/lib/core/addon/components/ttl-picker.hbs index 81d0dde39d..7ad74e30f7 100644 --- a/ui/lib/core/addon/components/ttl-picker.hbs +++ b/ui/lib/core/addon/components/ttl-picker.hbs @@ -73,6 +73,7 @@ @checked={{this.enableTTL}} @hideLabel={{true}} data-test-ttl-toggle={{this.label}} + aria-describedby={{concat (dasherize this.label) "-helper-text"}} >
{{#if (has-block)}} @@ -83,7 +84,10 @@ {{this.label}}
{{#if this.helperText}}
- {{this.helperText}} + {{this.helperText}} {{#if @description}}