Skip to content

Commit 8e58ea2

Browse files
tinayuangaojelbourn
authored andcommitted
feat(tree): move tree to experimental (#9324)
1 parent fa8c693 commit 8e58ea2

40 files changed

+34
-22
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,18 @@
7070
/src/cdk/stepper/** @mmalerba
7171
/src/cdk/table/** @andrewseguin
7272
/src/cdk/testing/** @devversion
73-
/src/cdk/tree/** @tinayuangao
7473

7574
# Moment adapter package
7675
/src/material-moment-adapter/** @mmalerba
7776

7877
# Material experimental package
7978
/src/material-experimental/** @jelbourn
79+
/src/material-experimental/tree/** @tinayuangao
8080

8181
# CDK experimental package
8282
/src/cdk-experimental/** @jelbourn
8383
/src/cdk-experimental/dialog/** @jelbourn @josephperrott @crisbeto
84+
/src/cdk-experimental/tree/** @tinayuangao
8485

8586
# Docs examples & guides
8687
/guides/** @amcdnl @jelbourn
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/tree/tsconfig-build.json renamed to src/cdk-experimental/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/tree",
11+
"flatModuleId": "@angular/cdk-experimental/tree",
1212
"skipTemplateCodegen": true
1313
}
1414
}

src/demo-app/system-config.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ 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-
'@angular/cdk/tree': 'dist/packages/cdk/tree/index.js',
60+
61+
'@angular/cdk-experimental/tree': 'dist/packages/cdk-experimental/tree/index.js',
6162

6263
'@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
6364
'@angular/material/bottom-sheet': 'dist/packages/material/bottom-sheet/index.js',
@@ -92,7 +93,8 @@ System.config({
9293
'@angular/material/tabs': 'dist/packages/material/tabs/index.js',
9394
'@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
9495
'@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
95-
'@angular/material/tree': 'dist/packages/material/tree/index.js',
96+
97+
'@angular/material-experimental/tree': 'dist/packages/material-experimental/tree/index.js',
9698
},
9799
packages: {
98100
// 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/tree';
10+
import {FlatTreeControl, TreeControl} from '@angular/cdk-experimental/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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {Component} from '@angular/core';
10-
import {FlatTreeControl, NestedTreeControl} from '@angular/cdk/tree';
10+
import {FlatTreeControl, NestedTreeControl} from '@angular/cdk-experimental/tree';
1111
import {of as ofObservable} from 'rxjs/observable/of';
1212

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

src/lib/core/theming/_all-theme.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
@import '../../tabs/tabs-theme';
3030
@import '../../toolbar/toolbar-theme';
3131
@import '../../tooltip/tooltip-theme';
32-
@import '../../tree/tree-theme';
3332
@import '../../snack-bar/snack-bar-theme';
3433
@import '../../form-field/form-field-theme';
3534

@@ -67,6 +66,5 @@
6766
@include mat-tabs-theme($theme);
6867
@include mat-toolbar-theme($theme);
6968
@include mat-tooltip-theme($theme);
70-
@include mat-tree-theme($theme);
7169
@include mat-snack-bar-theme($theme);
7270
}

src/lib/core/typography/_all-typography.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
@import '../../tabs/tabs-theme';
2828
@import '../../toolbar/toolbar-theme';
2929
@import '../../tooltip/tooltip-theme';
30-
@import '../../tree/tree-theme';
3130
@import '../../snack-bar/snack-bar-theme';
3231
@import '../option/option-theme';
3332
@import '../option/optgroup-theme';
@@ -69,7 +68,6 @@
6968
@include mat-tabs-typography($config);
7069
@include mat-toolbar-typography($config);
7170
@include mat-tooltip-typography($config);
72-
@include mat-tree-typography($config);
7371
@include mat-list-typography($config);
7472
@include mat-option-typography($config);
7573
@include mat-optgroup-typography($config);

src/lib/public-api.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@ 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';
File renamed without changes.

src/lib/tree/node.ts renamed to src/material-experimental/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/tree';
22+
} from '@angular/cdk-experimental/tree';
2323
import {MatTreeNodeOutlet} from './outlet';
2424
import {mixinTabIndex, mixinDisabled, CanDisable, HasTabIndex} from '@angular/material/core';
2525

src/lib/tree/outlet.ts renamed to src/material-experimental/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/tree';
8+
import {CdkTreeNodeOutlet} from '@angular/cdk-experimental/tree';
99
import {
1010
Directive,
1111
ViewContainerRef,

src/lib/tree/padding.ts renamed to src/material-experimental/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/tree';
8+
import {CdkTreeNodePadding} from '@angular/cdk-experimental/tree';
99
import {Directive, Input} from '@angular/core';
1010

1111

src/lib/tree/toggle.ts renamed to src/material-experimental/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/tree';
10+
import {CdkTreeNodeToggle} from '@angular/cdk-experimental/tree';
1111

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

src/lib/tree/tree-module.ts renamed to src/material-experimental/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/tree';
11+
import {CdkTreeModule} from '@angular/cdk-experimental/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.
File renamed without changes.

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
18
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
29
import {Component, ViewChild} from '@angular/core';
310

@@ -7,7 +14,7 @@ import {Observable} from 'rxjs/Observable';
714
import {combineLatest} from 'rxjs/observable/combineLatest';
815
import {map} from 'rxjs/operators/map';
916

10-
import {TreeControl, FlatTreeControl} from '@angular/cdk/tree';
17+
import {TreeControl, FlatTreeControl} from '@angular/cdk-experimental/tree';
1118
import {MatTreeModule} from './index';
1219
import {MatTree} from './tree';
1320

src/lib/tree/tree.ts renamed to src/material-experimental/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/tree';
10+
import {CdkTree} from '@angular/cdk-experimental/tree';
1111
import {MatTreeNodeOutlet} from './outlet';
1212

1313
/**

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"annotateForClosureCompiler": true,
99
"strictMetadataEmit": true,
1010
"flatModuleOutFile": "index.js",
11-
"flatModuleId": "@angular/material/tree",
12-
"skipTemplateCodegen": true
11+
"flatModuleId": "@angular/material-experimental/tree",
12+
"skipTemplateCodegen": true,
13+
"fullTemplateTypeCheck": true
1314
}
1415
}

src/material-experimental/tsconfig-build.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
"moduleResolution": "node",
1414
"outDir": "../../dist/packages/material-experimental",
1515
"rootDir": ".",
16+
"rootDirs": [
17+
".",
18+
"../../dist/packages/material-experimental"
19+
],
1620
"sourceMap": true,
1721
"inlineSources": true,
1822
"target": "es2015",

test/karma-test-shim.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ 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-
'@angular/cdk/tree': 'dist/packages/cdk/tree/index.js',
72+
73+
'@angular/cdk-experimental/tree': 'dist/packages/cdk-experimental/tree/index.js',
7374

7475
'@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
7576
'@angular/material/bottom-sheet': 'dist/packages/material/bottom-sheet/index.js',
@@ -104,7 +105,8 @@ System.config({
104105
'@angular/material/tabs': 'dist/packages/material/tabs/index.js',
105106
'@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
106107
'@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
107-
'@angular/material/tree': 'dist/packages/material/tree/index.js',
108+
109+
'@angular/material-experimental/tree': 'dist/packages/material-experimental/tree/index.js',
108110
},
109111
packages: {
110112
// Thirdparty barrels.

0 commit comments

Comments
 (0)