From 270ed961bf34db3ffff59b2c333158668f0b248f Mon Sep 17 00:00:00 2001
From: Sean Lip <sll@google.com>
Date: Mon, 19 Sep 2016 19:33:35 -0700
Subject: [PATCH] Add aria-level and aria-selected attrs to dropdowns.

---
 accessible/field.component.js          | 5 +++--
 accessible/workspace-tree.component.js | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/accessible/field.component.js b/accessible/field.component.js
index c2a8f9fe1..5a5302960 100644
--- a/accessible/field.component.js
+++ b/accessible/field.component.js
@@ -44,7 +44,8 @@ blocklyApp.FieldComponent = ng.core
       </label>
       <ol role="group">
         <li [id]="idMap[optionValue]" role="treeitem" *ngFor="#optionValue of getOptions()"
-            [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap[optionValue + 'Button'], 'blockly-button')">
+            [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap[optionValue + 'Button'], 'blockly-button')"
+            [attr.aria-level]="level" [attr.aria-selected]="field.getValue() == optionValue">
           <button [id]="idMap[optionValue + 'Button']" (click)="handleDropdownChange(field, optionValue)"
                   [disabled]="disabled" tabindex="-1"
                   [attr.aria-label]="optionText[optionValue] + ' Press Enter to select this value'">
@@ -62,7 +63,7 @@ blocklyApp.FieldComponent = ng.core
       {{field.getText()}}
     </label>
     `,
-    inputs: ['field', 'index', 'parentId', 'disabled', 'mainFieldId'],
+    inputs: ['field', 'index', 'parentId', 'disabled', 'mainFieldId', 'level'],
     pipes: [blocklyApp.TranslatePipe]
   })
   .Class({
diff --git a/accessible/workspace-tree.component.js b/accessible/workspace-tree.component.js
index b7763fbc9..d6c8fdb23 100644
--- a/accessible/workspace-tree.component.js
+++ b/accessible/workspace-tree.component.js
@@ -37,7 +37,8 @@ blocklyApp.WorkspaceTreeComponent = ng.core
         <template ngFor #inputBlock [ngForOf]="block.inputList" #i="index">
           <li role="treeitem" [id]="idMap['listItem' + i]" [attr.aria-level]="level + 1" *ngIf="inputBlock.fieldRow.length"
               [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['fieldLabel' + i])">
-            <blockly-field *ngFor="#field of inputBlock.fieldRow" [field]="field" [mainFieldId]="idMap['fieldLabel' + i]">
+            <blockly-field *ngFor="#field of inputBlock.fieldRow" [field]="field" [mainFieldId]="idMap['fieldLabel' + i]"
+                           [level]="level + 2">
             </blockly-field>
           </li>