Skip to content

Commit 21513ab

Browse files
committed
feat(tree): move tree to experimental (#9324)
1 parent fd06b2e commit 21513ab

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

+36
-24
lines changed

.github/CODEOWNERS

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

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

7776
# Material experimental package
7877
/src/material-experimental/** @jelbourn
78+
/src/material-experimental/tree/** @tinayuangao
7979

8080
# CDK experimental package
8181
/src/cdk-experimental/** @jelbourn
8282
/src/cdk-experimental/dialog/** @jelbourn @josephperrott @crisbeto
83+
/src/cdk-experimental/tree/** @tinayuangao
8384

8485
# Docs examples & guides
8586
/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/demo-material-module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import {
3838
MatTabsModule,
3939
MatToolbarModule,
4040
MatTooltipModule,
41-
MatTreeModule,
4241
MatStepperModule,
4342
} from '@angular/material';
4443
import {MatNativeDateModule, MatRippleModule} from '@angular/material';
@@ -50,7 +49,8 @@ import {PlatformModule} from '@angular/cdk/platform';
5049
import {ObserversModule} from '@angular/cdk/observers';
5150
import {PortalModule} from '@angular/cdk/portal';
5251
import {CdkTableModule} from '@angular/cdk/table';
53-
import {CdkTreeModule} from '@angular/cdk/tree';
52+
import {CdkTreeModule} from '@angular/cdk-experimental/tree';
53+
import {MatTreeModule} from '@angular/material-experimental/tree';
5454

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

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/button': 'dist/packages/material/button/index.js',
@@ -91,7 +92,8 @@ System.config({
9192
'@angular/material/tabs': 'dist/packages/material/tabs/index.js',
9293
'@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
9394
'@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
94-
'@angular/material/tree': 'dist/packages/material/tree/index.js',
95+
96+
'@angular/material-experimental/tree': 'dist/packages/material-experimental/tree/index.js',
9597
},
9698
packages: {
9799
// 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
@@ -28,7 +28,6 @@
2828
@import '../../tabs/tabs-theme';
2929
@import '../../toolbar/toolbar-theme';
3030
@import '../../tooltip/tooltip-theme';
31-
@import '../../tree/tree-theme';
3231
@import '../../snack-bar/snack-bar-theme';
3332
@import '../../form-field/form-field-theme';
3433

@@ -65,6 +64,5 @@
6564
@include mat-tabs-theme($theme);
6665
@include mat-toolbar-theme($theme);
6766
@include mat-tooltip-theme($theme);
68-
@include mat-tree-theme($theme);
6967
@include mat-snack-bar-theme($theme);
7068
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
@import '../../tabs/tabs-theme';
2727
@import '../../toolbar/toolbar-theme';
2828
@import '../../tooltip/tooltip-theme';
29-
@import '../../tree/tree-theme';
3029
@import '../../snack-bar/snack-bar-theme';
3130
@import '../option/option-theme';
3231
@import '../option/optgroup-theme';
@@ -67,7 +66,6 @@
6766
@include mat-tabs-typography($config);
6867
@include mat-toolbar-typography($config);
6968
@include mat-tooltip-typography($config);
70-
@include mat-tree-typography($config);
7169
@include mat-list-typography($config);
7270
@include mat-option-typography($config);
7371
@include mat-optgroup-typography($config);

src/lib/public-api.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,3 @@ export * from '@angular/material/table';
3939
export * from '@angular/material/tabs';
4040
export * from '@angular/material/toolbar';
4141
export * from '@angular/material/tooltip';
42-
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.

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/button': 'dist/packages/material/button/index.js',
@@ -103,7 +104,8 @@ System.config({
103104
'@angular/material/tabs': 'dist/packages/material/tabs/index.js',
104105
'@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
105106
'@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
106-
'@angular/material/tree': 'dist/packages/material/tree/index.js',
107+
108+
'@angular/material-experimental/tree': 'dist/packages/material-experimental/tree/index.js',
107109
},
108110
packages: {
109111
// Thirdparty barrels.

0 commit comments

Comments
 (0)