From cc947e3479a304ba645c42026a7f013adbe2cd06 Mon Sep 17 00:00:00 2001
From: Jodie Muramoto <jmuramoto@unicon.net>
Date: Wed, 15 Aug 2018 13:34:04 -0700
Subject: [PATCH] SHIBUI-711: Added references to IDs and labels for
 accessibility aria handling;

---
 .../app/schema-form/widget/datalist/datalist.component.html | 6 +++---
 ui/src/app/shared/autocomplete/autocomplete.component.html  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/schema-form/widget/datalist/datalist.component.html b/ui/src/app/schema-form/widget/datalist/datalist.component.html
index 6b3c9286d..ea1af0ec9 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.html
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.html
@@ -1,5 +1,5 @@
 <div class="widget form-group">
-    <label [attr.for]="id" class="d-flex justify-content-between control-label">
+    <label [attr.for]="id" [id]="id" class="d-flex justify-content-between control-label">
         <span>
             {{ schema.title }}
             <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
@@ -22,6 +22,6 @@
         [placeholder]="schema.placeholder || ''"
         [attr.disabled]="schema.readOnly?true:null"
         role="textbox"
-        aria-label="Name ID Format (type for auto-complete)">
+        [attr.aria-label]="schema.title">
     </auto-complete>
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.html b/ui/src/app/shared/autocomplete/autocomplete.component.html
index 103ed7467..cf2ebfd6f 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.html
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.html
@@ -21,6 +21,7 @@
                 type="button"
                 aria-haspopup="true"
                 aria-expanded="false"
+                [attr.aria-labelledby]="id"
                 (click)="state.setState({menuOpen: !state.currentState.menuOpen})">
                 <i class="fa fa-caret-down"></i>
             </button>