Merge pull request #14805 from IgniteUI/mkirkova/fix-14724-18.1.x

Clear selected rows correctly when a row is updated and filtering is applied - 18.1.x

Author: kacheshmarova

projects/igniteui-angular/src/lib/grids/grid/grid-row-selection.spec.ts

@@ -2,7 +2,7 @@ import { TestBed, fakeAsync, tick, waitForAsync, ComponentFixture } from '@angul
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { IgxGridComponent } from './grid.component';
 import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec';
-import { IgxStringFilteringOperand, IgxNumberFilteringOperand } from '../../data-operations/filtering-condition';
+import { IgxStringFilteringOperand, IgxNumberFilteringOperand, IgxBooleanFilteringOperand } from '../../data-operations/filtering-condition';
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import {
     RowSelectionComponent,
@@ -2139,6 +2139,27 @@ describe('IgxGrid - Row Selection #grid', () => {
             GridSelectionFunctions.verifyHeaderRowCheckboxState(fix, true, false);
             expect(grid.selectedRows.length).toBe(grid.data.length);
         });
+
+        it('Should deselect updated row with header checkbox when batchEditing is enbaled and filtering is applied', () => {
+            grid.batchEditing = true;
+            grid.selectRows([1]);
+            grid.filter('InStock', null, IgxBooleanFilteringOperand.instance().condition('true'));
+            fix.detectChanges();
+
+            const row = grid.gridAPI.get_row_by_index(0);
+            GridSelectionFunctions.verifyRowSelected(row);
+
+            grid.updateRow({ ProductID: 1, ProductName: 'test', InStock: true, UnitsInStock: 1, OrderDate: new Date('2019-03-01') }, 1);
+            fix.detectChanges();
+
+            GridSelectionFunctions.clickHeaderRowCheckbox(fix);
+            fix.detectChanges();
+            GridSelectionFunctions.verifyRowSelected(row);
+
+            GridSelectionFunctions.clickHeaderRowCheckbox(fix);
+            fix.detectChanges();
+            GridSelectionFunctions.verifyRowSelected(row, false);
+        });
     });
 
     describe('Integration with CRUD and transactions', () => {

projects/igniteui-angular/src/lib/grids/selection/selection.service.ts

@@ -426,7 +426,14 @@ export class IgxGridSelectionService {
         const selectedRows = this.getSelectedRowsData();
         const removedRec = this.isFilteringApplied() ?
             this.allData.filter(row => this.isRowSelected(this.getRecordKey(row))) : selectedRows;
-        const newSelection = this.isFilteringApplied() ? selectedRows.filter(x => !removedRec.includes(x)) : [];
+        let newSelection;
+        if (this.grid.primaryKey) {
+            newSelection = this.isFilteringApplied() ? selectedRows.filter(x => {
+                return !removedRec.some(item => item[this.grid.primaryKey] === x[this.grid.primaryKey]);
+            }) : [];
+        } else {
+            newSelection = this.isFilteringApplied() ? selectedRows.filter(x => !removedRec.includes(x)) : [];
+        }
         this.emitRowSelectionEvent(newSelection, [], removedRec, event, selectedRows);
     }