Skip to content

refactor(material/datepicker): consistently import MatCommonModule everywhere #19861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

import {NgModule} from '@angular/core';
import {MatCommonModule} from '@angular/material/core';
import {OverlayModule} from '@angular/cdk/overlay';

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

const IMPORTS = [
MatCommonModule,
OverlayModule,
MatColumnResizeCommonModule,
];
Expand Down
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-list/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
MatLineModule,
MatPseudoCheckboxModule,
MatRippleModule,
MatCommonModule,
} from '@angular/material-experimental/mdc-core';
import {MatDividerModule} from '@angular/material/divider';
import {MatActionList} from './action-list';
Expand All @@ -29,6 +30,7 @@ import {MatListOption} from './list-option';
@NgModule({
imports: [
CommonModule,
MatCommonModule,
MatLineModule,
MatRippleModule,
MatPseudoCheckboxModule,
Expand Down
1 change: 1 addition & 0 deletions src/material-experimental/popover-edit/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ng_module(
module_name = "@angular/material-experimental/popover-edit",
deps = [
"//src/cdk-experimental/popover-edit",
"//src/material/core",
"@npm//@angular/core",
"@npm//@angular/forms",
],
Expand Down
2 changes: 2 additions & 0 deletions src/material-experimental/popover-edit/popover-edit-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

import {NgModule} from '@angular/core';
import {MatCommonModule} from '@angular/material/core';
import {CdkEditable, CdkPopoverEditModule} from '@angular/cdk-experimental/popover-edit';
import {
MatPopoverEdit,
Expand All @@ -33,6 +34,7 @@ const EXPORTED_DECLARATIONS = [
@NgModule({
imports: [
CdkPopoverEditModule,
MatCommonModule,
],
exports: [
...EXPORTED_DECLARATIONS,
Expand Down
3 changes: 2 additions & 1 deletion src/material/chips/chips-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

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

@NgModule({
imports: [MatCommonModule],
exports: CHIP_DECLARATIONS,
declarations: CHIP_DECLARATIONS,
providers: [
Expand Down
3 changes: 2 additions & 1 deletion src/material/core/option/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {MatRippleModule} from '../ripple/index';
import {MatPseudoCheckboxModule} from '../selection/index';
import {MatCommonModule} from '../common-behaviors/common-module';
import {MatOption} from './option';
import {MatOptgroup} from './optgroup';


@NgModule({
imports: [MatRippleModule, CommonModule, MatPseudoCheckboxModule],
imports: [MatRippleModule, CommonModule, MatCommonModule, MatPseudoCheckboxModule],
exports: [MatOption, MatOptgroup],
declarations: [MatOption, MatOptgroup]
})
Expand Down
2 changes: 2 additions & 0 deletions src/material/core/selection/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@

import {NgModule} from '@angular/core';
import {MatPseudoCheckbox} from './pseudo-checkbox/pseudo-checkbox';
import {MatCommonModule} from '../common-behaviors/common-module';


@NgModule({
imports: [MatCommonModule],
exports: [MatPseudoCheckbox],
declarations: [MatPseudoCheckbox]
})
Expand Down
2 changes: 2 additions & 0 deletions src/material/datepicker/datepicker-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {NgModule} from '@angular/core';
import {MatButtonModule} from '@angular/material/button';
import {MatDialogModule} from '@angular/material/dialog';
import {CdkScrollableModule} from '@angular/cdk/scrolling';
import {MatCommonModule} from '@angular/material/core';
import {MatCalendar, MatCalendarHeader} from './calendar';
import {MatCalendarBody} from './calendar-body';
import {MatDatepicker} from './datepicker';
Expand All @@ -40,6 +41,7 @@ import {MatDateRangePicker} from './date-range-picker';
OverlayModule,
A11yModule,
PortalModule,
MatCommonModule,
],
exports: [
CdkScrollableModule,
Expand Down
1 change: 1 addition & 0 deletions src/material/expansion/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ ng_module(
"//src/cdk/collections",
"//src/cdk/keycodes",
"//src/cdk/portal",
"//src/material/core",
"@npm//@angular/animations",
"@npm//@angular/common",
"@npm//@angular/core",
Expand Down
3 changes: 2 additions & 1 deletion src/material/expansion/expansion-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {CdkAccordionModule} from '@angular/cdk/accordion';
import {PortalModule} from '@angular/cdk/portal';
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {MatCommonModule} from '@angular/material/core';
import {MatAccordion} from './accordion';
import {MatExpansionPanel, MatExpansionPanelActionRow} from './expansion-panel';
import {MatExpansionPanelContent} from './expansion-panel-content';
Expand All @@ -21,7 +22,7 @@ import {


@NgModule({
imports: [CommonModule, CdkAccordionModule, PortalModule],
imports: [CommonModule, MatCommonModule, CdkAccordionModule, PortalModule],
exports: [
MatAccordion,
MatExpansionPanel,
Expand Down
3 changes: 2 additions & 1 deletion src/material/input/input-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import {TextFieldModule} from '@angular/cdk/text-field';
import {NgModule} from '@angular/core';
import {ErrorStateMatcher} from '@angular/material/core';
import {ErrorStateMatcher, MatCommonModule} from '@angular/material/core';
import {MatFormFieldModule} from '@angular/material/form-field';
import {MatTextareaAutosize} from './autosize';
import {MatInput} from './input';
Expand All @@ -18,6 +18,7 @@ import {MatInput} from './input';
imports: [
TextFieldModule,
MatFormFieldModule,
MatCommonModule,
],
exports: [
TextFieldModule,
Expand Down
2 changes: 2 additions & 0 deletions src/material/paginator/paginator-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {MatCommonModule} from '@angular/material/core';
import {MatButtonModule} from '@angular/material/button';
import {MatSelectModule} from '@angular/material/select';
import {MatTooltipModule} from '@angular/material/tooltip';
Expand All @@ -21,6 +22,7 @@ import {MAT_PAGINATOR_INTL_PROVIDER} from './paginator-intl';
MatButtonModule,
MatSelectModule,
MatTooltipModule,
MatCommonModule,
],
exports: [MatPaginator],
declarations: [MatPaginator],
Expand Down
3 changes: 2 additions & 1 deletion src/material/sort/sort-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ import {MatSortHeader} from './sort-header';
import {MatSort} from './sort';
import {MAT_SORT_HEADER_INTL_PROVIDER} from './sort-header-intl';
import {CommonModule} from '@angular/common';
import {MatCommonModule} from '@angular/material/core';


@NgModule({
imports: [CommonModule],
imports: [CommonModule, MatCommonModule],
exports: [MatSort, MatSortHeader],
declarations: [MatSort, MatSortHeader],
providers: [MAT_SORT_HEADER_INTL_PROVIDER]
Expand Down
2 changes: 1 addition & 1 deletion tools/public_api_guard/material/chips.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ export declare class MatChipSelectionChange {

export declare class MatChipsModule {
static ɵinj: i0.ɵɵInjectorDef<MatChipsModule>;
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]>;
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]>;
}

export declare class MatChipTrailingIcon {
Expand Down
4 changes: 2 additions & 2 deletions tools/public_api_guard/material/core.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export declare class MatOption extends _MatOptionBase {

export declare class MatOptionModule {
static ɵinj: i0.ɵɵInjectorDef<MatOptionModule>;
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]>;
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]>;
}

export interface MatOptionParentComponent {
Expand All @@ -238,7 +238,7 @@ export declare class MatPseudoCheckbox {

export declare class MatPseudoCheckboxModule {
static ɵinj: i0.ɵɵInjectorDef<MatPseudoCheckboxModule>;
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatPseudoCheckboxModule, [typeof i1.MatPseudoCheckbox], never, [typeof i1.MatPseudoCheckbox]>;
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatPseudoCheckboxModule, [typeof i1.MatPseudoCheckbox], [typeof i2.MatCommonModule], [typeof i1.MatPseudoCheckbox]>;
}

export declare type MatPseudoCheckboxState = 'unchecked' | 'checked' | 'indeterminate';
Expand Down
2 changes: 1 addition & 1 deletion tools/public_api_guard/material/datepicker.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export declare class MatDatepickerIntl {

export declare class MatDatepickerModule {
static ɵinj: i0.ɵɵInjectorDef<MatDatepickerModule>;
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]>;
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]>;
}

export declare class MatDatepickerToggle<D> implements AfterContentInit, OnChanges, OnDestroy {
Expand Down
2 changes: 1 addition & 1 deletion tools/public_api_guard/material/expansion.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export declare const matExpansionAnimations: {

export declare class MatExpansionModule {
static ɵinj: i0.ɵɵInjectorDef<MatExpansionModule>;
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]>;
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]>;
}

export declare class MatExpansionPanel extends CdkAccordionItem implements AfterContentInit, OnChanges, OnDestroy {
Expand Down
2 changes: 1 addition & 1 deletion tools/public_api_guard/material/input.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export declare class MatInput extends _MatInputMixinBase implements MatFormField

export declare class MatInputModule {
static ɵinj: i0.ɵɵInjectorDef<MatInputModule>;
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]>;
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]>;
}

export declare class MatTextareaAutosize extends CdkTextareaAutosize {
Expand Down
2 changes: 1 addition & 1 deletion tools/public_api_guard/material/paginator.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export declare class MatPaginatorIntl {

export declare class MatPaginatorModule {
static ɵinj: i0.ɵɵInjectorDef<MatPaginatorModule>;
static ɵmod: i0.ɵɵNgModuleDefWithMeta<MatPaginatorModule, [typeof i1.MatPaginator], [typeof i2.CommonModule, typeof i3.MatButtonModule, typeof i4.MatSelectModule, typeof i5.MatTooltipModule], [typeof i1.MatPaginator]>;
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]>;
}

export declare class PageEvent {
Expand Down
2 changes: 1 addition & 1 deletion tools/public_api_guard/material/sort.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export declare class MatSortHeaderIntl {

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

export interface Sort {
Expand Down