fix observable type

Author: andrewseguin

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

@@ -19,6 +19,7 @@ import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import 'rxjs/add/operator/let';
 import 'rxjs/add/operator/debounceTime';
 import 'rxjs/add/observable/combineLatest';
+import {Subject} from 'rxjs/Subject';
 
 /**
  * Provides a handle for the table to grab the view container's ng-container to insert data rows.
@@ -72,7 +73,7 @@ export class CdkTable implements CollectionViewer {
       new BehaviorSubject<{start: number, end: number}>({start: 0, end: Number.MAX_VALUE});
 
   /** Stream that emits when a row def has a change to its array of columns to render. */
-  columnsChange = new Observable<void[]>();
+  _columnsChange = new Observable<void>();
 
   /**
    * Map of all the user's defined columns identified by name.
@@ -119,23 +120,24 @@ export class CdkTable implements CollectionViewer {
 
     // Get and merge the streams for column changes made to the row defs
     const rowDefs = [...this._rowDefinitions.toArray(), this._headerDefinition];
-    const columnChangeStreams = rowDefs.map((rowDef: BaseRowDef) => rowDef.columnsChange);
-    this.columnsChange = Observable.combineLatest(columnChangeStreams);
+    const columnChangeStreams =
+        rowDefs.map((rowDef: BaseRowDef) => rowDef.columnsChange);
+    this._columnsChange = Observable.merge(...columnChangeStreams);
   }
 
   ngAfterViewInit() {
     this.renderHeaderRow();
 
     // Re-render the header row if the columns changed.
-    this.columnsChange.subscribe(() => {
+    this._columnsChange.subscribe(() => {
       this._headerRowPlaceholder.viewContainer.clear();
       this.renderHeaderRow();
     });
 
     // TODO(andrewseguin): If the data source is not
     //   present after view init, connect it when it is defined.
     // TODO(andrewseguin): Unsubscribe from this on destroy.
-    const renderChange = [this.dataSource.connect(this), this.columnsChange];
+    const renderChange = [this.dataSource.connect(this), this._columnsChange];
     Observable.combineLatest(renderChange).subscribe(([data]) => {
       // TODO(andrewseguin): Add a differ that will check if the data has changed,
       //   rather than re-rendering all rows