Skip to content

Commit ac23efa

Browse files
committed
sync
1 parent 8a724b9 commit ac23efa

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {BehaviorSubject} from 'rxjs/BehaviorSubject';
77
import {customMatchers} from '../testing/jasmine-matchers';
88
import {CdkDataTableModule} from './index';
99

10-
describe('CdkTable', () => {
10+
fdescribe('CdkTable', () => {
1111
let fixture: ComponentFixture<SimpleCdkTableApp>;
1212

1313
let component: SimpleCdkTableApp;
@@ -134,7 +134,6 @@ describe('CdkTable', () => {
134134
it('should match the right table content with dynamic data', () => {
135135
const initialDataLength = dataSource.data.length;
136136
expect(dataSource.data.length).toBe(3);
137-
const headerContent = ['Column A', 'Column B', 'Column C'];
138137

139138
let data = dataSource.data;
140139
expect(tableElement).toMatchTableContent([
@@ -183,7 +182,6 @@ describe('CdkTable', () => {
183182
[data[1].c, data[1].b],
184183
[data[2].c, data[2].b],
185184
]);
186-
expect(tableElement).toMatchTableContent(changedTableContent);
187185
});
188186
});
189187

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ export class CdkTable<T> implements CollectionViewer {
143143
this._columnsChange.subscribe(() => {
144144
this._headerRowPlaceholder.viewContainer.clear();
145145
this.renderHeaderRow();
146+
147+
// Reset the data to an empty array so that renderRowChanges will re-render all new rows.
148+
this._rowPlaceholder.viewContainer.clear();
149+
this._dataDiffer.diff([]);
146150
});
147151

148152
// TODO(andrewseguin): If the data source is not

0 commit comments

Comments
 (0)