address comments

Author: mmalerba

src/lib/datepicker/calendar-body.ts

@@ -39,6 +39,8 @@ export class MatCalendarCell {
   styleUrls: ['calendar-body.css'],
   host: {
     'class': 'mat-calendar-body',
+    'role': 'grid',
+    'attr.aria-readonly': 'true'
   },
   exportAs: 'matCalendarBody',
   encapsulation: ViewEncapsulation.None,

src/lib/datepicker/calendar.html

@@ -36,14 +36,14 @@
       [activeDate]="_activeDate"
       [selected]="selected"
       [dateFilter]="_dateFilterForViews"
-      (selectedChange)="_monthSelected($event)">
+      (selectedChange)="_goToDateInView($event, 'month')">
   </mat-year-view>
 
   <mat-multi-year-view
       *ngSwitchCase="'multi-year'"
       [activeDate]="_activeDate"
       [selected]="selected"
       [dateFilter]="_dateFilterForViews"
-      (selectedChange)="_yearSelected($event)">
+      (selectedChange)="_goToDateInView($event, 'year')">
   </mat-multi-year-view>
 </div>

src/lib/datepicker/calendar.ts

@@ -148,12 +148,12 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
     if (this._currentView == 'year') {
       return this._dateAdapter.getYearName(this._activeDate);
     }
-    let curYear = this._dateAdapter.getYear(this._activeDate);
-    let firstYear = this._dateAdapter.getYearName(
-        this._dateAdapter.createDate(curYear - curYear % 24, 0, 1));
-    let lastYear = this._dateAdapter.getYearName(
-        this._dateAdapter.createDate(curYear + yearsPerPage - 1 - curYear % 24, 0, 1));
-    return `${firstYear} \u2013 ${lastYear}`;
+    const activeYear = this._dateAdapter.getYear(this._activeDate);
+    const firstYearInView = this._dateAdapter.getYearName(
+        this._dateAdapter.createDate(activeYear - activeYear % 24, 0, 1));
+    const lastYearInView = this._dateAdapter.getYearName(
+        this._dateAdapter.createDate(activeYear + yearsPerPage - 1 - activeYear % 24, 0, 1));
+    return `${firstYearInView} \u2013 ${lastYearInView}`;
   }
 
   get _periodButtonLabel(): string {
@@ -231,15 +231,9 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
   }
 
   /** Handles month selection in the multi-year view. */
-  _yearSelected(year: D): void {
-    this._activeDate = year;
-    this._currentView = 'year';
-  }
-
-  /** Handles month selection in the year view. */
-  _monthSelected(month: D): void {
-    this._activeDate = month;
-    this._currentView = 'month';
+  _goToDateInView(date: D, view: 'month' | 'year' | 'multi-year'): void {
+    this._activeDate = date;
+    this._currentView = view;
   }
 
   /** Handles user clicks on the period label. */
@@ -308,6 +302,7 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
     if (this._currentView == 'year') {
       return this._dateAdapter.getYear(date1) == this._dateAdapter.getYear(date2);
     }
+    // Otherwise we are in 'multi-year' view.
     return Math.floor(this._dateAdapter.getYear(date1) / yearsPerPage) ==
         Math.floor(this._dateAdapter.getYear(date2) / yearsPerPage);
   }
@@ -395,7 +390,7 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
             this._dateAdapter.addCalendarYears(this._activeDate, event.altKey ? 10 : 1);
         break;
       case ENTER:
-        this._monthSelected(this._activeDate);
+        this._goToDateInView(this._activeDate, 'month');
         break;
       default:
         // Don't prevent default or focus active cell on keys that we don't explicitly handle.
@@ -441,7 +436,7 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
                 this._activeDate, event.altKey ? yearsPerPage * 10 : yearsPerPage);
         break;
       case ENTER:
-        this._yearSelected(this._activeDate);
+        this._goToDateInView(this._activeDate, 'year');
         break;
       default:
         // Don't prevent default or focus active cell on keys that we don't explicitly handle.

src/lib/datepicker/month-view.html

@@ -4,7 +4,6 @@
     <tr><th class="mat-calendar-table-header-divider" colspan="7" aria-hidden="true"></th></tr>
   </thead>
   <tbody mat-calendar-body
-         role="grid"
          [label]="_monthLabel"
          [rows]="_weeks"
          [todayValue]="_todayDate"

src/lib/datepicker/multi-year-view.html

@@ -3,7 +3,6 @@
     <tr><th class="mat-calendar-table-header-divider" colspan="4"></th></tr>
   </thead>
   <tbody mat-calendar-body
-         role="grid"
          allowDisabledSelection="true"
          [rows]="_years"
          [todayValue]="_todayYear"

src/lib/datepicker/year-view.html

@@ -3,7 +3,6 @@
     <tr><th class="mat-calendar-table-header-divider" colspan="4"></th></tr>
   </thead>
   <tbody mat-calendar-body
-         role="grid"
          allowDisabledSelection="true"
          [label]="_yearLabel"
          [rows]="_months"