Skip to content

Commit a5ed723

Browse files
tinayuangaojelbourn
authored andcommitted
feat(tree): move tree from cdk-experimental, material-experimental to cdk, lib (#9872)
1 parent 67f4898 commit a5ed723

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+23
-26
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
/src/lib/tabs/** @andrewseguin
3333
/src/lib/toolbar/** @devversion
3434
/src/lib/tooltip/** @andrewseguin
35+
/src/lib/tree/** @tinayuangao
3536

3637
# Angular Material core
3738
/src/lib/core/* @jelbourn
@@ -70,18 +71,17 @@
7071
/src/cdk/stepper/** @mmalerba
7172
/src/cdk/table/** @andrewseguin
7273
/src/cdk/testing/** @devversion
74+
/src/cdk/tree/** @tinayuangao
7375

7476
# Moment adapter package
7577
/src/material-moment-adapter/** @mmalerba
7678

7779
# Material experimental package
7880
/src/material-experimental/** @jelbourn
79-
/src/material-experimental/tree/** @tinayuangao
8081

8182
# CDK experimental package
8283
/src/cdk-experimental/** @jelbourn
8384
/src/cdk-experimental/dialog/** @jelbourn @josephperrott @crisbeto
84-
/src/cdk-experimental/tree/** @tinayuangao
8585

8686
# Docs examples & guides
8787
/guides/** @amcdnl @jelbourn
@@ -130,6 +130,7 @@
130130
/src/demo-app/tabs/** @andrewseguin
131131
/src/demo-app/toolbar/** @devversion
132132
/src/demo-app/tooltip/** @andrewseguin
133+
/src/demo-app/tree/** @tinayuangao
133134
/src/demo-app/typography/** @crisbeto
134135

135136
# E2E app
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/cdk-experimental/tree/tsconfig-build.json renamed to src/cdk/tree/tsconfig-build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"annotateForClosureCompiler": true,
99
"strictMetadataEmit": true,
1010
"flatModuleOutFile": "index.js",
11-
"flatModuleId": "@angular/cdk-experimental/tree",
11+
"flatModuleId": "@angular/cdk/tree",
1212
"skipTemplateCodegen": true
1313
}
1414
}

src/demo-app/demo-material-module.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {OverlayModule} from '@angular/cdk/overlay';
1414
import {PlatformModule} from '@angular/cdk/platform';
1515
import {PortalModule} from '@angular/cdk/portal';
1616
import {CdkTableModule} from '@angular/cdk/table';
17+
import {CdkTreeModule} from '@angular/cdk/tree';
1718
import {NgModule} from '@angular/core';
1819
import {
1920
MatAutocompleteModule,
@@ -50,10 +51,8 @@ import {
5051
MatTabsModule,
5152
MatToolbarModule,
5253
MatTooltipModule,
53-
MatStepperModule,
54+
MatTreeModule
5455
} from '@angular/material';
55-
import {CdkTreeModule} from '@angular/cdk-experimental/tree';
56-
import {MatTreeModule} from '@angular/material-experimental/tree';
5756

5857
/**
5958
* NgModule that includes all Material modules that are required to serve the demo-app.

src/demo-app/system-config.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ System.config({
5757
'@angular/cdk/scrolling': 'dist/packages/cdk/scrolling/index.js',
5858
'@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
5959
'@angular/cdk/table': 'dist/packages/cdk/table/index.js',
60-
61-
'@angular/cdk-experimental/tree': 'dist/packages/cdk-experimental/tree/index.js',
60+
'@angular/cdk/tree': 'dist/packages/cdk/tree/index.js',
6261

6362
'@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
6463
'@angular/material/bottom-sheet': 'dist/packages/material/bottom-sheet/index.js',
@@ -93,8 +92,7 @@ System.config({
9392
'@angular/material/tabs': 'dist/packages/material/tabs/index.js',
9493
'@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
9594
'@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
96-
97-
'@angular/material-experimental/tree': 'dist/packages/material-experimental/tree/index.js',
95+
'@angular/material/tree': 'dist/packages/material/tree/index.js',
9896
},
9997
packages: {
10098
// Thirdparty barrels.

src/demo-app/tree/flat-data-source.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {CollectionViewer, DataSource} from '@angular/cdk/collections';
10-
import {FlatTreeControl, TreeControl} from '@angular/cdk-experimental/tree';
10+
import {FlatTreeControl, TreeControl} from '@angular/cdk/tree';
1111
import {Observable} from 'rxjs/Observable';
1212
import {merge} from 'rxjs/observable/merge';
1313
import {map} from 'rxjs/operators/map';

src/demo-app/tree/tree-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
*/
88

99
import {Component} from '@angular/core';
10-
import {FlatTreeControl, NestedTreeControl} from '@angular/cdk-experimental/tree';
11-
import {MatTreeFlattener, MatTreeFlatDataSource, MatTreeNestedDataSource} from '@angular/material-experimental/tree';
10+
import {FlatTreeControl, NestedTreeControl} from '@angular/cdk/tree';
11+
import {MatTreeFlattener, MatTreeFlatDataSource, MatTreeNestedDataSource} from '@angular/material/tree';
1212
import {of as ofObservable} from 'rxjs/observable/of';
1313

1414
import {JsonNode, JsonDatabase} from './json-database';

src/lib/public-api.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ export * from '@angular/material/table';
4040
export * from '@angular/material/tabs';
4141
export * from '@angular/material/toolbar';
4242
export * from '@angular/material/tooltip';
43+
export * from '@angular/material/tree';

src/material-experimental/tree/data-source/flat-data-source.ts renamed to src/lib/tree/data-source/flat-data-source.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {CollectionViewer, DataSource} from '@angular/cdk/collections';
10-
import {FlatTreeControl, TreeControl} from '@angular/cdk-experimental/tree';
10+
import {FlatTreeControl, TreeControl} from '@angular/cdk/tree';
1111
import {Observable} from 'rxjs/Observable';
1212
import {merge} from 'rxjs/observable/merge';
1313
import {map} from 'rxjs/operators/map';
File renamed without changes.

src/material-experimental/tree/node.ts renamed to src/lib/tree/node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
CdkTree,
2020
CdkTreeNodeDef,
2121
CdkTreeNode,
22-
} from '@angular/cdk-experimental/tree';
22+
} from '@angular/cdk/tree';
2323
import {MatTreeNodeOutlet} from './outlet';
2424
import {mixinTabIndex, mixinDisabled, CanDisable, HasTabIndex} from '@angular/material/core';
2525

