Skip to content

Commit dde12c2

Browse files
crisbetojelbourn
crisbeto
authored and
jelbourn
committed
chore: clean up top-level package imports (#16514)
Cleans up all the remaining imports from the top-level `@angular/material` package.
1 parent dcde115 commit dde12c2

File tree

11 files changed

+78
-81
lines changed

11 files changed

+78
-81
lines changed

‎guides/getting-started.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ yarn add angular/material2-builds angular/cdk-builds angular/animations-builds
3333
```
3434
#### Alternative 2: Angular Devkit 6+
3535

36-
Using the Angular CLI `ng add` command will update your Angular project with the correct dependencies, perform configuration changes and execute initialization code.
36+
Using the Angular CLI `ng add` command will update your Angular project with the correct dependencies, perform configuration changes and execute initialization code.
3737

3838
```bash
3939
ng add @angular/material
@@ -72,7 +72,8 @@ export class PizzaPartyAppModule { }
7272
Import the NgModule for each component you want to use:
7373

7474
```ts
75-
import {MatButtonModule, MatCheckboxModule} from '@angular/material';
75+
import {MatButtonModule} from '@angular/material/button';
76+
import {MatCheckboxModule} from '@angular/material/checkbox';
7677

7778
@NgModule({
7879
...
@@ -85,7 +86,8 @@ export class PizzaPartyAppModule { }
8586
Alternatively, you can create a separate NgModule that imports and then re-exports all of the Angular Material components that you will use in your application. By exporting them again, other modules can simply include your `CustomMaterialModule` wherever Material components are needed, and automatically get all of the exported Material modules. A good place for importing/exporting the application-wide Material modules is the [SharedModule](https://angular.io/guide/ngmodule-faq#sharedmodule).
8687

8788
```ts
88-
import {MatButtonModule, MatCheckboxModule} from '@angular/material';
89+
import {MatButtonModule} from '@angular/material/button';
90+
import {MatCheckboxModule} from '@angular/material/checkbox';
8991

9092
@NgModule({
9193
imports: [MatButtonModule, MatCheckboxModule],

‎src/a11y-demo/a11y-material-module.ts

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,34 @@
88

99
import {CdkTableModule} from '@angular/cdk/table';
1010
import {NgModule} from '@angular/core';
11-
import {
12-
MatAutocompleteModule,
13-
MatButtonModule,
14-
MatButtonToggleModule,
15-
MatCardModule,
16-
MatCheckboxModule,
17-
MatChipsModule,
18-
MatDatepickerModule,
19-
MatDialogModule,
20-
MatExpansionModule,
21-
MatGridListModule,
22-
MatIconModule,
23-
MatInputModule,
24-
MatListModule,
25-
MatMenuModule,
26-
MatPaginatorModule,
27-
MatProgressBarModule,
28-
MatProgressSpinnerModule,
29-
MatRadioModule,
30-
MatSelectModule,
31-
MatSidenavModule,
32-
MatSliderModule,
33-
MatSlideToggleModule,
34-
MatSnackBarModule,
35-
MatTableModule,
36-
MatTabsModule,
37-
MatToolbarModule,
38-
MatTooltipModule,
39-
} from '@angular/material';
11+
import {MatAutocompleteModule} from '@angular/material/autocomplete';
12+
import {MatButtonModule} from '@angular/material/button';
13+
import {MatButtonToggleModule} from '@angular/material/button-toggle';
14+
import {MatCardModule} from '@angular/material/card';
15+
import {MatCheckboxModule} from '@angular/material/checkbox';
16+
import {MatChipsModule} from '@angular/material/chips';
17+
import {MatTableModule} from '@angular/material/table';
18+
import {MatDatepickerModule} from '@angular/material/datepicker';
19+
import {MatDialogModule} from '@angular/material/dialog';
20+
import {MatExpansionModule} from '@angular/material/expansion';
21+
import {MatGridListModule} from '@angular/material/grid-list';
22+
import {MatIconModule} from '@angular/material/icon';
23+
import {MatInputModule} from '@angular/material/input';
24+
import {MatListModule} from '@angular/material/list';
25+
import {MatMenuModule} from '@angular/material/menu';
26+
import {MatPaginatorModule} from '@angular/material/paginator';
27+
import {MatProgressBarModule} from '@angular/material/progress-bar';
28+
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
29+
import {MatRadioModule} from '@angular/material/radio';
30+
import {MatSelectModule} from '@angular/material/select';
31+
import {MatSidenavModule} from '@angular/material/sidenav';
32+
import {MatSliderModule} from '@angular/material/slider';
33+
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
34+
import {MatSnackBarModule} from '@angular/material/snack-bar';
35+
import {MatTabsModule} from '@angular/material/tabs';
36+
import {MatToolbarModule} from '@angular/material/toolbar';
37+
import {MatTooltipModule} from '@angular/material/tooltip';
38+
4039

4140
/**
4241
* NgModule that includes all Material modules that are required to serve the dev-app.

‎src/a11y-demo/button/button-a11y.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 {MatSnackBar} from '@angular/material';
10+
import {MatSnackBar} from '@angular/material/snack-bar';
1111

1212

1313
@Component({

‎src/a11y-demo/card/card-a11y.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 {MatSnackBar} from '@angular/material';
10+
import {MatSnackBar} from '@angular/material/snack-bar';
1111

1212

1313
@Component({

‎src/a11y-demo/chips/chips-a11y.ts

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

99
import {Component} from '@angular/core';
10-
import {MatChipInputEvent, MatSnackBar} from '@angular/material';
10+
import {MatChipInputEvent} from '@angular/material/chips';
11+
import {MatSnackBar} from '@angular/material/snack-bar';
1112

1213

1314
export interface Person {

‎src/a11y-demo/dialog/dialog-a11y.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 {MatDialog} from '@angular/material';
10+
import {MatDialog} from '@angular/material/dialog';
1111

1212

1313
@Component({

‎src/a11y-demo/icon/icon-a11y.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 {MatSnackBar} from '@angular/material';
10+
import {MatSnackBar} from '@angular/material/snack-bar';
1111

1212

1313
@Component({

‎src/a11y-demo/slide-toggle/slide-toggle-a11y.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 {MatSnackBar} from '@angular/material';
10+
import {MatSnackBar} from '@angular/material/snack-bar';
1111

1212

1313
@Component({

‎src/a11y-demo/snack-bar/snack-bar-a11y.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 {MatSnackBar} from '@angular/material';
10+
import {MatSnackBar} from '@angular/material/snack-bar';
1111

1212

1313
@Component({

‎src/a11y-demo/table/table-a11y.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {DataSource} from '@angular/cdk/table';
109
import {Component, OnInit, ViewChild} from '@angular/core';
11-
import {MatPaginator, MatSort} from '@angular/material';
10+
import {DataSource} from '@angular/cdk/table';
11+
import {MatSort} from '@angular/material/sort';
12+
import {MatPaginator} from '@angular/material/paginator';
1213
import {BehaviorSubject, merge, Observable} from 'rxjs';
1314
import {map} from 'rxjs/operators';
1415

‎src/universal-app/kitchen-sink/kitchen-sink.ts

Lines changed: 34 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,40 @@ import {DragDropModule} from '@angular/cdk/drag-drop';
33
import {ScrollingModule, ViewportRuler} from '@angular/cdk/scrolling';
44
import {CdkTableModule, DataSource} from '@angular/cdk/table';
55
import {Component, ElementRef, NgModule} from '@angular/core';
6-
import {
7-
MatAutocompleteModule,
8-
MatBadgeModule,
9-
MatBottomSheet,
10-
MatBottomSheetModule,
11-
MatButtonModule,
12-
MatButtonToggleModule,
13-
MatCardModule,
14-
MatCheckboxModule,
15-
MatChipsModule,
16-
MatDatepickerModule,
17-
MatDialog,
18-
MatDialogModule,
19-
MatDividerModule,
20-
MatExpansionModule,
21-
MatFormFieldModule,
22-
MatGridListModule,
23-
MatIconModule,
24-
MatInputModule,
25-
MatListModule,
26-
MatMenuModule,
27-
MatNativeDateModule,
28-
MatPaginatorModule,
29-
MatProgressBarModule,
30-
MatProgressSpinnerModule,
31-
MatRadioModule,
32-
MatRippleModule,
33-
MatSelectModule,
34-
MatSidenavModule,
35-
MatSliderModule,
36-
MatSlideToggleModule,
37-
MatSnackBar,
38-
MatSnackBarModule,
39-
MatSortModule,
40-
MatStepperModule,
41-
MatTableModule,
42-
MatTabsModule,
43-
MatToolbarModule,
44-
MatTooltipModule,
45-
} from '@angular/material';
6+
import {MatNativeDateModule, MatRippleModule} from '@angular/material/core';
7+
import {MatAutocompleteModule} from '@angular/material/autocomplete';
8+
import {MatButtonModule} from '@angular/material/button';
9+
import {MatButtonToggleModule} from '@angular/material/button-toggle';
10+
import {MatCardModule} from '@angular/material/card';
11+
import {MatCheckboxModule} from '@angular/material/checkbox';
12+
import {MatChipsModule} from '@angular/material/chips';
13+
import {MatTableModule} from '@angular/material/table';
14+
import {MatDatepickerModule} from '@angular/material/datepicker';
15+
import {MatDialogModule, MatDialog} from '@angular/material/dialog';
16+
import {MatExpansionModule} from '@angular/material/expansion';
17+
import {MatGridListModule} from '@angular/material/grid-list';
18+
import {MatIconModule} from '@angular/material/icon';
19+
import {MatInputModule} from '@angular/material/input';
20+
import {MatListModule} from '@angular/material/list';
21+
import {MatMenuModule} from '@angular/material/menu';
22+
import {MatPaginatorModule} from '@angular/material/paginator';
23+
import {MatProgressBarModule} from '@angular/material/progress-bar';
24+
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
25+
import {MatRadioModule} from '@angular/material/radio';
26+
import {MatSelectModule} from '@angular/material/select';
27+
import {MatSidenavModule} from '@angular/material/sidenav';
28+
import {MatSliderModule} from '@angular/material/slider';
29+
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
30+
import {MatSnackBarModule, MatSnackBar} from '@angular/material/snack-bar';
31+
import {MatTabsModule} from '@angular/material/tabs';
32+
import {MatToolbarModule} from '@angular/material/toolbar';
33+
import {MatTooltipModule} from '@angular/material/tooltip';
34+
import {MatBottomSheetModule, MatBottomSheet} from '@angular/material/bottom-sheet';
35+
import {MatBadgeModule} from '@angular/material/badge';
36+
import {MatDividerModule} from '@angular/material/divider';
37+
import {MatFormFieldModule} from '@angular/material/form-field';
38+
import {MatSortModule} from '@angular/material/sort';
39+
import {MatStepperModule} from '@angular/material/stepper';
4640
import {Observable, of as observableOf} from 'rxjs';
4741

4842
export class TableDataSource extends DataSource<any> {

0 commit comments

Comments
 (0)