diff --git a/addons/rose/addon/templates/components/rose/form/input.hbs b/addons/rose/addon/templates/components/rose/form/input.hbs index b08cc58c9..9a79d8935 100644 --- a/addons/rose/addon/templates/components/rose/form/input.hbs +++ b/addons/rose/addon/templates/components/rose/form/input.hbs @@ -5,7 +5,11 @@ {{#if @helperText}} - {{@helperText}} + + {{@helperText}} + {{/if}} + @value={{@value}} + aria-describedby="{{if @helperText (concat 'helper-text-' this.id)}}" /> {{yield}} diff --git a/addons/rose/addon/templates/components/rose/form/select.hbs b/addons/rose/addon/templates/components/rose/form/select.hbs index fad5c8edb..d695ca9fd 100644 --- a/addons/rose/addon/templates/components/rose/form/select.hbs +++ b/addons/rose/addon/templates/components/rose/form/select.hbs @@ -5,7 +5,11 @@ {{#if @helperText}} - {{@helperText}} + + {{@helperText}} + {{/if}} {{yield (component 'rose/form/select/select' @@ -14,6 +18,7 @@ disabled=@disabled value=@value onChange=@onChange + helperText=@helperText )}} diff --git a/addons/rose/addon/templates/components/rose/form/select/select.hbs b/addons/rose/addon/templates/components/rose/form/select/select.hbs index b7eaf6a6e..ee183f90c 100644 --- a/addons/rose/addon/templates/components/rose/form/select/select.hbs +++ b/addons/rose/addon/templates/components/rose/form/select/select.hbs @@ -5,6 +5,7 @@ disabled={{@disabled}} @value={{@value}} @onChange={{@onChange}} + aria-describedby="{{if @helperText (concat 'helper-text-' this.id)}}" as |xs| > {{yield xs}} diff --git a/addons/rose/addon/templates/components/rose/form/textarea.hbs b/addons/rose/addon/templates/components/rose/form/textarea.hbs index df71f667e..9ff48348d 100644 --- a/addons/rose/addon/templates/components/rose/form/textarea.hbs +++ b/addons/rose/addon/templates/components/rose/form/textarea.hbs @@ -5,7 +5,11 @@ {{#if @helperText}} - {{@helperText}} + + {{@helperText}} + {{/if}}