move row clear

angular · Jul 14, 2017 · 982b0ba · 982b0ba
1 parent 15fae92
commit 982b0ba
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
@@ -215,10 +215,6 @@ export class CdkTable<T> implements CollectionViewer {
     if (this.dataSource && !this._renderChangeSubscription) {
       this._observeRenderChanges();
     }
-
-    if (!this.dataSource && this._rowPlaceholder.viewContainer.length != 0) {
-      this._rowPlaceholder.viewContainer.clear();
-    }
   }
 
   /**
@@ -239,6 +235,11 @@ export class CdkTable<T> implements CollectionViewer {
       this._renderChangeSubscription = null;
     }
 
+    // Remove the table's rows if there is now no data source
+    if (!dataSource) {
+      this._rowPlaceholder.viewContainer.clear();
+    }
+
     this._dataSource = dataSource;
   }