Skip to content

Commit 2d033d4

Browse files
committed
fix(cdk/tree): set node role through component host
1 parent b775aaf commit 2d033d4

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

src/cdk/tree/tree.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,7 @@ export class CdkTree<T, K = T>
923923
'[attr.aria-posinset]': '_getPositionInSet()',
924924
'[attr.aria-setsize]': '_getSetSize()',
925925
'tabindex': '-1',
926+
'role': 'treeitem',
926927
'(click)': '_setActiveItem()',
927928
},
928929
})
@@ -940,7 +941,6 @@ export class CdkTreeNode<T, K = T> implements OnDestroy, OnInit, TreeKeyManagerI
940941

941942
set role(_role: 'treeitem' | 'group') {
942943
// ignore any role setting, we handle this internally.
943-
this._setRoleFromData();
944944
}
945945

946946
/**
@@ -998,7 +998,6 @@ export class CdkTreeNode<T, K = T> implements OnDestroy, OnInit, TreeKeyManagerI
998998
set data(value: T) {
999999
if (value !== this._data) {
10001000
this._data = value;
1001-
this._setRoleFromData();
10021001
this._dataChanges.next();
10031002
}
10041003
}
@@ -1055,7 +1054,6 @@ export class CdkTreeNode<T, K = T> implements OnDestroy, OnInit, TreeKeyManagerI
10551054
public _changeDetectorRef: ChangeDetectorRef,
10561055
) {
10571056
CdkTreeNode.mostRecentTreeNode = this as CdkTreeNode<T, K>;
1058-
this.role = 'treeitem';
10591057
}
10601058

10611059
ngOnInit(): void {
@@ -1128,11 +1126,6 @@ export class CdkTreeNode<T, K = T> implements OnDestroy, OnInit, TreeKeyManagerI
11281126
}
11291127
this._tree._keyManager.onClick(this);
11301128
}
1131-
1132-
// TODO: role should eventually just be set in the component host
1133-
protected _setRoleFromData(): void {
1134-
this._elementRef.nativeElement.setAttribute('role', 'treeitem');
1135-
}
11361129
}
11371130

11381131
function getParentNodeAriaLevel(nodeElement: HTMLElement): number {

0 commit comments

Comments
 (0)