Skip to content

Commit 8e70d18

Browse files
committed
remove duplicate input from MatTreeNode, add missing inputs:[] for classes inheriting CdkTreeNode
1 parent 0fe2e7d commit 8e70d18

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

src/cdk/tree/nested-node.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import {getTreeControlFunctionsMissingError} from './tree-errors';
3232
@Directive({
3333
selector: 'cdk-nested-tree-node',
3434
exportAs: 'cdkNestedTreeNode',
35+
inputs: ['role', 'disabled', 'tabIndex'],
3536
providers: [
3637
{provide: CdkTreeNode, useExisting: CdkNestedTreeNode},
3738
{provide: CDK_TREE_NODE_OUTLET_NODE, useExisting: CdkNestedTreeNode}

src/cdk/tree/tree.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import {
1313
ChangeDetectorRef,
1414
Component,
1515
ContentChildren,
16-
Directive, DoCheck,
16+
Directive,
17+
DoCheck,
1718
ElementRef,
1819
Input,
1920
IterableChangeRecord,

src/material/tree/node.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@ const _MatTreeNodeMixinBase: HasTabIndexCtor & CanDisableCtor & typeof CdkTreeNo
4141
@Directive({
4242
selector: 'mat-tree-node',
4343
exportAs: 'matTreeNode',
44-
inputs: ['disabled', 'tabIndex'],
44+
inputs: ['role', 'disabled', 'tabIndex'],
4545
providers: [{provide: CdkTreeNode, useExisting: MatTreeNode}]
4646
})
4747
export class MatTreeNode<T> extends _MatTreeNodeMixinBase<T>
4848
implements CanDisable, HasTabIndex, OnInit, OnDestroy {
49-
@Input() role: 'treeitem' | 'group' = 'treeitem';
5049

5150

5251
constructor(protected _elementRef: ElementRef<HTMLElement>,
@@ -96,6 +95,7 @@ export class MatTreeNodeDef<T> extends CdkTreeNodeDef<T> {
9695
@Directive({
9796
selector: 'mat-nested-tree-node',
9897
exportAs: 'matNestedTreeNode',
98+
inputs: ['role', 'disabled', 'tabIndex'],
9999
providers: [
100100
{provide: CdkNestedTreeNode, useExisting: MatNestedTreeNode},
101101
{provide: CdkTreeNode, useExisting: MatNestedTreeNode},

tools/public_api_guard/cdk/tree.d.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export declare class CdkNestedTreeNode<T> extends CdkTreeNode<T> implements Afte
3232
ngOnDestroy(): void;
3333
ngOnInit(): void;
3434
protected updateChildrenNodes(children?: T[]): void;
35-
static ɵdir: i0.ɵɵDirectiveDefWithMeta<CdkNestedTreeNode<any>, "cdk-nested-tree-node", ["cdkNestedTreeNode"], {}, {}, ["nodeOutlet"]>;
35+
static ɵdir: i0.ɵɵDirectiveDefWithMeta<CdkNestedTreeNode<any>, "cdk-nested-tree-node", ["cdkNestedTreeNode"], { "role": "role"; "disabled": "disabled"; "tabIndex": "tabIndex"; }, {}, ["nodeOutlet"]>;
3636
static ɵfac: i0.ɵɵFactoryDef<CdkNestedTreeNode<any>, never>;
3737
}
3838

@@ -63,21 +63,24 @@ export declare class CdkTreeModule {
6363
static ɵmod: i0.ɵɵNgModuleDefWithMeta<CdkTreeModule, [typeof i1.CdkNestedTreeNode, typeof i2.CdkTreeNodeDef, typeof i3.CdkTreeNodePadding, typeof i4.CdkTreeNodeToggle, typeof i5.CdkTree, typeof i5.CdkTreeNode, typeof i6.CdkTreeNodeOutlet], never, [typeof i1.CdkNestedTreeNode, typeof i2.CdkTreeNodeDef, typeof i3.CdkTreeNodePadding, typeof i4.CdkTreeNodeToggle, typeof i5.CdkTree, typeof i5.CdkTreeNode, typeof i6.CdkTreeNodeOutlet]>;
6464
}
6565

66-
export declare class CdkTreeNode<T> implements FocusableOption, OnDestroy, OnInit {
66+
export declare class CdkTreeNode<T> implements DoCheck, FocusableOption, OnDestroy, OnInit {
6767
protected _data: T;
6868
_dataChanges: Subject<void>;
6969
protected _destroyed: Subject<void>;
7070
protected _elementRef: ElementRef<HTMLElement>;
71+
protected _expanded: boolean;
7172
protected _tree: CdkTree<T>;
7273
get data(): T;
7374
set data(value: T);
7475
get isExpanded(): boolean;
76+
set isExpanded(_expanded: boolean);
7577
get level(): number;
7678
get role(): 'treeitem' | 'group';
7779
set role(_role: 'treeitem' | 'group');
7880
constructor(_elementRef: ElementRef<HTMLElement>, _tree: CdkTree<T>);
7981
protected _setRoleFromData(): void;
8082
focus(): void;
83+
ngDoCheck(): void;
8184
ngOnDestroy(): void;
8285
ngOnInit(): void;
8386
static mostRecentTreeNode: CdkTreeNode<any> | null;

tools/public_api_guard/material/tree.d.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export declare class MatNestedTreeNode<T> extends CdkNestedTreeNode<T> implement
1212
ngOnDestroy(): void;
1313
ngOnInit(): void;
1414
static ngAcceptInputType_disabled: BooleanInput;
15-
static ɵdir: i0.ɵɵDirectiveDefWithMeta<MatNestedTreeNode<any>, "mat-nested-tree-node", ["matNestedTreeNode"], { "node": "matNestedTreeNode"; "disabled": "disabled"; "tabIndex": "tabIndex"; }, {}, never>;
15+
static ɵdir: i0.ɵɵDirectiveDefWithMeta<MatNestedTreeNode<any>, "mat-nested-tree-node", ["matNestedTreeNode"], { "role": "role"; "disabled": "disabled"; "tabIndex": "tabIndex"; "node": "matNestedTreeNode"; }, {}, never>;
1616
static ɵfac: i0.ɵɵFactoryDef<MatNestedTreeNode<any>, [null, null, null, { attribute: "tabindex"; }]>;
1717
}
1818

@@ -61,13 +61,12 @@ export declare class MatTreeNestedDataSource<T> extends DataSource<T> {
6161
export declare class MatTreeNode<T> extends _MatTreeNodeMixinBase<T> implements CanDisable, HasTabIndex, OnInit, OnDestroy {
6262
protected _elementRef: ElementRef<HTMLElement>;
6363
protected _tree: CdkTree<T>;
64-
role: 'treeitem' | 'group';
6564
constructor(_elementRef: ElementRef<HTMLElement>, _tree: CdkTree<T>, tabIndex: string);
6665
ngOnDestroy(): void;
6766
ngOnInit(): void;
6867
static ngAcceptInputType_disabled: BooleanInput;
6968
static ngAcceptInputType_tabIndex: NumberInput;
70-
static ɵdir: i0.ɵɵDirectiveDefWithMeta<MatTreeNode<any>, "mat-tree-node", ["matTreeNode"], { "disabled": "disabled"; "tabIndex": "tabIndex"; "role": "role"; }, {}, never>;
69+
static ɵdir: i0.ɵɵDirectiveDefWithMeta<MatTreeNode<any>, "mat-tree-node", ["matTreeNode"], { "role": "role"; "disabled": "disabled"; "tabIndex": "tabIndex"; }, {}, never>;
7170
static ɵfac: i0.ɵɵFactoryDef<MatTreeNode<any>, [null, null, { attribute: "tabindex"; }]>;
7271
}
7372

0 commit comments

Comments
 (0)