Skip to content

Commit 8abc651

Browse files
crisbetoannieyw
authored andcommitted
refactor(material/datepicker): consistently import MatCommonModule everywhere (#19861)
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. (cherry picked from commit 909c1e0)
1 parent 03b054f commit 8abc651

File tree

20 files changed

+32
-13
lines changed

20 files changed

+32
-13
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
MatLineModule,
1313
MatPseudoCheckboxModule,
1414
MatRippleModule,
15+
MatCommonModule,
1516
} from '@angular/material-experimental/mdc-core';
1617
import {MatDividerModule} from '@angular/material/divider';
1718
import {MatActionList} from './action-list';
@@ -31,6 +32,7 @@ import {
3132
@NgModule({
3233
imports: [
3334
CommonModule,
35+
MatCommonModule,
3436
MatLineModule,
3537
MatRippleModule,
3638
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/common-module';
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/common-module';
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';
@@ -40,6 +41,7 @@ import {MatDateRangePicker} from './date-range-picker';
4041
OverlayModule,
4142
A11yModule,
4243
PortalModule,
44+
MatCommonModule,
4345
],
4446
exports: [
4547
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,

0 commit comments

Comments
 (0)