Skip to content

Commit 9c689b7

Browse files
committed
clean up duplicate host:{} and @HostBinding
1 parent a7d387d commit 9c689b7

File tree

4 files changed

+28
-16
lines changed

4 files changed

+28
-16
lines changed

src/cdk/tree/nested-node.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
ContentChildren,
1111
Directive,
1212
ElementRef,
13-
HostBinding,
1413
IterableDiffer,
1514
IterableDiffers,
1615
OnDestroy,
@@ -38,11 +37,6 @@ import {getTreeControlFunctionsMissingError} from './tree-errors';
3837
]
3938
})
4039
export class CdkNestedTreeNode<T> extends CdkTreeNode<T> implements AfterContentInit, OnDestroy {
41-
// tslint:disable:no-host-decorator-in-concrete
42-
@HostBinding('attr.aria-expanded') _expanded = this.isExpanded;
43-
@HostBinding('attr.role') _role = this.role;
44-
// tslint:enable:no-host-decorator-in-concrete
45-
4640
/** Differ used to find the changes in the data provided by the data source. */
4741
private _dataDiffer: IterableDiffer<T>;
4842

src/material/tree/node.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ const _MatTreeNodeMixinBase: HasTabIndexCtor & CanDisableCtor & typeof CdkTreeNo
4242
selector: 'mat-tree-node',
4343
exportAs: 'matTreeNode',
4444
inputs: ['disabled', 'tabIndex'],
45-
host: {
46-
'[attr.aria-expanded]': 'isExpanded',
47-
'[attr.role]': 'role',
48-
},
4945
providers: [{provide: CdkTreeNode, useExisting: MatTreeNode}]
5046
})
5147
export class MatTreeNode<T> extends _MatTreeNodeMixinBase<T>
@@ -88,10 +84,6 @@ export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
8884
@Directive({
8985
selector: 'mat-nested-tree-node',
9086
exportAs: 'matNestedTreeNode',
91-
host: {
92-
'[attr.aria-expanded]': 'isExpanded',
93-
'[attr.role]': 'role',
94-
},
9587
providers: [
9688
{provide: CdkNestedTreeNode, useExisting: MatNestedTreeNode},
9789
{provide: CdkTreeNode, useExisting: MatNestedTreeNode},

tools/public_api_guard/cdk/tree.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ export declare class CdkNestedTreeNode<T> extends CdkTreeNode<T> implements Afte
2424
protected _children: T[];
2525
protected _differs: IterableDiffers;
2626
protected _elementRef: ElementRef<HTMLElement>;
27-
_expanded: boolean;
28-
_role: "treeitem" | "group";
2927
protected _tree: CdkTree<T>;
3028
nodeOutlet: QueryList<CdkTreeNodeOutlet>;
3129
constructor(_elementRef: ElementRef<HTMLElement>, _tree: CdkTree<T>, _differs: IterableDiffers);
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
export declare class MatTreeHarness extends ComponentHarness {
2+
getNodes(filter?: TreeNodeHarnessFilters): Promise<MatTreeNodeHarness[]>;
3+
static hostSelector: string;
4+
static with(options?: TreeHarnessFilters): HarnessPredicate<MatTreeHarness>;
5+
}
6+
7+
export declare class MatTreeNodeHarness extends ComponentHarness {
8+
_toggle: import("@angular/cdk/testing").AsyncFactoryFn<import("@angular/cdk/testing").TestElement | null>;
9+
collapse(): Promise<void>;
10+
expand(): Promise<void>;
11+
getLevel(): Promise<number>;
12+
getText(): Promise<string>;
13+
isDisabled(): Promise<boolean>;
14+
isExpanded(): Promise<boolean>;
15+
toggle(): Promise<void>;
16+
static hostSelector: string;
17+
static with(options?: TreeNodeHarnessFilters): HarnessPredicate<MatTreeNodeHarness>;
18+
}
19+
20+
export interface TreeHarnessFilters extends BaseHarnessFilters {
21+
}
22+
23+
export interface TreeNodeHarnessFilters extends BaseHarnessFilters {
24+
disabled?: boolean;
25+
expanded?: boolean;
26+
level?: number;
27+
text?: string | RegExp;
28+
}

0 commit comments

Comments
 (0)