better trackby function

Author: andrewseguin

src/demo-app/data-table/data-table-demo.html

@@ -6,7 +6,7 @@
   <md-checkbox [(ngModel)]="changeReferences">Change references</md-checkbox>
 
   <span>Track By</span>
-  <md-radio-group [(ngModel)]="trackBy">
+  <md-radio-group [(ngModel)]="trackByStrategy">
     <md-radio-button [value]="'id'">ID</md-radio-button>
     <md-radio-button [value]="'reference'">Reference</md-radio-button>
     <md-radio-button [value]="'index'">Index</md-radio-button>

src/demo-app/data-table/data-table-demo.ts

@@ -13,13 +13,9 @@ export type TrackByStrategy = 'id' | 'reference' | 'index';
   styleUrls: ['data-table-demo.css'],
 })
 export class DataTableDemo {
-  static TRACK_BY: 'id' | 'reference' | 'index' = 'reference';
-
-  get trackBy(): TrackByStrategy { return DataTableDemo.TRACK_BY; }
-  set trackBy(trackBy: TrackByStrategy) { DataTableDemo.TRACK_BY = trackBy; }
-
   dataSource: PersonDataSource;
   propertiesToDisplay: UserProperties[] = [];
+  trackByStrategy: TrackByStrategy = 'reference';
   changeReferences = false;
 
   constructor(public _peopleDatabase: PeopleDatabase) {
@@ -42,8 +38,8 @@ export class DataTableDemo {
     return distanceFromMiddle / 50 + .3;
   }
 
-  userTrackBy(index: number, item: UserData) {
-    switch (DataTableDemo.TRACK_BY) {
+  userTrackBy = (index: number, item: UserData) => {
+    switch (this.trackByStrategy) {
       case 'id': return item.id;
       case 'reference': return item;
       case 'index': return index;

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

@@ -145,21 +145,21 @@ describe('CdkTable', () => {
 
   describe('with trackBy', () => {
 
-    afterEach(() => {
-      // Resetting the static value of the trackby function for TrackByCdkTableApp
-      TrackByCdkTableApp.trackBy = 'reference';
-    });
+    let trackByComponent: TrackByCdkTableApp;
+    let trackByFixture: ComponentFixture<TrackByCdkTableApp>;
+
+    function createTestComponentWithTrackyByTable(trackByStrategy) {
+      trackByFixture = TestBed.createComponent(TrackByCdkTableApp);
 
-    function createTestComponentWithTrackyByTable() {
-      fixture = TestBed.createComponent(TrackByCdkTableApp);
+      trackByComponent = trackByFixture.componentInstance;
+      trackByComponent.trackByStrategy = trackByStrategy;
 
-      component = fixture.componentInstance;
-      dataSource = component.dataSource as FakeDataSource;
-      table = component.table;
-      tableElement = fixture.nativeElement.querySelector('cdk-table');
+      dataSource = trackByComponent.dataSource as FakeDataSource;
+      table = trackByComponent.table;
+      tableElement = trackByFixture.nativeElement.querySelector('cdk-table');
 
-      fixture.detectChanges();  // Let the component and table create embedded views
-      fixture.detectChanges();  // Let the cells render
+      trackByFixture.detectChanges();  // Let the component and table create embedded views
+      trackByFixture.detectChanges();  // Let the cells render
 
       // Each row receives an attribute 'initialIndex' the element's original place
       getRows(tableElement).forEach((row: Element, index: number) => {
@@ -176,7 +176,7 @@ describe('CdkTable', () => {
     // Swap first two elements, remove the third, add new data
     function mutateData() {
       // Swap first and second data in data array
-      const copiedData = component.dataSource.data.slice();
+      const copiedData = trackByComponent.dataSource.data.slice();
       const temp = copiedData[0];
       copiedData[0] = copiedData[1];
       copiedData[1] = temp;
@@ -185,12 +185,12 @@ describe('CdkTable', () => {
       copiedData.splice(2, 1);
 
       // Add new data
-      component.dataSource.data = copiedData;
-      component.dataSource.addData();
+      trackByComponent.dataSource.data = copiedData;
+      trackByComponent.dataSource.addData();
     }
 
     it('should add/remove/move rows with reference-based trackBy', () => {
-      createTestComponentWithTrackyByTable();
+      createTestComponentWithTrackyByTable('reference');
       mutateData();
 
       // Expect that the first and second rows were swapped and that the last row is new
@@ -202,11 +202,11 @@ describe('CdkTable', () => {
     });
 
     it('should add/remove/move rows with changed references without property-based trackBy', () => {
-      createTestComponentWithTrackyByTable();
+      createTestComponentWithTrackyByTable('reference');
       mutateData();
 
       // Change each item reference to show that the trackby is not checking the item properties.
-      component.dataSource.data = component.dataSource.data
+      trackByComponent.dataSource.data = trackByComponent.dataSource.data
           .map(item => { return {a: item.a, b: item.b, c: item.c}; });
 
       // Expect that all the rows are considered new since their references are all different
@@ -218,13 +218,12 @@ describe('CdkTable', () => {
     });
 
     it('should add/remove/move rows with changed references with property-based trackBy', () => {
-      TrackByCdkTableApp.trackBy = 'propertyA';
-      createTestComponentWithTrackyByTable();
+      createTestComponentWithTrackyByTable('propertyA');
       mutateData();
 
       // Change each item reference to show that the trackby is checking the item properties.
       // Otherwise this would cause them all to be removed/added.
-      component.dataSource.data = component.dataSource.data
+      trackByComponent.dataSource.data = trackByComponent.dataSource.data
           .map(item => { return {a: item.a, b: item.b, c: item.c}; });
 
       // Expect that the first and second rows were swapped and that the last row is new
@@ -236,13 +235,12 @@ describe('CdkTable', () => {
     });
 
     it('should add/remove/move rows with changed references with index-based trackBy', () => {
-      TrackByCdkTableApp.trackBy = 'index';
-      createTestComponentWithTrackyByTable();
+      createTestComponentWithTrackyByTable('index');
       mutateData();
 
       // Change each item reference to show that the trackby is checking the index.
       // Otherwise this would cause them all to be removed/added.
-      component.dataSource.data = component.dataSource.data
+      trackByComponent.dataSource.data = trackByComponent.dataSource.data
           .map(item => { return {a: item.a, b: item.b, c: item.c}; });
 
       // Expect first two to be the same since they were swapped but indicies are consistent.
@@ -453,15 +451,15 @@ class DynamicDataSourceCdkTableApp {
   `
 })
 class TrackByCdkTableApp {
-  static trackBy: 'reference' | 'propertyA' | 'index' = 'reference';
+  trackByStrategy: 'reference' | 'propertyA' | 'index' = 'reference';
 
   dataSource: FakeDataSource = new FakeDataSource();
   columnsToRender = ['column_a', 'column_b'];
 
   @ViewChild(CdkTable) table: CdkTable<TestData>;
 
-  trackBy(index: number, item: TestData) {
-    switch (TrackByCdkTableApp.trackBy) {
+  trackBy = (index: number, item: TestData) => {
+    switch (this.trackByStrategy) {
       case 'reference': return item;
       case 'propertyA': return item.a;
       case 'index': return index;