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

Author: annieyw

src/cdk/table/cell.ts

@@ -184,8 +184,9 @@ export class CdkFooterCell extends BaseCdkCell {
   constructor(columnDef: CdkColumnDef, elementRef: ElementRef) {
     super(columnDef, elementRef);
     if (columnDef._table?._elementRef.nativeElement.nodeType === 1) {
-      const role = columnDef._table._elementRef.nativeElement
-        .getAttribute('role') === 'table' ? 'cell' : 'gridcell';
+      const tableRole = columnDef._table._elementRef.nativeElement
+        .getAttribute('role');
+      const role = (tableRole === 'grid' || tableRole === 'treegrid') ? 'gridcell' : 'cell';
       elementRef.nativeElement.setAttribute('role', role);
     }
   }
@@ -202,8 +203,9 @@ export class CdkCell extends BaseCdkCell {
   constructor(columnDef: CdkColumnDef, elementRef: ElementRef) {
     super(columnDef, elementRef);
     if (columnDef._table?._elementRef.nativeElement.nodeType === 1) {
-      const role = columnDef._table._elementRef.nativeElement
-        .getAttribute('role') === 'table' ? 'cell' : 'gridcell';
+      const tableRole = columnDef._table._elementRef.nativeElement
+        .getAttribute('role');
+      const role = (tableRole === 'grid' || tableRole === 'treegrid') ? 'gridcell' : 'cell';
       elementRef.nativeElement.setAttribute('role', role);
     }
   }

src/cdk/table/table.spec.ts

@@ -611,6 +611,19 @@ describe('CdkTable', () => {
   it('should not clobber an existing table role', () => {
     setupTableTestApp(CustomRoleCdkTableApp);
     expect(tableElement.getAttribute('role')).toBe('treegrid');
+
+    expect(getHeaderRows(tableElement)[0].getAttribute('role')).toBe('row');
+    const header = getHeaderRows(tableElement)[0];
+    getHeaderCells(header).forEach(cell => {
+      expect(cell.getAttribute('role')).toBe('columnheader');
+    });
+
+    getRows(tableElement).forEach(row => {
+      expect(row.getAttribute('role')).toBe('row');
+      getCells(row).forEach(cell => {
+        expect(cell.getAttribute('role')).toBe('gridcell');
+      });
+    });
   });
 
   it('should throw an error if two column definitions have the same name', () => {