From 94a3b5abe96e27cd702fe14b467c3d84e9421eb8 Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Mon, 18 Aug 2025 08:27:50 -0700
Subject: [PATCH] Revert "fix(cdk/table): ensure CdkTable updates view with
 OnPush and trackBy (#31451)"

This reverts commit 5b45df30ca60b75b27313d3b1b52c42ac037eb4f.
---
 src/cdk/table/table.spec.ts | 44 +------------------------------------
 src/cdk/table/table.ts      |  2 --
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index d321a9d31dd6..08b792838694 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -13,7 +13,6 @@ import {
   Type,
   ViewChild,
   inject,
-  TrackByFunction,
 } from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {ComponentFixture, TestBed, fakeAsync, flush, waitForAsync} from '@angular/core/testing';
@@ -1996,35 +1995,6 @@ describe('CdkTable', () => {
     expect(noDataRow).toBeTruthy();
     expect(noDataRow.getAttribute('colspan')).toEqual('3');
   });
-
-  it('should properly update table content when data changes in OnPush component with track by instance', () => {
-    setupTableTestApp(WrapNativeTrackByHtmlTableAppOnPush);
-
-    const data = component.dataSource.data;
-
-    expectTableToMatchContent(tableElement, [
-      ['Column A', 'Column B', 'Column C'],
-      [data[0].a, data[0].b, data[0].c],
-      [data[1].a, data[1].b, data[1].c],
-      [data[2].a, data[2].b, data[2].c],
-    ]);
-
-    component.dataSource.data = component.dataSource.data.map((data: TestData) => ({
-      ...data,
-      b: `${data.b}-updated`,
-    }));
-
-    fixture.detectChanges();
-
-    const newData = component.dataSource.data;
-
-    expectTableToMatchContent(tableElement, [
-      ['Column A', 'Column B', 'Column C'],
-      [newData[0].a, newData[0].b, newData[0].c],
-      [newData[1].a, newData[1].b, newData[1].c],
-      [newData[2].a, newData[2].b, newData[2].c],
-    ]);
-  });
 });
 
 interface TestData {
@@ -3165,7 +3135,7 @@ class TableWithIndirectDescendantDefs {
 @Component({
   selector: 'cdk-table-change-detection-on-push',
   template: `
-    <table cdk-table [dataSource]="dataSource" [trackBy]="trackBy">
+    <table cdk-table [dataSource]="dataSource">
       <ng-container cdkColumnDef="column_a">
         <th cdk-header-cell *cdkHeaderCellDef> Column A</th>
         <td cdk-cell *cdkCellDef="let row"> {{row.a}}</td>
@@ -3193,7 +3163,6 @@ class TableWithIndirectDescendantDefs {
 })
 class NativeHtmlTableAppOnPush {
   @Input() dataSource: Observable<TestData[]> | null = null;
-  @Input() trackBy: TrackByFunction<TestData> | undefined;
   columnsToRender = ['column_a', 'column_b', 'column_c'];
 }
 
@@ -3207,17 +3176,6 @@ class WrapNativeHtmlTableAppOnPush {
   dataSource: FakeDataSource = new FakeDataSource();
 }
 
-@Component({
-  template: `
-    <cdk-table-change-detection-on-push [dataSource]="dataSource" [trackBy]="trackBy"></cdk-table-change-detection-on-push>
-  `,
-  imports: [NativeHtmlTableAppOnPush],
-})
-class WrapNativeTrackByHtmlTableAppOnPush {
-  dataSource: FakeDataSource = new FakeDataSource();
-  trackBy: TrackByFunction<TestData> = (index: number, data: TestData) => data.a;
-}
-
 function getElements(element: Element, query: string): HTMLElement[] {
   return [].slice.call(element.querySelectorAll(query));
 }
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index e8f23cc94d6d..a8ffcfabcbeb 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -682,7 +682,6 @@ export class CdkTable<T>
     if (!changes) {
       this._updateNoDataRow();
       this.contentChanged.next();
-      this._changeDetectorRef.markForCheck();
       return;
     }
     const viewContainer = this._rowOutlet.viewContainer;
@@ -717,7 +716,6 @@ export class CdkTable<T>
 
     this.contentChanged.next();
     this.updateStickyColumnStyles();
-    this._changeDetectorRef.markForCheck();
   }
 
   /** Adds a column definition that was not included as part of the content children. */