Skip to content

Commit 00289ea

Browse files
committed
refactor: consistently import MatCommonModule everywhere
The `MatCommonModule` is inteded to be imported in all Material modules since it includes some sanity checks and RTL handling, however we weren't importing it consistently. These changes add it to all the places where it was missing.
1 parent db4b0cd commit 00289ea

File tree

20 files changed

+37
-14
lines changed

20 files changed

+37
-14
lines changed

src/material-experimental/column-resize/column-resize-module.ts

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

99
import {NgModule} from '@angular/core';
10+
import {MatCommonModule} from '@angular/material/core';
1011
import {OverlayModule} from '@angular/cdk/overlay';
1112

1213
import {MatColumnResize} from './column-resize-directives/column-resize';
@@ -33,6 +34,7 @@ const ENTRY_COMMON_COMPONENTS = [
3334
export class MatColumnResizeCommonModule {}
3435

3536
const IMPORTS = [
37+
MatCommonModule,
3638
OverlayModule,
3739
MatColumnResizeCommonModule,
3840
];

src/material-experimental/mdc-list/module.ts

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

99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
11-
import {MatLineModule, MatPseudoCheckboxModule, MatRippleModule} from '@angular/material/core';
11+
import {
12+
MatLineModule,
13+
MatPseudoCheckboxModule,
14+
MatRippleModule,
15+
MatCommonModule,
16+
} from '@angular/material/core';
1217
import {MatDividerModule} from '@angular/material/divider';
1318
import {MatActionList} from './action-list';
1419
import {
@@ -24,6 +29,7 @@ import {MatListOption, MatSelectionList} from './selection-list';
2429
@NgModule({
2530
imports: [
2631
CommonModule,
32+
MatCommonModule,
2733
MatLineModule,
2834
MatRippleModule,
2935
MatPseudoCheckboxModule,

src/material-experimental/popover-edit/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ng_module(
1717
module_name = "@angular/material-experimental/popover-edit",
1818
deps = [
1919
"//src/cdk-experimental/popover-edit",
20+
"//src/material/core",
2021
"@npm//@angular/core",
2122
"@npm//@angular/forms",
2223
],

src/material-experimental/popover-edit/popover-edit-module.ts

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

99
import {NgModule} from '@angular/core';
10+
import {MatCommonModule} from '@angular/material/core';
1011
import {CdkEditable, CdkPopoverEditModule} from '@angular/cdk-experimental/popover-edit';
1112
import {
1213
MatPopoverEdit,
@@ -33,6 +34,7 @@ const EXPORTED_DECLARATIONS = [
3334
@NgModule({
3435
imports: [
3536
CdkPopoverEditModule,
37+
MatCommonModule,
3638
],
3739
exports: [
3840
...EXPORTED_DECLARATIONS,

src/material/chips/chips-module.ts

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

99
import {ENTER} from '@angular/cdk/keycodes';
1010
import {NgModule} from '@angular/core';
11-
import {ErrorStateMatcher} from '@angular/material/core';
11+
import {ErrorStateMatcher, MatCommonModule} from '@angular/material/core';
1212
import {MatChip, MatChipAvatar, MatChipRemove, MatChipTrailingIcon} from './chip';
1313
import {MAT_CHIPS_DEFAULT_OPTIONS, MatChipsDefaultOptions} from './chip-default-options';
1414
import {MatChipInput} from './chip-input';
@@ -24,6 +24,7 @@ const CHIP_DECLARATIONS = [
2424
];
2525

2626
@NgModule({
27+
imports: [MatCommonModule],
2728
exports: CHIP_DECLARATIONS,
2829
declarations: CHIP_DECLARATIONS,
2930
providers: [

src/material/core/option/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ import {NgModule} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
1111
import {MatRippleModule} from '../ripple/index';
1212
import {MatPseudoCheckboxModule} from '../selection/index';
13+
import {MatCommonModule} from '../common-behaviors';
1314
import {MatOption} from './option';
1415
import {MatOptgroup} from './optgroup';
1516

1617

1718
@NgModule({
18-
imports: [MatRippleModule, CommonModule, MatPseudoCheckboxModule],
19+
imports: [MatRippleModule, CommonModule, MatCommonModule, MatPseudoCheckboxModule],
1920
exports: [MatOption, MatOptgroup],
2021
declarations: [MatOption, MatOptgroup]
2122
})

src/material/core/selection/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88

99
import {NgModule} from '@angular/core';
1010
import {MatPseudoCheckbox} from './pseudo-checkbox/pseudo-checkbox';
11+
import {MatCommonModule} from '../common-behaviors';
1112

1213

1314
@NgModule({
15+
imports: [MatCommonModule],
1416
exports: [MatPseudoCheckbox],
1517
declarations: [MatPseudoCheckbox]
1618
})

src/material/datepicker/datepicker-module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {NgModule} from '@angular/core';
1414
import {MatButtonModule} from '@angular/material/button';
1515
import {MatDialogModule} from '@angular/material/dialog';
1616
import {CdkScrollableModule} from '@angular/cdk/scrolling';
17+
import {MatCommonModule} from '@angular/material/core';
1718
import {MatCalendar, MatCalendarHeader} from './calendar';
1819
import {MatCalendarBody} from './calendar-body';
1920
import {MatDatepicker} from './datepicker';
@@ -44,6 +45,7 @@ import {
4445
OverlayModule,
4546
A11yModule,
4647
PortalModule,
48+
MatCommonModule,
4749
],
4850
exports: [
4951
CdkScrollableModule,

src/material/expansion/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ ng_module(
3030
"//src/cdk/collections",
3131
"//src/cdk/keycodes",
3232
"//src/cdk/portal",
33+
"//src/material/core",
3334
"@npm//@angular/animations",
3435
"@npm//@angular/common",
3536
"@npm//@angular/core",

src/material/expansion/expansion-module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {CdkAccordionModule} from '@angular/cdk/accordion';
1010
import {PortalModule} from '@angular/cdk/portal';
1111
import {CommonModule} from '@angular/common';
1212
import {NgModule} from '@angular/core';
13+
import {MatCommonModule} from '@angular/material/core';
1314
import {MatAccordion} from './accordion';
1415
import {MatExpansionPanel, MatExpansionPanelActionRow} from './expansion-panel';
1516
import {MatExpansionPanelContent} from './expansion-panel-content';
@@ -21,7 +22,7 @@ import {
2122

2223

2324
@NgModule({
24-
imports: [CommonModule, CdkAccordionModule, PortalModule],
25+
imports: [CommonModule, MatCommonModule, CdkAccordionModule, PortalModule],
2526
exports: [
2627
MatAccordion,
2728
MatExpansionPanel,

src/material/input/input-module.ts

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

99
import {TextFieldModule} from '@angular/cdk/text-field';
1010
import {NgModule} from '@angular/core';
11-
import {ErrorStateMatcher} from '@angular/material/core';
11+
import {ErrorStateMatcher, MatCommonModule} from '@angular/material/core';
1212
import {MatFormFieldModule} from '@angular/material/form-field';
1313
import {MatTextareaAutosize} from './autosize';
1414
import {MatInput} from './input';
@@ -18,6 +18,7 @@ import {MatInput} from './input';
1818
imports: [
1919
TextFieldModule,
2020
MatFormFieldModule,
21+
MatCommonModule,
2122
],
2223
exports: [
2324
TextFieldModule,

src/material/paginator/paginator-module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
11+
import {MatCommonModule} from '@angular/material/core';
1112
import {MatButtonModule} from '@angular/material/button';
1213
import {MatSelectModule} from '@angular/material/select';
1314
import {MatTooltipModule} from '@angular/material/tooltip';
@@ -21,6 +22,7 @@ import {MAT_PAGINATOR_INTL_PROVIDER} from './paginator-intl';
2122
MatButtonModule,
2223
MatSelectModule,
2324
MatTooltipModule,
25+
MatCommonModule,
2426
],
2527
exports: [MatPaginator],
2628
declarations: [MatPaginator],

src/material/sort/sort-module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import {MatSortHeader} from './sort-header';
1111
import {MatSort} from './sort';
1212
import {MAT_SORT_HEADER_INTL_PROVIDER} from './sort-header-intl';
1313
import {CommonModule} from '@angular/common';
14+
import {MatCommonModule} from '@angular/material/core';
1415

1516

1617
@NgModule({
17-
imports: [CommonModule],
18+
imports: [CommonModule, MatCommonModule],
1819
exports: [MatSort, MatSortHeader],
1920
declarations: [MatSort, MatSortHeader],
2021
providers: [MAT_SORT_HEADER_INTL_PROVIDER]

tools/public_api_guard/material/chips.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ export declare class MatChipSelectionChange {
214214

215215
export declare class MatChipsModule {
216216
static ɵinj: i0.ɵɵInjectorDef<MatChipsModule>;
217-
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatChipsModule, [typeof i1.MatChipList, typeof i2.MatChip, typeof i3.MatChipInput, typeof i2.MatChipRemove, typeof i2.MatChipAvatar, typeof i2.MatChipTrailingIcon], never, [typeof i1.MatChipList, typeof i2.MatChip, typeof i3.MatChipInput, typeof i2.MatChipRemove, typeof i2.MatChipAvatar, typeof i2.MatChipTrailingIcon]>;
217+
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatChipsModule, [typeof i1.MatChipList, typeof i2.MatChip, typeof i3.MatChipInput, typeof i2.MatChipRemove, typeof i2.MatChipAvatar, typeof i2.MatChipTrailingIcon], [typeof i4.MatCommonModule], [typeof i1.MatChipList, typeof i2.MatChip, typeof i3.MatChipInput, typeof i2.MatChipRemove, typeof i2.MatChipAvatar, typeof i2.MatChipTrailingIcon]>;
218218
}
219219

220220
export declare class MatChipTrailingIcon {

tools/public_api_guard/material/core.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ export declare class MatOption implements FocusableOption, AfterViewChecked, OnD
232232

233233
export declare class MatOptionModule {
234234
static ɵinj: i0.ɵɵInjectorDef<MatOptionModule>;
235-
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatOptionModule, [typeof i1.MatOption, typeof i2.MatOptgroup], [typeof i3.MatRippleModule, typeof i4.CommonModule, typeof i5.MatPseudoCheckboxModule], [typeof i1.MatOption, typeof i2.MatOptgroup]>;
235+
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatOptionModule, [typeof i1.MatOption, typeof i2.MatOptgroup], [typeof i3.MatRippleModule, typeof i4.CommonModule, typeof i5.MatCommonModule, typeof i6.MatPseudoCheckboxModule], [typeof i1.MatOption, typeof i2.MatOptgroup]>;
236236
}
237237

238238
export interface MatOptionParentComponent {
@@ -259,7 +259,7 @@ export declare class MatPseudoCheckbox {
259259

260260
export declare class MatPseudoCheckboxModule {
261261
static ɵinj: i0.ɵɵInjectorDef<MatPseudoCheckboxModule>;
262-
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatPseudoCheckboxModule, [typeof i1.MatPseudoCheckbox], never, [typeof i1.MatPseudoCheckbox]>;
262+
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatPseudoCheckboxModule, [typeof i1.MatPseudoCheckbox], [typeof i2.MatCommonModule], [typeof i1.MatPseudoCheckbox]>;
263263
}
264264

265265
export declare type MatPseudoCheckboxState = 'unchecked' | 'checked' | 'indeterminate';

tools/public_api_guard/material/datepicker.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ export declare class MatDatepickerIntl {
258258

259259
export declare class MatDatepickerModule {
260260
static ɵinj: i0.ɵɵInjectorDef<MatDatepickerModule>;
261-
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatDatepickerModule, [typeof i1.MatCalendar, typeof i2.MatCalendarBody, typeof i3.MatDatepicker, typeof i4.MatDatepickerContent, typeof i5.MatDatepickerInput, typeof i6.MatDatepickerToggle, typeof i6.MatDatepickerToggleIcon, typeof i7.MatMonthView, typeof i8.MatYearView, typeof i9.MatMultiYearView, typeof i1.MatCalendarHeader, typeof i10.MatDateRangeInput, typeof i11.MatStartDate, typeof i11.MatEndDate, typeof i12.MatDateRangePicker], [typeof i13.CommonModule, typeof i14.MatButtonModule, typeof i15.MatDialogModule, typeof i16.OverlayModule, typeof i17.A11yModule, typeof i18.PortalModule], [typeof i19.CdkScrollableModule, typeof i1.MatCalendar, typeof i2.MatCalendarBody, typeof i3.MatDatepicker, typeof i4.MatDatepickerContent, typeof i5.MatDatepickerInput, typeof i6.MatDatepickerToggle, typeof i6.MatDatepickerToggleIcon, typeof i7.MatMonthView, typeof i8.MatYearView, typeof i9.MatMultiYearView, typeof i1.MatCalendarHeader, typeof i10.MatDateRangeInput, typeof i11.MatStartDate, typeof i11.MatEndDate, typeof i12.MatDateRangePicker]>;
261+
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatDatepickerModule, [typeof i1.MatCalendar, typeof i2.MatCalendarBody, typeof i3.MatDatepicker, typeof i4.MatDatepickerContent, typeof i5.MatDatepickerInput, typeof i6.MatDatepickerToggle, typeof i6.MatDatepickerToggleIcon, typeof i7.MatMonthView, typeof i8.MatYearView, typeof i9.MatMultiYearView, typeof i1.MatCalendarHeader, typeof i10.MatDateRangeInput, typeof i11.MatStartDate, typeof i11.MatEndDate, typeof i12.MatDateRangePicker], [typeof i13.CommonModule, typeof i14.MatButtonModule, typeof i15.MatDialogModule, typeof i16.OverlayModule, typeof i17.A11yModule, typeof i18.PortalModule, typeof i19.MatCommonModule], [typeof i20.CdkScrollableModule, typeof i1.MatCalendar, typeof i2.MatCalendarBody, typeof i3.MatDatepicker, typeof i4.MatDatepickerContent, typeof i5.MatDatepickerInput, typeof i6.MatDatepickerToggle, typeof i6.MatDatepickerToggleIcon, typeof i7.MatMonthView, typeof i8.MatYearView, typeof i9.MatMultiYearView, typeof i1.MatCalendarHeader, typeof i10.MatDateRangeInput, typeof i11.MatStartDate, typeof i11.MatEndDate, typeof i12.MatDateRangePicker]>;
262262
}
263263

264264
export declare class MatDatepickerToggle<D> implements AfterContentInit, OnChanges, OnDestroy {

tools/public_api_guard/material/expansion.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export declare const matExpansionAnimations: {
3737

3838
export declare class MatExpansionModule {
3939
static ɵinj: i0.ɵɵInjectorDef<MatExpansionModule>;
40-
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatExpansionModule, [typeof i1.MatAccordion, typeof i2.MatExpansionPanel, typeof i2.MatExpansionPanelActionRow, typeof i3.MatExpansionPanelHeader, typeof i3.MatExpansionPanelTitle, typeof i3.MatExpansionPanelDescription, typeof i4.MatExpansionPanelContent], [typeof i5.CommonModule, typeof i6.CdkAccordionModule, typeof i7.PortalModule], [typeof i1.MatAccordion, typeof i2.MatExpansionPanel, typeof i2.MatExpansionPanelActionRow, typeof i3.MatExpansionPanelHeader, typeof i3.MatExpansionPanelTitle, typeof i3.MatExpansionPanelDescription, typeof i4.MatExpansionPanelContent]>;
40+
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatExpansionModule, [typeof i1.MatAccordion, typeof i2.MatExpansionPanel, typeof i2.MatExpansionPanelActionRow, typeof i3.MatExpansionPanelHeader, typeof i3.MatExpansionPanelTitle, typeof i3.MatExpansionPanelDescription, typeof i4.MatExpansionPanelContent], [typeof i5.CommonModule, typeof i6.MatCommonModule, typeof i7.CdkAccordionModule, typeof i8.PortalModule], [typeof i1.MatAccordion, typeof i2.MatExpansionPanel, typeof i2.MatExpansionPanelActionRow, typeof i3.MatExpansionPanelHeader, typeof i3.MatExpansionPanelTitle, typeof i3.MatExpansionPanelDescription, typeof i4.MatExpansionPanelContent]>;
4141
}
4242

4343
export declare class MatExpansionPanel extends CdkAccordionItem implements AfterContentInit, OnChanges, OnDestroy {

tools/public_api_guard/material/input.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export declare class MatInput extends _MatInputMixinBase implements MatFormField
6464

6565
export declare class MatInputModule {
6666
static ɵinj: i0.ɵɵInjectorDef<MatInputModule>;
67-
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatInputModule, [typeof i1.MatInput, typeof i2.MatTextareaAutosize], [typeof i3.TextFieldModule, typeof i4.MatFormFieldModule], [typeof i3.TextFieldModule, typeof i4.MatFormFieldModule, typeof i1.MatInput, typeof i2.MatTextareaAutosize]>;
67+
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatInputModule, [typeof i1.MatInput, typeof i2.MatTextareaAutosize], [typeof i3.TextFieldModule, typeof i4.MatFormFieldModule, typeof i5.MatCommonModule], [typeof i3.TextFieldModule, typeof i4.MatFormFieldModule, typeof i1.MatInput, typeof i2.MatTextareaAutosize]>;
6868
}
6969

7070
export declare class MatTextareaAutosize extends CdkTextareaAutosize {

tools/public_api_guard/material/paginator.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export declare class MatPaginatorIntl {
6969

7070
export declare class MatPaginatorModule {
7171
static ɵinj: i0.ɵɵInjectorDef<MatPaginatorModule>;
72-
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatPaginatorModule, [typeof i1.MatPaginator], [typeof i2.CommonModule, typeof i3.MatButtonModule, typeof i4.MatSelectModule, typeof i5.MatTooltipModule], [typeof i1.MatPaginator]>;
72+
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatPaginatorModule, [typeof i1.MatPaginator], [typeof i2.CommonModule, typeof i3.MatButtonModule, typeof i4.MatSelectModule, typeof i5.MatTooltipModule, typeof i6.MatCommonModule], [typeof i1.MatPaginator]>;
7373
}
7474

7575
export declare class PageEvent {

tools/public_api_guard/material/sort.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export declare class MatSortHeaderIntl {
9393

9494
export declare class MatSortModule {
9595
static ɵinj: i0.ɵɵInjectorDef<MatSortModule>;
96-
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatSortModule, [typeof i1.MatSort, typeof i2.MatSortHeader], [typeof i3.CommonModule], [typeof i1.MatSort, typeof i2.MatSortHeader]>;
96+
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatSortModule, [typeof i1.MatSort, typeof i2.MatSortHeader], [typeof i3.CommonModule, typeof i4.MatCommonModule], [typeof i1.MatSort, typeof i2.MatSortHeader]>;
9797
}
9898

9999
export interface Sort {

0 commit comments

Comments
 (0)