src/material-experimental/tree/outlet.ts renamed to src/lib/tree/outlet.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {CdkTreeNodeOutlet} from '@angular/cdk-experimental/tree';
8+
import {CdkTreeNodeOutlet} from '@angular/cdk/tree';
99
import {
1010
Directive,
1111
ViewContainerRef,

src/material-experimental/tree/padding.ts renamed to src/lib/tree/padding.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {CdkTreeNodePadding} from '@angular/cdk-experimental/tree';
8+
import {CdkTreeNodePadding} from '@angular/cdk/tree';
99
import {Directive, Input} from '@angular/core';
1010

1111

src/material-experimental/tree/toggle.ts renamed to src/lib/tree/toggle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {Directive, Input} from '@angular/core';
10-
import {CdkTreeNodeToggle} from '@angular/cdk-experimental/tree';
10+
import {CdkTreeNodeToggle} from '@angular/cdk/tree';
1111

1212
/**
1313
* Wrapper for the CdkTree's toggle with Material design styles.

src/material-experimental/tree/tree-module.ts renamed to src/lib/tree/tree-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {NgModule} from '@angular/core';
1010

11-
import {CdkTreeModule} from '@angular/cdk-experimental/tree';
11+
import {CdkTreeModule} from '@angular/cdk/tree';
1212
import {CommonModule} from '@angular/common';
1313
import {MatCommonModule} from '@angular/material/core';
1414
import {MatNestedTreeNode, MatTreeNodeDef, MatTreeNode} from './node';
File renamed without changes.

src/material-experimental/tree/tree.spec.ts renamed to src/lib/tree/tree.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {TreeControl, FlatTreeControl, NestedTreeControl} from '@angular/cdk-experimental/tree';
8+
import {TreeControl, FlatTreeControl, NestedTreeControl} from '@angular/cdk/tree';
99
import {ComponentFixture, TestBed} from '@angular/core/testing';
1010
import {Component, ViewChild} from '@angular/core';
1111
import {

src/material-experimental/tree/tree.ts renamed to src/lib/tree/tree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {ChangeDetectionStrategy, Component, ViewChild, ViewEncapsulation} from '@angular/core';
10-
import {CdkTree} from '@angular/cdk-experimental/tree';
10+
import {CdkTree} from '@angular/cdk/tree';
1111
import {MatTreeNodeOutlet} from './outlet';
1212

1313
/**

src/material-experimental/tree/tsconfig-build.json renamed to src/lib/tree/tsconfig-build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"annotateForClosureCompiler": true,
99
"strictMetadataEmit": true,
1010
"flatModuleOutFile": "index.js",
11-
"flatModuleId": "@angular/material-experimental/tree",
11+
"flatModuleId": "@angular/material/tree",
1212
"skipTemplateCodegen": true,
1313
"fullTemplateTypeCheck": true
1414
}

test/karma-test-shim.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ System.config({
6969
'@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
7070
'@angular/cdk/table': 'dist/packages/cdk/table/index.js',
7171
'@angular/cdk/testing': 'dist/packages/cdk/testing/index.js',
72-
73-
'@angular/cdk-experimental/tree': 'dist/packages/cdk-experimental/tree/index.js',
72+
'@angular/cdk/tree': 'dist/packages/cdk/tree/index.js',
7473

7574
'@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
7675
'@angular/material/bottom-sheet': 'dist/packages/material/bottom-sheet/index.js',
@@ -105,8 +104,7 @@ System.config({
105104
'@angular/material/tabs': 'dist/packages/material/tabs/index.js',
106105
'@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
107106
'@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
108-
109-
'@angular/material-experimental/tree': 'dist/packages/material-experimental/tree/index.js',
107+
'@angular/material/tree': 'dist/packages/material/tree/index.js',
110108
},
111109
packages: {
112110
// Thirdparty barrels.

0 commit comments

Comments
 (0)