Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
4 changes: 3 additions & 1 deletion src/lib/datepicker/calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
[activeDate]="_activeDate"
[selected]="selected"
[dateFilter]="_dateFilterForViews"
(selectedChange)="_dateSelected($event)">
(selectedChange)="_dateSelected($event)"
(userSelection)="_userSelected()"
>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Closing bracket should be on line above

</md-month-view>

<md-year-view
Expand Down
7 changes: 7 additions & 0 deletions src/lib/datepicker/calendar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ export class MdCalendar<D> implements AfterContentInit, OnDestroy {
/** Emits when the currently selected date changes. */
@Output() selectedChange = new EventEmitter<D>();

/** Emits when any date is selected */
@Output() userSelection = new EventEmitter();

/** Date filter for the month and year views. */
_dateFilterForViews = (date: D) => {
return !!date &&
Expand Down Expand Up @@ -159,6 +162,10 @@ export class MdCalendar<D> implements AfterContentInit, OnDestroy {
}
}

_userSelected(): void {
this.userSelection.emit();
}

/** Handles month selection in the year view. */
_monthSelected(month: D): void {
this._activeDate = month;
Expand Down
3 changes: 2 additions & 1 deletion src/lib/datepicker/datepicker-content.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
[maxDate]="datepicker._maxDate"
[dateFilter]="datepicker._dateFilter"
[selected]="datepicker._selected"
(selectedChange)="datepicker._selectAndClose($event)">
(selectedChange)="datepicker._selectAndClose($event)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This _selectAndClose method and its comment should be updated since it no longer closes

(userSelection)="datepicker.close()">
</md-calendar>
14 changes: 7 additions & 7 deletions src/lib/datepicker/datepicker-input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,13 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
ngAfterContentInit() {
if (this._datepicker) {
this._datepickerSubscription =
this._datepicker.selectedChanged.subscribe((selected: D) => {
this.value = selected;
this._cvaOnChange(selected);
this._onTouched();
this.dateInput.emit(new MdDatepickerInputEvent(this, this._elementRef.nativeElement));
this.dateChange.emit(new MdDatepickerInputEvent(this, this._elementRef.nativeElement));
});
this._datepicker.selectedChanged.subscribe((selected: D) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: this should stay the same too. They indent 2 for function blocks and 4 for line breaks

this.value = selected;
this._cvaOnChange(selected);
this._onTouched();
this.dateInput.emit(new MdDatepickerInputEvent(this, this._elementRef.nativeElement));
this.dateChange.emit(new MdDatepickerInputEvent(this, this._elementRef.nativeElement));
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think they actually prefer line breaks like this to stay 4 spaces

}
}

Expand Down
20 changes: 20 additions & 0 deletions src/lib/datepicker/datepicker.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,26 @@ describe('MdDatepicker', () => {
});
});

it('setting twice to the same selected value should update input and close calendar', () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'clicking the currently selected date should close the calendar without firing selectedChanged'

for (let changeCount = 1; changeCount < 3; changeCount++) {
const currentDay = changeCount;
testComponent.datepicker.open();
fixture.detectChanges();

expect(document.querySelector('md-datepicker-content')).not.toBeNull();
expect(testComponent.datepickerInput.value).toEqual(new Date(2020, JAN, currentDay));

let cells = document.querySelectorAll('.mat-calendar-body-cell');
dispatchMouseEvent(cells[1], 'click');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

verify that selectedChanged only emits the first time

fixture.detectChanges();
}

fixture.whenStable().then(() => {
expect(document.querySelector('md-dialog-container')).toBeNull();
expect(testComponent.datepickerInput.value).toEqual(new Date(2020, JAN, 2));
});
});

it('startAt should fallback to input value', () => {
expect(testComponent.datepicker.startAt).toEqual(new Date(2020, JAN, 1));
});
Expand Down
1 change: 0 additions & 1 deletion src/lib/datepicker/datepicker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ export class MdDatepicker<D> implements OnDestroy {
if (!this._dateAdapter.sameDate(oldValue, this._selected)) {
this.selectedChanged.emit(date);
}
this.close();
}

/**
Expand Down
16 changes: 11 additions & 5 deletions src/lib/datepicker/month-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ export class MdMonthView<D> implements AfterContentInit {
/** Emits when a new date is selected. */
@Output() selectedChange = new EventEmitter<D | null>();

/** Emits when date is picked */
@Output() userSelection = new EventEmitter();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment you had above seems more appropriate for this as well:

/** Emits when any date is selected. */

Nit: Add a period to both to match other comments

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think it should have a <void> type?

new EventEmitter<void>();


/** The label for this month (e.g. "January 2017"). */
_monthLabel: string;

Expand Down Expand Up @@ -116,12 +119,15 @@ export class MdMonthView<D> implements AfterContentInit {

/** Handles when a new date is selected. */
_dateSelected(date: number) {
if (this._selectedDate == date) {
return;
if (this._selectedDate != date) {
const selectedYear = this._dateAdapter.getYear(this.activeDate);
const selectedMonth = this._dateAdapter.getMonth(this.activeDate);
const selectedDate = this._dateAdapter.createDate(selectedYear, selectedMonth, date);

this.selectedChange.emit(selectedDate);
}
this.selectedChange.emit(this._dateAdapter.createDate(
this._dateAdapter.getYear(this.activeDate), this._dateAdapter.getMonth(this.activeDate),
date));

this.userSelection.emit();
}

/** Initializes this month view. */
Expand Down