fixup! fix(cdk/table): set default role of table to 'table'

Author: annieyw

src/cdk/table/cell.ts

@@ -11,10 +11,10 @@ import {
   ContentChild,
   Directive,
   ElementRef,
-  Input,
-  TemplateRef,
   Inject,
+  Input,
   Optional,
+  TemplateRef,
 } from '@angular/core';
 import {CanStick, CanStickCtor, mixinHasStickyInput} from './can-stick';
 import {CDK_TABLE} from './tokens';
@@ -178,12 +178,14 @@ export class CdkHeaderCell extends BaseCdkCell {
   selector: 'cdk-footer-cell, td[cdk-footer-cell]',
   host: {
     'class': 'cdk-footer-cell',
-    'role': 'cell',
   },
 })
 export class CdkFooterCell extends BaseCdkCell {
   constructor(columnDef: CdkColumnDef, elementRef: ElementRef) {
     super(columnDef, elementRef);
+    const role = columnDef._table._elementRef.nativeElement
+      .getAttribute('role') === 'table' ? 'cell' : 'gridcell';
+    elementRef.nativeElement.setAttribute('role', role);
   }
 }
 
@@ -192,11 +194,13 @@ export class CdkFooterCell extends BaseCdkCell {
   selector: 'cdk-cell, td[cdk-cell]',
   host: {
     'class': 'cdk-cell',
-    'role': 'cell',
   },
 })
 export class CdkCell extends BaseCdkCell {
   constructor(columnDef: CdkColumnDef, elementRef: ElementRef) {
     super(columnDef, elementRef);
+    const role = columnDef._table._elementRef.nativeElement
+      .getAttribute('role') === 'table' ? 'cell' : 'gridcell';
+    elementRef.nativeElement.setAttribute('role', role);
   }
 }

src/cdk/table/table.spec.ts

@@ -107,7 +107,7 @@ describe('CdkTable', () => {
       });
 
       it('with the right accessibility roles', () => {
-        expect(tableElement.getAttribute('role')).toBe('grid');
+        expect(tableElement.getAttribute('role')).toBe('table');
 
         expect(getHeaderRows(tableElement)[0].getAttribute('role')).toBe('row');
         const header = getHeaderRows(tableElement)[0];
@@ -118,7 +118,7 @@ describe('CdkTable', () => {
         getRows(tableElement).forEach(row => {
           expect(row.getAttribute('role')).toBe('row');
           getCells(row).forEach(cell => {
-            expect(cell.getAttribute('role')).toBe('gridcell');
+            expect(cell.getAttribute('role')).toBe('cell');
           });
         });
       });