set aria-level in ngOnInit, clean up

Author: annieyw

src/cdk/tree/tree.spec.ts

@@ -596,7 +596,7 @@ describe('CdkTree', () => {
             [`topping_3 - cheese_3 + base_3`]);
       });
 
-      fit('with correct aria-level', () => {
+      it('with correct aria-level', () => {
         expect(getNodes(treeElement).every(node => {
           return node.getAttribute('aria-level') === '1';
         })).toBe(true);

src/cdk/tree/tree.ts

@@ -9,7 +9,6 @@ import {FocusableOption} from '@angular/cdk/a11y';
 import {CollectionViewer, DataSource, isDataSource} from '@angular/cdk/collections';
 import {
   AfterContentChecked,
-  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -291,7 +290,7 @@ export class CdkTree<T> implements AfterContentChecked, CollectionViewer, OnDest
   }
 }
 
-let uuid = 0;
+
 /**
  * Tree node for CdkTree. It contains the data in the tree node.
  */
@@ -304,7 +303,7 @@ let uuid = 0;
     'class': 'cdk-tree-node',
   },
 })
-export class CdkTreeNode<T> implements FocusableOption, OnDestroy, AfterViewInit {
+export class CdkTreeNode<T> implements FocusableOption, OnDestroy, OnInit {
   unique: number;
   /**
    * The most recently created `CdkTreeNode`. We save it in static variable so we can retrieve it
@@ -351,18 +350,14 @@ export class CdkTreeNode<T> implements FocusableOption, OnDestroy, AfterViewInit
   constructor(protected _elementRef: ElementRef<HTMLElement>,
               protected _tree: CdkTree<T>) {
     CdkTreeNode.mostRecentTreeNode = this as CdkTreeNode<T>;
-    this.unique = uuid++;
-    console.error(`constructor: node ${this.unique}`)
   }
 
-  ngAfterViewInit(): void {
+  ngOnInit(): void {
     this._parentNodeAriaLevel = this._getParentNodeAriaLevel();
-    console.error(`ngAfterViewInit: node ${this.unique} set aria-level to ${this.level + 1}`)
     this._elementRef.nativeElement.setAttribute('aria-level', String(this.level + 1));
   }
 
   ngOnDestroy() {
-    console.error(`ngOnDestroy: node ${this.unique}`)
     // If this is the last tree node being destroyed,
     // clear out the reference to avoid leaking memory.
     if (CdkTreeNode.mostRecentTreeNode === this) {

src/material/tree/node.ts

@@ -126,13 +126,13 @@ export class MatNestedTreeNode<T> extends CdkNestedTreeNode<T> implements AfterC
   // This is a workaround for https://github.com/angular/angular/issues/23091
   // In aot mode, the lifecycle hooks from parent class are not called.
   // TODO(tinayuangao): Remove when the angular issue #23091 is fixed
-  // ngAfterContentInit() {
-  //   super.ngAfterContentInit();
-  // }
-  //
-  // ngOnDestroy() {
-  //   super.ngOnDestroy();
-  // }
+  ngAfterContentInit() {
+    super.ngAfterContentInit();
+  }
+
+  ngOnDestroy() {
+    super.ngOnDestroy();
+  }
 
   static ngAcceptInputType_disabled: BooleanInput;
 }

src/material/tree/tree.spec.ts

@@ -350,12 +350,11 @@ describe('MatTree', () => {
           [`topping_3 - cheese_3 + base_3`]);
       });
 
-      fit('with correct aria-level', () => {
+      it('with correct aria-level', () => {
         expect(getNodes(treeElement).every(node => {
           return node.getAttribute('aria-level') === '1';
         })).toBe(true);
 
-        debugger;
         let data = underlyingDataSource.data;
         const child = underlyingDataSource.addChild(data[1]);
         underlyingDataSource.addChild(child);