comments

Author: andrewseguin

src/lib/core/data-table/data-table.ts

@@ -217,14 +217,15 @@ export class CdkTable<T> implements CollectionViewer {
   ngAfterViewInit() {
     // Find and construct an iterable differ that can be used to find the diff in an array.
     this._dataDiffer = this._differs.find([]).create(this._trackByFn);
-
-    this._renderHeaderRow();
     this._isViewInitialized = true;
   }
 
   ngDoCheck() {
     if (this._isViewInitialized && this.dataSource && !this._renderChangeSubscription) {
-      this._observeRenderChanges();
+      this._renderHeaderRow();
+      if (this.dataSource && !this._renderChangeSubscription) {
+        this._observeRenderChanges();
+      }
     }
   }
 

src/lib/sort/sort-header.ts

@@ -35,8 +35,6 @@ import {getMdSortHeaderNotContainedWithinMdSortError} from './sort-errors';
     '(click)': '_sort.sort(this)',
     '[class.mat-sort-header-sorted]': '_isSorted()',
   },
-  encapsulation: ViewEncapsulation.None,
-  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdSortHeader implements MdSortable {
   /**

src/lib/sort/sort.spec.ts

@@ -233,17 +233,17 @@ class FakeDataSource extends DataSource<any> {
     <cdk-table [dataSource]="dataSource" mdSort>
       <ng-container cdkColumnDef="column_a">
         <cdk-header-cell *cdkHeaderCellDef #sortHeaderA md-sort-header> Column A </cdk-header-cell>
-        <cdk-cell *cdkCellDef="let row"> {{row.a}}</cdk-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.a}} </cdk-cell>
       </ng-container>
 
       <ng-container cdkColumnDef="column_b">
         <cdk-header-cell *cdkHeaderCellDef #sortHeaderB md-sort-header> Column B </cdk-header-cell>
-        <cdk-cell *cdkCellDef="let row"> {{row.b}}</cdk-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.b}} </cdk-cell>
       </ng-container>
 
       <ng-container cdkColumnDef="column_c">
         <cdk-header-cell *cdkHeaderCellDef #sortHeaderC md-sort-header> Column C </cdk-header-cell>
-        <cdk-cell *cdkCellDef="let row"> {{row.c}}</cdk-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.c}} </cdk-cell>
       </ng-container>
 
       <cdk-header-row *cdkHeaderRowDef="columnsToRender"></cdk-header-row>