always set role to treeitem

angular · Jul 30, 2020 · 018dd3b · 018dd3b
1 parent de439a5
commit 018dd3b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/src/cdk/tree/tree.ts b/src/cdk/tree/tree.ts
@@ -337,8 +337,7 @@ export class CdkTreeNode<T> implements FocusableOption, OnDestroy {
   }
 
   /**
-   * The role of the node should be 'group' if it's an internal node,
-   * and 'treeitem' if it's a leaf node.
+   * The role of the node should always be 'treeitem'.
    */
   @Input() role: 'treeitem' | 'group' = 'treeitem';
 
@@ -365,23 +364,19 @@ export class CdkTreeNode<T> implements FocusableOption, OnDestroy {
   }
 
   protected _setRoleFromData(): void {
-    if (this._tree.treeControl.isExpandable) {
-      this.role = this._tree.treeControl.isExpandable(this._data) ? 'group' : 'treeitem';
-    } else {
-      if (!this._tree.treeControl.getChildren) {
-        throw getTreeControlFunctionsMissingError();
-      }
-      const childrenNodes = this._tree.treeControl.getChildren(this._data);
-      if (Array.isArray(childrenNodes)) {
-        this._setRoleFromChildren(childrenNodes as T[]);
-      } else if (isObservable(childrenNodes)) {
-        childrenNodes.pipe(takeUntil(this._destroyed))
-            .subscribe(children => this._setRoleFromChildren(children));
-      }
+    if (this._tree.treeControl.isExpandable && !this._tree.treeControl.getChildren) {
+      throw getTreeControlFunctionsMissingError();
+    }
+    const childrenNodes = this._tree.treeControl.getChildren(this._data);
+    if (Array.isArray(childrenNodes)) {
+      this._setRoleFromChildren(childrenNodes as T[]);
+    } else if (isObservable(childrenNodes)) {
+      childrenNodes.pipe(takeUntil(this._destroyed))
+          .subscribe(children => this._setRoleFromChildren(children));
     }
   }
 
   protected _setRoleFromChildren(children: T[]) {
-    this.role = children && children.length ? 'group' : 'treeitem';
+    this.role = 'treeitem';
   }
 }
diff --git a/src/material/tree/node.ts b/src/material/tree/node.ts
@@ -45,7 +45,7 @@ const _MatTreeNodeMixinBase: HasTabIndexCtor & CanDisableCtor & typeof CdkTreeNo
   host: {
     '[attr.aria-expanded]': 'isExpanded',
     '[attr.aria-level]': 'level + 1',
-    '[attr.role]': `'treeitem'`,
+    '[attr.role]': 'role',
     'class': 'mat-tree-node'
   },
   providers: [{provide: CdkTreeNode, useExisting: MatTreeNode}]
@@ -88,7 +88,7 @@ export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
   exportAs: 'matNestedTreeNode',
   host: {
     '[attr.aria-expanded]': 'isExpanded',
-    '[attr.role]': `'treeitem'`,
+    '[attr.role]': 'role',
     'class': 'mat-nested-tree-node',
   },
   providers: [