Skip to content

Commit a23f598

Browse files
committed
fix(material/tree): api goldens
1 parent 0925b21 commit a23f598

File tree

3 files changed

+47
-13
lines changed

3 files changed

+47
-13
lines changed

src/material/tree/node.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
OnDestroy,
2424
OnInit,
2525
} from '@angular/core';
26-
import {CanDisable, HasTabIndex, mixinDisabled, mixinTabIndex} from '@angular/material/core';
26+
import {CanDisable, HasTabIndex} from '@angular/material/core';
2727
import {BooleanInput, coerceBooleanProperty} from '@angular/cdk/coercion';
2828

2929
/**
@@ -76,7 +76,7 @@ export class MatTreeNode<T, K = T>
7676
get disabled(): boolean {
7777
return this.isDisabled ?? false;
7878
}
79-
set disabled(value: any) {
79+
set disabled(value: BooleanInput) {
8080
this.isDisabled = coerceBooleanProperty(value);
8181
}
8282

@@ -145,7 +145,7 @@ export class MatNestedTreeNode<T, K = T>
145145
get disabled(): boolean {
146146
return this.isDisabled ?? false;
147147
}
148-
set disabled(value: any) {
148+
set disabled(value: BooleanInput) {
149149
this.isDisabled = coerceBooleanProperty(value);
150150
}
151151

tools/public_api_guard/cdk/tree.md

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { CollectionViewer } from '@angular/cdk/collections';
1313
import { DataSource } from '@angular/cdk/collections';
1414
import { Directionality } from '@angular/cdk/bidi';
1515
import { ElementRef } from '@angular/core';
16-
import { FocusableOption } from '@angular/cdk/a11y';
16+
import { EventEmitter } from '@angular/core';
1717
import * as i0 from '@angular/core';
1818
import { InjectionToken } from '@angular/core';
1919
import { IterableDiffer } from '@angular/core';
@@ -27,6 +27,8 @@ import { SelectionModel } from '@angular/cdk/collections';
2727
import { Subject } from 'rxjs';
2828
import { TemplateRef } from '@angular/core';
2929
import { TrackByFunction } from '@angular/core';
30+
import { TreeKeyManager } from '@angular/cdk/a11y';
31+
import { TreeKeyManagerItem } from '@angular/cdk/a11y';
3032
import { ViewContainerRef } from '@angular/core';
3133

3234
// @public @deprecated
@@ -76,8 +78,8 @@ export class CdkNestedTreeNode<T, K = T> extends CdkTreeNode<T, K> implements Af
7678
}
7779

7880
// @public
79-
export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer, OnDestroy, OnInit {
80-
constructor(_differs: IterableDiffers, _changeDetectorRef: ChangeDetectorRef);
81+
export class CdkTree<T, K = T> implements AfterContentChecked, AfterContentInit, CollectionViewer, OnDestroy, OnInit {
82+
constructor(_differs: IterableDiffers, _changeDetectorRef: ChangeDetectorRef, _dir: Directionality, _elementRef: ElementRef<HTMLElement>);
8183
childrenAccessor?: (dataNode: T) => T[] | Observable<T[]>;
8284
collapse(dataNode: T): void;
8385
collapseAll(): void;
@@ -88,19 +90,25 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,
8890
expandAll(): void;
8991
expandDescendants(dataNode: T): void;
9092
expansionKey?: (dataNode: T) => K;
93+
_focusInitialTreeItem(): void;
9194
_getChildrenAccessor(): ((dataNode: T) => T[] | Observable<T[]> | null | undefined) | undefined;
9295
_getDirectChildren(dataNode: T): Observable<T[]>;
9396
_getLevel(node: T): number | undefined;
9497
_getLevelAccessor(): ((dataNode: T) => number) | undefined;
98+
_getNodeChildren(node: CdkTreeNode<T, K>): Observable<CdkTreeNode<T, K>[]>;
9599
_getNodeDef(data: T, i: number): CdkTreeNodeDef<T>;
100+
_getNodeParent(node: CdkTreeNode<T, K>): CdkTreeNode<T, K> | null | undefined;
96101
_getPositionInSet(dataNode: T): number;
97102
_getSetSize(dataNode: T): number;
98103
insertNode(nodeData: T, index: number, viewContainer?: ViewContainerRef, parentData?: T): void;
99104
isExpanded(dataNode: T): boolean;
105+
_keyManager: TreeKeyManager<CdkTreeNode<T, K>>;
100106
levelAccessor?: (dataNode: T) => number;
101107
// (undocumented)
102108
ngAfterContentChecked(): void;
103109
// (undocumented)
110+
ngAfterContentInit(): void;
111+
// (undocumented)
104112
ngOnDestroy(): void;
105113
// (undocumented)
106114
ngOnInit(): void;
@@ -110,6 +118,8 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,
110118
nodeType?: 'flat' | 'nested';
111119
_registerNode(node: CdkTreeNode<T, K>): void;
112120
_renderNodeChanges(data: readonly T[], dataDiffer?: IterableDiffer<T>, viewContainer?: ViewContainerRef, parentData?: T): void;
121+
_sendKeydownToKeyManager(event: KeyboardEvent): void;
122+
_setTabIndex(): void;
113123
toggle(dataNode: T): void;
114124
toggleDescendants(dataNode: T): void;
115125
trackBy: TrackByFunction<T>;
@@ -137,8 +147,11 @@ export class CdkTreeModule {
137147
}
138148

139149
// @public
140-
export class CdkTreeNode<T, K = T> implements FocusableOption, OnDestroy, OnInit {
150+
export class CdkTreeNode<T, K = T> implements OnDestroy, OnInit, TreeKeyManagerItem {
141151
constructor(_elementRef: ElementRef<HTMLElement>, _tree: CdkTree<T, K>);
152+
activate(): void;
153+
readonly activation: EventEmitter<T>;
154+
collapse(): void;
142155
get data(): T;
143156
set data(value: T);
144157
// (undocumented)
@@ -147,9 +160,17 @@ export class CdkTreeNode<T, K = T> implements FocusableOption, OnDestroy, OnInit
147160
protected readonly _destroyed: Subject<void>;
148161
// (undocumented)
149162
protected _elementRef: ElementRef<HTMLElement>;
163+
expand(): void;
164+
readonly expandedChange: EventEmitter<boolean>;
150165
focus(): void;
166+
_getAriaExpanded(): string | null;
167+
// (undocumented)
168+
getChildren(): CdkTreeNode<T, K>[] | Observable<CdkTreeNode<T, K>[]>;
169+
// (undocumented)
170+
getParent(): CdkTreeNode<T, K> | null;
151171
_getPositionInSet(): number;
152172
_getSetSize(): number;
173+
isDisabled?: boolean;
153174
// (undocumented)
154175
isExpandable: boolean;
155176
// (undocumented)
@@ -166,11 +187,17 @@ export class CdkTreeNode<T, K = T> implements FocusableOption, OnDestroy, OnInit
166187
get role(): 'treeitem' | 'group';
167188
set role(_role: 'treeitem' | 'group');
168189
// (undocumented)
190+
_setActiveItem(): void;
191+
// (undocumented)
169192
protected _setRoleFromData(): void;
170193
// (undocumented)
194+
_setTabFocusable(): void;
195+
// (undocumented)
196+
_setTabUnfocusable(): void;
197+
// (undocumented)
171198
protected _tree: CdkTree<T, K>;
172199
// (undocumented)
173-
static ɵdir: i0.ɵɵDirectiveDeclaration<CdkTreeNode<any, any>, "cdk-tree-node", ["cdkTreeNode"], { "role": { "alias": "role"; "required": false; }; "isExpandable": { "alias": "isExpandable"; "required": false; }; "isExpanded": { "alias": "isExpanded"; "required": false; }; }, {}, never, never, false, never>;
200+
static ɵdir: i0.ɵɵDirectiveDeclaration<CdkTreeNode<any, any>, "cdk-tree-node", ["cdkTreeNode"], { "role": { "alias": "role"; "required": false; }; "isExpandable": { "alias": "isExpandable"; "required": false; }; "isExpanded": { "alias": "isExpanded"; "required": false; }; "isDisabled": { "alias": "isDisabled"; "required": false; }; }, { "activation": "activation"; "expandedChange": "expandedChange"; }, never, never, false, never>;
174201
// (undocumented)
175202
static ɵfac: i0.ɵɵFactoryDeclaration<CdkTreeNode<any, any>, never>;
176203
}

tools/public_api_guard/material/tree.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
55
```ts
66

7-
import { _AbstractConstructor } from '@angular/material/core';
87
import { AfterContentInit } from '@angular/core';
98
import { BooleanInput } from '@angular/cdk/coercion';
109
import { CanDisable } from '@angular/material/core';
@@ -16,7 +15,6 @@ import { CdkTreeNodeOutlet } from '@angular/cdk/tree';
1615
import { CdkTreeNodePadding } from '@angular/cdk/tree';
1716
import { CdkTreeNodeToggle } from '@angular/cdk/tree';
1817
import { CollectionViewer } from '@angular/cdk/collections';
19-
import { _Constructor } from '@angular/material/core';
2018
import { DataSource } from '@angular/cdk/collections';
2119
import { ElementRef } from '@angular/core';
2220
import { FlatTreeControl } from '@angular/cdk/tree';
@@ -35,6 +33,7 @@ import { ViewContainerRef } from '@angular/core';
3533
// @public
3634
export class MatNestedTreeNode<T, K = T> extends CdkNestedTreeNode<T, K> implements AfterContentInit, OnDestroy, OnInit {
3735
constructor(elementRef: ElementRef<HTMLElement>, tree: CdkTree<T, K>, differs: IterableDiffers, tabIndex: string);
36+
// @deprecated
3837
get disabled(): boolean;
3938
set disabled(value: BooleanInput);
4039
// (undocumented)
@@ -45,10 +44,11 @@ export class MatNestedTreeNode<T, K = T> extends CdkNestedTreeNode<T, K> impleme
4544
ngOnInit(): void;
4645
// (undocumented)
4746
node: T;
47+
// @deprecated
4848
get tabIndex(): number;
4949
set tabIndex(value: number);
5050
// (undocumented)
51-
static ɵdir: i0.ɵɵDirectiveDeclaration<MatNestedTreeNode<any, any>, "mat-nested-tree-node", ["matNestedTreeNode"], { "role": { "alias": "role"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "node": { "alias": "matNestedTreeNode"; "required": false; }; }, {}, never, never, false, never, false>;
51+
static ɵdir: i0.ɵɵDirectiveDeclaration<MatNestedTreeNode<any, any>, "mat-nested-tree-node", ["matNestedTreeNode"], { "role": { "alias": "role"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "isExpandable": { "alias": "isExpandable"; "required": false; }; "isExpanded": { "alias": "isExpanded"; "required": false; }; "isDisabled": { "alias": "isDisabled"; "required": false; }; "node": { "alias": "matNestedTreeNode"; "required": false; }; }, { "activation": "activation"; "expandedChange": "expandedChange"; }, never, never, false, never, false>;
5252
// (undocumented)
5353
static ɵfac: i0.ɵɵFactoryDeclaration<MatNestedTreeNode<any, any>, [null, null, null, { attribute: "tabindex"; }]>;
5454
}
@@ -115,14 +115,21 @@ export class MatTreeNestedDataSource<T> extends DataSource<T> {
115115
}
116116

117117
// @public
118-
export class MatTreeNode<T, K = T> extends _MatTreeNodeBase<T, K> implements CanDisable, HasTabIndex, OnInit, OnDestroy {
118+
export class MatTreeNode<T, K = T> extends CdkTreeNode<T, K> implements CanDisable, HasTabIndex, OnInit, OnDestroy {
119119
constructor(elementRef: ElementRef<HTMLElement>, tree: CdkTree<T, K>, tabIndex: string);
120+
// @deprecated
121+
defaultTabIndex: number;
122+
// @deprecated
123+
get disabled(): boolean;
124+
set disabled(value: BooleanInput);
120125
// (undocumented)
121126
ngOnDestroy(): void;
122127
// (undocumented)
123128
ngOnInit(): void;
129+
// @deprecated
130+
tabIndex: number;
124131
// (undocumented)
125-
static ɵdir: i0.ɵɵDirectiveDeclaration<MatTreeNode<any, any>, "mat-tree-node", ["matTreeNode"], { "role": { "alias": "role"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; }, {}, never, never, false, never, false>;
132+
static ɵdir: i0.ɵɵDirectiveDeclaration<MatTreeNode<any, any>, "mat-tree-node", ["matTreeNode"], { "role": { "alias": "role"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "isExpandable": { "alias": "isExpandable"; "required": false; }; "isExpanded": { "alias": "isExpanded"; "required": false; }; "isDisabled": { "alias": "isDisabled"; "required": false; }; }, { "activation": "activation"; "expandedChange": "expandedChange"; }, never, never, false, never, false>;
126133
// (undocumented)
127134
static ɵfac: i0.ɵɵFactoryDeclaration<MatTreeNode<any, any>, [null, null, { attribute: "tabindex"; }]>;
128135
}

0 commit comments

Comments
 (0)