diff --git a/.gitignore b/.gitignore index 798771a9f3d5..07b136b5fc67 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ node_modules /.idea /.vscode/launch.json /*.iml +/.vs # misc .DS_Store diff --git a/src/cdk/tree/nested-node.ts b/src/cdk/tree/nested-node.ts index 6e04f90c4e3b..4ad96feb421f 100644 --- a/src/cdk/tree/nested-node.ts +++ b/src/cdk/tree/nested-node.ts @@ -39,9 +39,8 @@ import {getTreeControlFunctionsMissingError} from './tree-errors'; {provide: CDK_TREE_NODE_OUTLET_NODE, useExisting: CdkNestedTreeNode} ] }) -export class CdkNestedTreeNode extends CdkTreeNode implements AfterContentInit, DoCheck, - OnDestroy, - OnInit { +export class CdkNestedTreeNode extends CdkTreeNode + implements AfterContentInit, DoCheck, OnDestroy, OnInit { /** Differ used to find the changes in the data provided by the data source. */ private _dataDiffer: IterableDiffer; @@ -57,7 +56,7 @@ export class CdkNestedTreeNode extends CdkTreeNode implements AfterContent nodeOutlet: QueryList; constructor(protected _elementRef: ElementRef, - protected _tree: CdkTree, + protected _tree: CdkTree, protected _differs: IterableDiffers) { super(_elementRef, _tree); // The classes are directly added here instead of in the host property because classes on diff --git a/src/cdk/tree/padding.ts b/src/cdk/tree/padding.ts index ad72e254d750..798d65bf8c3f 100644 --- a/src/cdk/tree/padding.ts +++ b/src/cdk/tree/padding.ts @@ -23,7 +23,7 @@ const cssUnitPattern = /([A-Za-z%]+)$/; @Directive({ selector: '[cdkTreeNodePadding]', }) -export class CdkTreeNodePadding implements OnDestroy { +export class CdkTreeNodePadding implements OnDestroy { /** Current padding value applied to the element. Used to avoid unnecessarily hitting the DOM. */ private _currentPadding: string|null; @@ -48,8 +48,8 @@ export class CdkTreeNodePadding implements OnDestroy { set indent(indent: number | string) { this._setIndentInput(indent); } _indent: number = 40; - constructor(private _treeNode: CdkTreeNode, - private _tree: CdkTree, + constructor(private _treeNode: CdkTreeNode, + private _tree: CdkTree, private _element: ElementRef, @Optional() private _dir: Directionality) { this._setPadding(); diff --git a/src/cdk/tree/toggle.ts b/src/cdk/tree/toggle.ts index 625b9258439d..9d6c16a5ea96 100644 --- a/src/cdk/tree/toggle.ts +++ b/src/cdk/tree/toggle.ts @@ -15,15 +15,15 @@ import {CdkTree, CdkTreeNode} from './tree'; * Node toggle to expand/collapse the node. */ @Directive({selector: '[cdkTreeNodeToggle]'}) -export class CdkTreeNodeToggle { +export class CdkTreeNodeToggle { /** Whether expand/collapse the node recursively. */ @Input('cdkTreeNodeToggleRecursive') get recursive(): boolean { return this._recursive; } set recursive(value: boolean) { this._recursive = coerceBooleanProperty(value); } protected _recursive = false; - constructor(protected _tree: CdkTree, - protected _treeNode: CdkTreeNode) {} + constructor(protected _tree: CdkTree, + protected _treeNode: CdkTreeNode) {} // We have to use a `HostListener` here in order to support both Ivy and ViewEngine. // In Ivy the `host` bindings will be merged when this class is extended, whereas in diff --git a/src/cdk/tree/tree.ts b/src/cdk/tree/tree.ts index 9e40e52b9f96..c969eb991cbb 100644 --- a/src/cdk/tree/tree.ts +++ b/src/cdk/tree/tree.ts @@ -69,7 +69,7 @@ import {coerceNumberProperty} from '@angular/cdk/coercion'; // tslint:disable-next-line:validate-decorators changeDetection: ChangeDetectionStrategy.Default }) -export class CdkTree implements AfterContentChecked, CollectionViewer, OnDestroy, OnInit { +export class CdkTree implements AfterContentChecked, CollectionViewer, OnDestroy, OnInit { /** Subject that emits when the component has been destroyed. */ private _onDestroy = new Subject(); @@ -100,7 +100,7 @@ export class CdkTree implements AfterContentChecked, CollectionViewer, OnDest private _dataSource: DataSource | Observable | T[]; /** The tree controller */ - @Input() treeControl: TreeControl; + @Input() treeControl: TreeControl; /** * Tracking function that will be used to check the differences in data changes. Used similarly @@ -303,7 +303,7 @@ export class CdkTree implements AfterContentChecked, CollectionViewer, OnDest selector: 'cdk-tree-node', exportAs: 'cdkTreeNode', }) -export class CdkTreeNode implements DoCheck, FocusableOption, OnDestroy, OnInit { +export class CdkTreeNode implements DoCheck, FocusableOption, OnDestroy, OnInit { /** * The role of the tree node. * @deprecated The correct role is 'treeitem', 'group' should not be used. This input will be @@ -362,8 +362,8 @@ export class CdkTreeNode implements DoCheck, FocusableOption, OnDestroy, OnIn } constructor(protected _elementRef: ElementRef, - protected _tree: CdkTree) { - CdkTreeNode.mostRecentTreeNode = this as CdkTreeNode; + protected _tree: CdkTree) { + CdkTreeNode.mostRecentTreeNode = this as CdkTreeNode; // The classes are directly added here instead of in the host property because classes on // the host property are not inherited with View Engine. It is not set as a @HostBinding because // it is not set by the time it's children nodes try to read the class from it. diff --git a/src/material/tree/node.ts b/src/material/tree/node.ts index 41537b03b141..cb18a65e9e68 100644 --- a/src/material/tree/node.ts +++ b/src/material/tree/node.ts @@ -45,12 +45,12 @@ const _MatTreeNodeMixinBase: HasTabIndexCtor & CanDisableCtor & typeof CdkTreeNo inputs: ['role', 'disabled', 'tabIndex'], providers: [{provide: CdkTreeNode, useExisting: MatTreeNode}] }) -export class MatTreeNode extends _MatTreeNodeMixinBase +export class MatTreeNode extends _MatTreeNodeMixinBase implements CanDisable, DoCheck, HasTabIndex, OnInit, OnDestroy { constructor(protected _elementRef: ElementRef, - protected _tree: CdkTree, + protected _tree: CdkTree, @Attribute('tabindex') tabIndex: string) { super(_elementRef, _tree); @@ -107,8 +107,8 @@ export class MatTreeNodeDef extends CdkTreeNodeDef { {provide: CDK_TREE_NODE_OUTLET_NODE, useExisting: MatNestedTreeNode} ] }) -export class MatNestedTreeNode extends CdkNestedTreeNode implements AfterContentInit, DoCheck, - OnDestroy, OnInit { +export class MatNestedTreeNode extends CdkNestedTreeNode + implements AfterContentInit, DoCheck, OnDestroy, OnInit { @Input('matNestedTreeNode') node: T; /** Whether the node is disabled. */ @@ -127,7 +127,7 @@ export class MatNestedTreeNode extends CdkNestedTreeNode implements AfterC private _tabIndex: number; constructor(protected _elementRef: ElementRef, - protected _tree: CdkTree, + protected _tree: CdkTree, protected _differs: IterableDiffers, @Attribute('tabindex') tabIndex: string) { super(_elementRef, _tree, _differs); diff --git a/src/material/tree/padding.ts b/src/material/tree/padding.ts index ed53c932f7f6..66a111bed2db 100644 --- a/src/material/tree/padding.ts +++ b/src/material/tree/padding.ts @@ -15,7 +15,7 @@ import {Directive, Input} from '@angular/core'; selector: '[matTreeNodePadding]', providers: [{provide: CdkTreeNodePadding, useExisting: MatTreeNodePadding}] }) -export class MatTreeNodePadding extends CdkTreeNodePadding { +export class MatTreeNodePadding extends CdkTreeNodePadding { /** The level of depth of the tree node. The padding will be `level * indent` pixels. */ @Input('matTreeNodePadding') diff --git a/src/material/tree/toggle.ts b/src/material/tree/toggle.ts index 16cf9afdf85f..d2c012fe4457 100644 --- a/src/material/tree/toggle.ts +++ b/src/material/tree/toggle.ts @@ -18,7 +18,7 @@ import {Directive, Input} from '@angular/core'; providers: [{provide: CdkTreeNodeToggle, useExisting: MatTreeNodeToggle}] }) // tslint:disable-next-line: coercion-types -export class MatTreeNodeToggle extends CdkTreeNodeToggle { +export class MatTreeNodeToggle extends CdkTreeNodeToggle { @Input('matTreeNodeToggleRecursive') get recursive(): boolean { return this._recursive; } set recursive(value: boolean) { diff --git a/src/material/tree/tree.ts b/src/material/tree/tree.ts index f64c6f4db725..42d646136ec1 100644 --- a/src/material/tree/tree.ts +++ b/src/material/tree/tree.ts @@ -40,7 +40,7 @@ import {MatTreeNodeOutlet} from './outlet'; changeDetection: ChangeDetectionStrategy.Default, providers: [{provide: CdkTree, useExisting: MatTree}] }) -export class MatTree extends CdkTree { +export class MatTree extends CdkTree { // Outlets within the tree's template where the dataNodes will be inserted. @ViewChild(MatTreeNodeOutlet, {static: true}) _nodeOutlet: MatTreeNodeOutlet; } diff --git a/tools/public_api_guard/cdk/tree.d.ts b/tools/public_api_guard/cdk/tree.d.ts index 0cd21d0d2d3e..e47c0fd9c1bb 100644 --- a/tools/public_api_guard/cdk/tree.d.ts +++ b/tools/public_api_guard/cdk/tree.d.ts @@ -20,30 +20,30 @@ export declare abstract class BaseTreeControl implements TreeControl; -export declare class CdkNestedTreeNode extends CdkTreeNode implements AfterContentInit, DoCheck, OnDestroy, OnInit { +export declare class CdkNestedTreeNode extends CdkTreeNode implements AfterContentInit, DoCheck, OnDestroy, OnInit { protected _children: T[]; protected _differs: IterableDiffers; protected _elementRef: ElementRef; - protected _tree: CdkTree; + protected _tree: CdkTree; nodeOutlet: QueryList; - constructor(_elementRef: ElementRef, _tree: CdkTree, _differs: IterableDiffers); + constructor(_elementRef: ElementRef, _tree: CdkTree, _differs: IterableDiffers); protected _clear(): void; ngAfterContentInit(): void; ngDoCheck(): void; ngOnDestroy(): void; ngOnInit(): void; protected updateChildrenNodes(children?: T[]): void; - static ɵdir: i0.ɵɵDirectiveDefWithMeta, "cdk-nested-tree-node", ["cdkNestedTreeNode"], { "role": "role"; "disabled": "disabled"; "tabIndex": "tabIndex"; }, {}, ["nodeOutlet"]>; - static ɵfac: i0.ɵɵFactoryDef, never>; + static ɵdir: i0.ɵɵDirectiveDefWithMeta, "cdk-nested-tree-node", ["cdkNestedTreeNode"], { "role": "role"; "disabled": "disabled"; "tabIndex": "tabIndex"; }, {}, ["nodeOutlet"]>; + static ɵfac: i0.ɵɵFactoryDef, never>; } -export declare class CdkTree implements AfterContentChecked, CollectionViewer, OnDestroy, OnInit { +export declare class CdkTree implements AfterContentChecked, CollectionViewer, OnDestroy, OnInit { _nodeDefs: QueryList>; _nodeOutlet: CdkTreeNodeOutlet; get dataSource(): DataSource | Observable | T[]; set dataSource(dataSource: DataSource | Observable | T[]); trackBy: TrackByFunction; - treeControl: TreeControl; + treeControl: TreeControl; viewChange: BehaviorSubject<{ start: number; end: number; @@ -55,8 +55,8 @@ export declare class CdkTree implements AfterContentChecked, CollectionViewer ngOnDestroy(): void; ngOnInit(): void; renderNodeChanges(data: T[] | ReadonlyArray, dataDiffer?: IterableDiffer, viewContainer?: ViewContainerRef, parentData?: T): void; - static ɵcmp: i0.ɵɵComponentDefWithMeta, "cdk-tree", ["cdkTree"], { "dataSource": "dataSource"; "treeControl": "treeControl"; "trackBy": "trackBy"; }, {}, ["_nodeDefs"], never>; - static ɵfac: i0.ɵɵFactoryDef, never>; + static ɵcmp: i0.ɵɵComponentDefWithMeta, "cdk-tree", ["cdkTree"], { "dataSource": "dataSource"; "treeControl": "treeControl"; "trackBy": "trackBy"; }, {}, ["_nodeDefs"], never>; + static ɵfac: i0.ɵɵFactoryDef, never>; } export declare class CdkTreeModule { @@ -64,28 +64,28 @@ export declare class CdkTreeModule { static ɵmod: i0.ɵɵNgModuleDefWithMeta; } -export declare class CdkTreeNode implements DoCheck, FocusableOption, OnDestroy, OnInit { +export declare class CdkTreeNode implements DoCheck, FocusableOption, OnDestroy, OnInit { protected _data: T; _dataChanges: Subject; protected _destroyed: Subject; protected _elementRef: ElementRef; protected _isAriaExpanded: boolean; - protected _tree: CdkTree; + protected _tree: CdkTree; get data(): T; set data(value: T); get isExpanded(): boolean; get level(): number; get role(): 'treeitem' | 'group'; set role(_role: 'treeitem' | 'group'); - constructor(_elementRef: ElementRef, _tree: CdkTree); + constructor(_elementRef: ElementRef, _tree: CdkTree); protected _setRoleFromData(): void; focus(): void; ngDoCheck(): void; ngOnDestroy(): void; ngOnInit(): void; static mostRecentTreeNode: CdkTreeNode | null; - static ɵdir: i0.ɵɵDirectiveDefWithMeta, "cdk-tree-node", ["cdkTreeNode"], { "role": "role"; }, {}, never>; - static ɵfac: i0.ɵɵFactoryDef, never>; + static ɵdir: i0.ɵɵDirectiveDefWithMeta, "cdk-tree-node", ["cdkTreeNode"], { "role": "role"; }, {}, never>; + static ɵfac: i0.ɵɵFactoryDef, never>; } export declare class CdkTreeNodeDef { @@ -112,7 +112,7 @@ export declare class CdkTreeNodeOutletContext { constructor(data: T); } -export declare class CdkTreeNodePadding implements OnDestroy { +export declare class CdkTreeNodePadding implements OnDestroy { _indent: number; _level: number; get indent(): number | string; @@ -120,28 +120,28 @@ export declare class CdkTreeNodePadding implements OnDestroy { indentUnits: string; get level(): number; set level(value: number); - constructor(_treeNode: CdkTreeNode, _tree: CdkTree, _element: ElementRef, _dir: Directionality); + constructor(_treeNode: CdkTreeNode, _tree: CdkTree, _element: ElementRef, _dir: Directionality); _paddingIndent(): string | null; protected _setIndentInput(indent: number | string): void; protected _setLevelInput(value: number): void; _setPadding(forceChange?: boolean): void; ngOnDestroy(): void; static ngAcceptInputType_level: NumberInput; - static ɵdir: i0.ɵɵDirectiveDefWithMeta, "[cdkTreeNodePadding]", never, { "level": "cdkTreeNodePadding"; "indent": "cdkTreeNodePaddingIndent"; }, {}, never>; - static ɵfac: i0.ɵɵFactoryDef, [null, null, null, { optional: true; }]>; + static ɵdir: i0.ɵɵDirectiveDefWithMeta, "[cdkTreeNodePadding]", never, { "level": "cdkTreeNodePadding"; "indent": "cdkTreeNodePaddingIndent"; }, {}, never>; + static ɵfac: i0.ɵɵFactoryDef, [null, null, null, { optional: true; }]>; } -export declare class CdkTreeNodeToggle { +export declare class CdkTreeNodeToggle { protected _recursive: boolean; - protected _tree: CdkTree; - protected _treeNode: CdkTreeNode; + protected _tree: CdkTree; + protected _treeNode: CdkTreeNode; get recursive(): boolean; set recursive(value: boolean); - constructor(_tree: CdkTree, _treeNode: CdkTreeNode); + constructor(_tree: CdkTree, _treeNode: CdkTreeNode); _toggle(event: Event): void; static ngAcceptInputType_recursive: BooleanInput; - static ɵdir: i0.ɵɵDirectiveDefWithMeta, "[cdkTreeNodeToggle]", never, { "recursive": "cdkTreeNodeToggleRecursive"; }, {}, never>; - static ɵfac: i0.ɵɵFactoryDef, never>; + static ɵdir: i0.ɵɵDirectiveDefWithMeta, "[cdkTreeNodeToggle]", never, { "recursive": "cdkTreeNodeToggleRecursive"; }, {}, never>; + static ɵfac: i0.ɵɵFactoryDef, never>; } export declare class FlatTreeControl extends BaseTreeControl { diff --git a/tools/public_api_guard/material/tree.d.ts b/tools/public_api_guard/material/tree.d.ts index 52d4f10cf426..6eade09863ec 100644 --- a/tools/public_api_guard/material/tree.d.ts +++ b/tools/public_api_guard/material/tree.d.ts @@ -1,26 +1,26 @@ -export declare class MatNestedTreeNode extends CdkNestedTreeNode implements AfterContentInit, DoCheck, OnDestroy, OnInit { +export declare class MatNestedTreeNode extends CdkNestedTreeNode implements AfterContentInit, DoCheck, OnDestroy, OnInit { protected _differs: IterableDiffers; protected _elementRef: ElementRef; - protected _tree: CdkTree; + protected _tree: CdkTree; get disabled(): any; set disabled(value: any); node: T; get tabIndex(): number; set tabIndex(value: number); - constructor(_elementRef: ElementRef, _tree: CdkTree, _differs: IterableDiffers, tabIndex: string); + constructor(_elementRef: ElementRef, _tree: CdkTree, _differs: IterableDiffers, tabIndex: string); ngAfterContentInit(): void; ngDoCheck(): void; ngOnDestroy(): void; ngOnInit(): void; static ngAcceptInputType_disabled: BooleanInput; - static ɵdir: i0.ɵɵDirectiveDefWithMeta, "mat-nested-tree-node", ["matNestedTreeNode"], { "role": "role"; "disabled": "disabled"; "tabIndex": "tabIndex"; "node": "matNestedTreeNode"; }, {}, never>; - static ɵfac: i0.ɵɵFactoryDef, [null, null, null, { attribute: "tabindex"; }]>; + static ɵdir: i0.ɵɵDirectiveDefWithMeta, "mat-nested-tree-node", ["matNestedTreeNode"], { "role": "role"; "disabled": "disabled"; "tabIndex": "tabIndex"; "node": "matNestedTreeNode"; }, {}, never>; + static ɵfac: i0.ɵɵFactoryDef, [null, null, null, { attribute: "tabindex"; }]>; } -export declare class MatTree extends CdkTree { +export declare class MatTree extends CdkTree { _nodeOutlet: MatTreeNodeOutlet; - static ɵcmp: i0.ɵɵComponentDefWithMeta, "mat-tree", ["matTree"], {}, {}, never, never>; - static ɵfac: i0.ɵɵFactoryDef, never>; + static ɵcmp: i0.ɵɵComponentDefWithMeta, "mat-tree", ["matTree"], {}, {}, never, never>; + static ɵfac: i0.ɵɵFactoryDef, never>; } export declare class MatTreeFlatDataSource extends DataSource { @@ -59,17 +59,17 @@ export declare class MatTreeNestedDataSource extends DataSource { disconnect(): void; } -export declare class MatTreeNode extends _MatTreeNodeMixinBase implements CanDisable, DoCheck, HasTabIndex, OnInit, OnDestroy { +export declare class MatTreeNode extends _MatTreeNodeMixinBase implements CanDisable, DoCheck, HasTabIndex, OnInit, OnDestroy { protected _elementRef: ElementRef; - protected _tree: CdkTree; - constructor(_elementRef: ElementRef, _tree: CdkTree, tabIndex: string); + protected _tree: CdkTree; + constructor(_elementRef: ElementRef, _tree: CdkTree, tabIndex: string); ngDoCheck(): void; ngOnDestroy(): void; ngOnInit(): void; static ngAcceptInputType_disabled: BooleanInput; static ngAcceptInputType_tabIndex: NumberInput; - static ɵdir: i0.ɵɵDirectiveDefWithMeta, "mat-tree-node", ["matTreeNode"], { "role": "role"; "disabled": "disabled"; "tabIndex": "tabIndex"; }, {}, never>; - static ɵfac: i0.ɵɵFactoryDef, [null, null, { attribute: "tabindex"; }]>; + static ɵdir: i0.ɵɵDirectiveDefWithMeta, "mat-tree-node", ["matTreeNode"], { "role": "role"; "disabled": "disabled"; "tabIndex": "tabIndex"; }, {}, never>; + static ɵfac: i0.ɵɵFactoryDef, [null, null, { attribute: "tabindex"; }]>; } export declare class MatTreeNodeDef extends CdkTreeNodeDef { @@ -86,18 +86,18 @@ export declare class MatTreeNodeOutlet implements CdkTreeNodeOutlet { static ɵfac: i0.ɵɵFactoryDef; } -export declare class MatTreeNodePadding extends CdkTreeNodePadding { +export declare class MatTreeNodePadding extends CdkTreeNodePadding { get indent(): number | string; set indent(indent: number | string); get level(): number; set level(value: number); - static ɵdir: i0.ɵɵDirectiveDefWithMeta, "[matTreeNodePadding]", never, { "level": "matTreeNodePadding"; "indent": "matTreeNodePaddingIndent"; }, {}, never>; - static ɵfac: i0.ɵɵFactoryDef, never>; + static ɵdir: i0.ɵɵDirectiveDefWithMeta, "[matTreeNodePadding]", never, { "level": "matTreeNodePadding"; "indent": "matTreeNodePaddingIndent"; }, {}, never>; + static ɵfac: i0.ɵɵFactoryDef, never>; } -export declare class MatTreeNodeToggle extends CdkTreeNodeToggle { +export declare class MatTreeNodeToggle extends CdkTreeNodeToggle { get recursive(): boolean; set recursive(value: boolean); - static ɵdir: i0.ɵɵDirectiveDefWithMeta, "[matTreeNodeToggle]", never, { "recursive": "matTreeNodeToggleRecursive"; }, {}, never>; - static ɵfac: i0.ɵɵFactoryDef, never>; + static ɵdir: i0.ɵɵDirectiveDefWithMeta, "[matTreeNodeToggle]", never, { "recursive": "matTreeNodeToggleRecursive"; }, {}, never>; + static ɵfac: i0.ɵɵFactoryDef, never>; }