From 9da3e6c2dcf75179aff003291784c901ff9965b8 Mon Sep 17 00:00:00 2001
From: Sean Lip <sll@google.com>
Date: Thu, 15 Sep 2016 17:43:56 -0700
Subject: [PATCH] Simplify the handling of the active desc for a toolbox
 without categories.

---
 accessible/toolbox-tree.component.js | 21 +++++++++++++++------
 accessible/toolbox.component.js      |  9 ++++-----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/accessible/toolbox-tree.component.js b/accessible/toolbox-tree.component.js
index e5bbb75be..826a44edd 100644
--- a/accessible/toolbox-tree.component.js
+++ b/accessible/toolbox-tree.component.js
@@ -29,7 +29,7 @@ blocklyApp.ToolboxTreeComponent = ng.core
     selector: 'blockly-toolbox-tree',
     template: `
     <li #parentList [id]="idMap['parentList']" role="treeitem"
-        [ngClass]="{blocklyHasChildren: displayBlockMenu, blocklyActiveDescendant: index == 0 && noCategories}"
+        [ngClass]="{blocklyHasChildren: displayBlockMenu}"
         [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['blockSummaryLabel'], 'blockly-toolbox-block')"
         [attr.aria-level]="level">
       <label #blockSummaryLabel [id]="idMap['blockSummaryLabel']">{{getBlockDescription()}}</label>
@@ -69,7 +69,7 @@ blocklyApp.ToolboxTreeComponent = ng.core
       return blocklyApp.ToolboxTreeComponent;
     })],
     inputs: [
-        'block', 'displayBlockMenu', 'level', 'index', 'tree', 'noCategories', 'isTopLevel'],
+        'block', 'displayBlockMenu', 'level', 'tree', 'isFirstToolboxTree'],
     pipes: [blocklyApp.TranslatePipe]
   })
   .Class({
@@ -92,10 +92,19 @@ blocklyApp.ToolboxTreeComponent = ng.core
             'blockCopyButton', 'sendToSelected', 'sendToSelectedButton']);
       }
       this.idMap = this.utilsService.generateIds(elementsNeedingIds);
-      if (this.isTopLevel) {
-        this.idMap['parentList'] = 'blockly-toolbox-tree-node0';
-      } else {
-        this.idMap['parentList'] = this.utilsService.generateUniqueId();
+      this.idMap['parentList'] = this.utilsService.generateUniqueId();
+    },
+    ngAfterViewInit: function() {
+      // If this is the first tree in the category-less toolbox, set its active
+      // descendant after the ids have been computed.
+      // Note that a timeout is needed here in order to trigger Angular
+      // change detection.
+      if (this.isFirstToolboxTree) {
+        var that = this;
+        setTimeout(function() {
+          that.treeService.setActiveDesc(
+              that.idMap['parentList'], 'blockly-toolbox-tree');
+        });
       }
     },
     getBlockDescription: function() {
diff --git a/accessible/toolbox.component.js b/accessible/toolbox.component.js
index a7d5acd93..d43bb1532 100644
--- a/accessible/toolbox.component.js
+++ b/accessible/toolbox.component.js
@@ -55,13 +55,12 @@ blocklyApp.ToolboxComponent = ng.core
             </div>
           </li>
         </template>
+
         <div *ngIf="!xmlHasCategories">
           <blockly-toolbox-tree *ngFor="#block of getToolboxWorkspace(toolboxCategories[0]).topBlocks_; #i=index"
-                                [level]="1" [block]="block"
-                                [displayBlockMenu]="true"
-                                [index]="i" [tree]="tree"
-                                [noCategories]="true"
-                                [isTopLevel]="true">
+                                role="treeitem" [level]="1" [block]="block"
+                                [tree]="tree" [displayBlockMenu]="true"
+                                [isFirstToolboxTree]="i === 0">
           </blockly-toolbox-tree>
         </div>
       </ol>