Skip to content

refactor(datepicker): remove circular dependencies #19629

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.

Sign up for GitHub

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
Jun 30, 2020
Merged

refactor(datepicker): remove circular dependencies #19629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions goldens/ts-circular-deps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@
"src/cdk/testing/private/e2e/actions.ts",
"src/cdk/testing/private/e2e/query.ts"
],
[
"src/material/datepicker/date-range-input.ts",
"src/material/datepicker/date-range-picker.ts"
],
[
"src/material/datepicker/datepicker-input.ts",
"src/material/datepicker/datepicker.ts"
],
[
"src/material/grid-list/grid-list.ts",
"src/material/grid-list/tile-styler.ts"
Expand Down
5 changes: 3 additions & 2 deletions src/material/datepicker/date-range-input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
import {MatDatepickerControl} from './datepicker-base';
import {createMissingDateImplError} from './datepicker-errors';
import {DateFilterFn} from './datepicker-input-base';
import {MatDateRangePicker} from './date-range-picker';
import {MatDateRangePicker, MatDateRangePickerInput} from './date-range-picker';
import {DateRange, MatDateSelectionModel} from './date-selection-model';

let nextUniqueId = 0;
Expand All @@ -60,7 +60,8 @@ let nextUniqueId = 0;
]
})
export class MatDateRangeInput<D> implements MatFormFieldControl<DateRange<D>>,
MatDatepickerControl<D>, MatDateRangeInputParent<D>, AfterContentInit, OnDestroy {
MatDatepickerControl<D>, MatDateRangeInputParent<D>, MatDateRangePickerInput<D>,
AfterContentInit, OnDestroy {
/** Current value of the range input. */
get value() {
return this._model ? this._model.selection : null;
Expand Down
17 changes: 12 additions & 5 deletions src/material/datepicker/date-range-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,18 @@
*/

import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';
import {MatDatepickerBase, MatDatepickerContent} from './datepicker-base';
import {MatDateRangeInput} from './date-range-input';
import {MatDatepickerBase, MatDatepickerContent, MatDatepickerControl} from './datepicker-base';
import {MAT_RANGE_DATE_SELECTION_MODEL_PROVIDER, DateRange} from './date-selection-model';

/**
* Input that can be associated with a date range picker.
* @docs-private
*/
export interface MatDateRangePickerInput<D> extends MatDatepickerControl<D> {
comparisonStart: D|null;
comparisonEnd: D|null;
}

// TODO(mmalerba): We use a component instead of a directive here so the user can use implicit
// template reference variables (e.g. #d vs #d="matDateRangePicker"). We can change this to a
// directive if angular adds support for `exportAs: '$implicit'` on directives.
Expand All @@ -23,9 +31,8 @@ import {MAT_RANGE_DATE_SELECTION_MODEL_PROVIDER, DateRange} from './date-selecti
encapsulation: ViewEncapsulation.None,
providers: [MAT_RANGE_DATE_SELECTION_MODEL_PROVIDER]
})
export class MatDateRangePicker<D>
extends MatDatepickerBase<MatDateRangeInput<D>, DateRange<D>, D> {

export class MatDateRangePicker<D> extends MatDatepickerBase<MatDateRangePickerInput<D>,
DateRange<D>, D> {
protected _forwardContentValues(instance: MatDatepickerContent<DateRange<D>, D>) {
super._forwardContentValues(instance);

Expand Down
5 changes: 2 additions & 3 deletions src/material/datepicker/datepicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
*/

import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';
import {MatDatepickerBase} from './datepicker-base';
import {MatDatepickerInput} from './datepicker-input';
import {MatDatepickerBase, MatDatepickerControl} from './datepicker-base';
import {MAT_SINGLE_DATE_SELECTION_MODEL_PROVIDER} from './date-selection-model';

// TODO(mmalerba): We use a component instead of a directive here so the user can use implicit
Expand All @@ -23,5 +22,5 @@ import {MAT_SINGLE_DATE_SELECTION_MODEL_PROVIDER} from './date-selection-model';
encapsulation: ViewEncapsulation.None,
providers: [MAT_SINGLE_DATE_SELECTION_MODEL_PROVIDER]
})
export class MatDatepicker<D> extends MatDatepickerBase<MatDatepickerInput<D>, D | null, D> {
export class MatDatepicker<D> extends MatDatepickerBase<MatDatepickerControl<D>, D | null, D> {
}
2 changes: 1 addition & 1 deletion src/material/datepicker/public-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export * from './datepicker-toggle';
export * from './month-view';
export * from './year-view';
export * from './date-range-input';
export * from './date-range-picker';
export {MatDateRangePicker} from './date-range-picker';
export * from './date-selection-model';
export {MatStartDate, MatEndDate} from './date-range-input-parts';
export {MatMultiYearView, yearsPerPage, yearsPerRow} from './multi-year-view';
6 changes: 3 additions & 3 deletions tools/public_api_guard/material/datepicker.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export interface MatCalendarUserEvent<D> {

export declare type MatCalendarView = 'month' | 'year' | 'multi-year';

export declare class MatDatepicker<D> extends MatDatepickerBase<MatDatepickerInput<D>, D | null, D> {
export declare class MatDatepicker<D> extends MatDatepickerBase<MatDatepickerControl<D>, D | null, D> {
static ɵcmp: i0.ɵɵComponentDefWithMeta<MatDatepicker<any>, "mat-datepicker", ["matDatepicker"], {}, {}, never, never>;
static ɵfac: i0.ɵɵFactoryDef<MatDatepicker<any>, never>;
}
Expand Down Expand Up @@ -285,7 +285,7 @@ export declare class MatDatepickerToggleIcon {
static ɵfac: i0.ɵɵFactoryDef<MatDatepickerToggleIcon, never>;
}

export declare class MatDateRangeInput<D> implements MatFormFieldControl<DateRange<D>>, MatDatepickerControl<D>, MatDateRangeInputParent<D>, AfterContentInit, OnDestroy {
export declare class MatDateRangeInput<D> implements MatFormFieldControl<DateRange<D>>, MatDatepickerControl<D>, MatDateRangeInputParent<D>, MatDateRangePickerInput<D>, AfterContentInit, OnDestroy {
_ariaDescribedBy: string | null;
_ariaLabelledBy: string | null;
_disabledChange: Subject<boolean>;
Expand Down Expand Up @@ -336,7 +336,7 @@ export declare class MatDateRangeInput<D> implements MatFormFieldControl<DateRan
static ɵfac: i0.ɵɵFactoryDef<MatDateRangeInput<any>, [null, null, { optional: true; self: true; }, { optional: true; }, { optional: true; }]>;
}

export declare class MatDateRangePicker<D> extends MatDatepickerBase<MatDateRangeInput<D>, DateRange<D>, D> {
export declare class MatDateRangePicker<D> extends MatDatepickerBase<MatDateRangePickerInput<D>, DateRange<D>, D> {
protected _forwardContentValues(instance: MatDatepickerContent<DateRange<D>, D>): void;
static ɵcmp: i0.ɵɵComponentDefWithMeta<MatDateRangePicker<any>, "mat-date-range-picker", ["matDateRangePicker"], {}, {}, never, never>;
static ɵfac: i0.ɵɵFactoryDef<MatDateRangePicker<any>, never>;
Expand Down