Skip to content

fix(datepicker): make datepicker work in compatibility mode #4686

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 3 commits into from
May 22, 2017
Merged

fix(datepicker): make datepicker work in compatibility mode #4686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d95838d
fix(datepicker): make datepicker work in compatibility mode
mmalerba May 19, 2017
b677bdc
add test
mmalerba May 19, 2017
2429c9a
address comments
mmalerba May 19, 2017
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
38 changes: 32 additions & 6 deletions src/lib/datepicker/calendar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,42 @@
<div class="mat-calendar-header">
<div class="mat-calendar-controls">
<button md-button class="mat-calendar-period-button" (click)="_currentPeriodClicked()"
[attr.aria-label]="_periodButtonLabel">
<!--
TODO(mmalerba): Clean up duplicated compatibility mode code when we have a better way to do
this.
-->

<!-- Check for compatibility mode and use correct prefix for md-button. -->
<button *ngIf="!_isCompatibilityMode" md-button class="mat-calendar-period-button"
(click)="_currentPeriodClicked()" [attr.aria-label]="_periodButtonLabel">
{{_periodButtonText}}
<div class="mat-calendar-arrow" [class.mat-calendar-invert]="!_monthView"></div>
</button>
<button *ngIf="_isCompatibilityMode" mat-button class="mat-calendar-period-button"
(click)="_currentPeriodClicked()" [attr.aria-label]="_periodButtonLabel">
{{_periodButtonText}}
<div class="mat-calendar-arrow" [class.mat-calendar-invert]="!_monthView"></div>
</button>

<div class="mat-calendar-spacer"></div>
<button md-icon-button class="mat-calendar-previous-button" [disabled]="!_previousEnabled()"
(click)="_previousClicked()" [attr.aria-label]="_prevButtonLabel">

<!-- Check for compatibility mode and use correct prefix for md-icon-button. -->
<button *ngIf="!_isCompatibilityMode" md-icon-button class="mat-calendar-previous-button"
[disabled]="!_previousEnabled()" (click)="_previousClicked()"
[attr.aria-label]="_prevButtonLabel">
</button>
<button *ngIf="_isCompatibilityMode" mat-icon-button class="mat-calendar-previous-button"
[disabled]="!_previousEnabled()" (click)="_previousClicked()"
[attr.aria-label]="_prevButtonLabel">
</button>

<!-- Check for compatibility mode and use correct prefix for md-icon-button. -->
<button *ngIf="!_isCompatibilityMode" md-icon-button class="mat-calendar-next-button"
[disabled]="!_nextEnabled()" (click)="_nextClicked()"
[attr.aria-label]="_nextButtonLabel">
</button>
<button md-icon-button class="mat-calendar-next-button" [disabled]="!_nextEnabled()"
(click)="_nextClicked()" [attr.aria-label]="_nextButtonLabel">
<button *ngIf="_isCompatibilityMode" mat-icon-button class="mat-calendar-next-button"
[disabled]="!_nextEnabled()" (click)="_nextClicked()"
[attr.aria-label]="_nextButtonLabel">
</button>
</div>
</div>
Expand Down
45 changes: 40 additions & 5 deletions src/lib/datepicker/calendar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import {
} from '../core/keyboard/keycodes';
import {MdDatepickerIntl} from './datepicker-intl';
import {MdNativeDateModule} from '../core/datetime/index';
import {NoConflictStyleCompatibilityMode} from '../core';
import {MdButtonModule} from '../button/index';


// When constructing a Date, the month is zero-based. This can be confusing, since people are
Expand All @@ -35,6 +37,7 @@ describe('MdCalendar', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
MdButtonModule,
MdNativeDateModule,
],
declarations: [
Expand Down Expand Up @@ -444,18 +447,13 @@ describe('MdCalendar', () => {
let fixture: ComponentFixture<CalendarWithMinMax>;
let testComponent: CalendarWithMinMax;
let calendarElement: HTMLElement;
let prevButton: HTMLButtonElement;
let nextButton: HTMLButtonElement;
let calendarInstance: MdCalendar<Date>;

beforeEach(() => {
fixture = TestBed.createComponent(CalendarWithMinMax);

let calendarDebugElement = fixture.debugElement.query(By.directive(MdCalendar));
calendarElement = calendarDebugElement.nativeElement;
prevButton =
calendarElement.querySelector('.mat-calendar-previous-button') as HTMLButtonElement;
nextButton = calendarElement.querySelector('.mat-calendar-next-button') as HTMLButtonElement;
calendarInstance = calendarDebugElement.componentInstance;
testComponent = fixture.componentInstance;
});
Expand All @@ -478,6 +476,9 @@ describe('MdCalendar', () => {
testComponent.startAt = new Date(2016, FEB, 1);
fixture.detectChanges();

let prevButton =
calendarElement.querySelector('.mat-calendar-previous-button') as HTMLButtonElement;

expect(prevButton.disabled).toBe(false, 'previous button should not be disabled');
expect(calendarInstance._activeDate).toEqual(new Date(2016, FEB, 1));

Expand All @@ -497,6 +498,9 @@ describe('MdCalendar', () => {
testComponent.startAt = new Date(2017, DEC, 1);
fixture.detectChanges();

let nextButton =
calendarElement.querySelector('.mat-calendar-next-button') as HTMLButtonElement;

expect(nextButton.disabled).toBe(false, 'next button should not be disabled');
expect(calendarInstance._activeDate).toEqual(new Date(2017, DEC, 1));

Expand Down Expand Up @@ -584,6 +588,37 @@ describe('MdCalendar', () => {
});
});

describe('MdCalendar in compatibility mode', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
MdButtonModule,
MdNativeDateModule,
NoConflictStyleCompatibilityMode,
],
declarations: [
MdCalendar,
MdCalendarBody,
MdMonthView,
MdYearView,

// Test components.
StandardCalendar,
],
providers: [
MdDatepickerIntl,
],
});

TestBed.compileComponents();
}));

it('should not throw on creation', () => {
let fixture = TestBed.createComponent(StandardCalendar);
expect(() => fixture.detectChanges()).not.toThrow();
});
});


@Component({
template: `<md-calendar [startAt]="startDate" [(selected)]="selected"></md-calendar>`
Expand Down
2 changes: 2 additions & 0 deletions src/lib/datepicker/calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {DateAdapter} from '../core/datetime/index';
import {MdDatepickerIntl} from './datepicker-intl';
import {createMissingDateImplError} from './datepicker-errors';
import {MD_DATE_FORMATS, MdDateFormats} from '../core/datetime/date-formats';
import {MATERIAL_COMPATIBILITY_MODE} from '../core';


/**
Expand Down Expand Up @@ -111,6 +112,7 @@ export class MdCalendar<D> implements AfterContentInit {
constructor(private _elementRef: ElementRef,
private _intl: MdDatepickerIntl,
private _ngZone: NgZone,
@Optional() @Inject(MATERIAL_COMPATIBILITY_MODE) public _isCompatibilityMode: boolean,
Copy link
Contributor

@princemaple princemaple May 22, 2017

Choose a reason for hiding this comment

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

private?

Copy link
Contributor Author

@mmalerba mmalerba May 22, 2017

Choose a reason for hiding this comment

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

can't be private since it's used in the template, underscore indicates that its for internal use only

@Optional() private _dateAdapter: DateAdapter<D>,
@Optional() @Inject(MD_DATE_FORMATS) private _dateFormats: MdDateFormats) {
if (!this._dateAdapter) {
Expand Down