From 13f2c8cec13ce4260e19038acf9ea59890d81593 Mon Sep 17 00:00:00 2001
From: viktorkombov <viktorkombov@gmail.com>
Date: Tue, 12 Oct 2021 09:59:23 +0300
Subject: [PATCH 1/2] fix(grid): update extractDataFromSelection method

---
 projects/igniteui-angular/src/lib/grids/grid-base.directive.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
index 11efbf25c29..ad1e1d6716b 100644
--- a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
+++ b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -6942,7 +6942,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
 
         // eslint-disable-next-line prefer-const
         for (let [row, set] of selectionMap) {
-            row = this.paginator ? row + (this.paginator.perPage * this.paginator.page) : row;
+            row = this.paginator && source === this.filteredSortedData ? row + (this.paginator.perPage * this.paginator.page) : row;
             row = isRemote ? row - this.virtualizationState.startIndex : row;
             if (!source[row] || source[row].detailsData !== undefined) {
                 continue;

From addda51fa9aeacfe50adff6c1934680ab0923c1d Mon Sep 17 00:00:00 2001
From: viktorkombov <viktorkombov@gmail.com>
Date: Thu, 14 Oct 2021 14:34:11 +0300
Subject: [PATCH 2/2] test(grid): add unit test covering all the new code

---
 .../lib/grids/grid/grid.master-detail.spec.ts | 48 +++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.master-detail.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.master-detail.spec.ts
index 603df03990c..3cf6b8eea95 100644
--- a/projects/igniteui-angular/src/lib/grids/grid/grid.master-detail.spec.ts
+++ b/projects/igniteui-angular/src/lib/grids/grid/grid.master-detail.spec.ts
@@ -3,7 +3,7 @@ import { TestBed, ComponentFixture, fakeAsync, tick } from '@angular/core/testin
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
-import { UIInteractions, wait, waitForActiveNodeChange} from '../../test-utils/ui-interactions.spec';
+import { UIInteractions, wait, waitForActiveNodeChange } from '../../test-utils/ui-interactions.spec';
 import { IgxGridModule } from './public_api';
 import { IgxGridComponent } from './grid.component';
 import { IgxGridRowComponent } from './grid-row.component';
@@ -42,7 +42,7 @@ describe('IgxGrid Master Detail #grid', () => {
     }));
 
     describe('Basic', () => {
-        beforeEach( fakeAsync(() => {
+        beforeEach(fakeAsync(() => {
             fix = TestBed.createComponent(DefaultGridMasterDetailComponent);
             fix.detectChanges();
             grid = fix.componentInstance.grid;
@@ -689,7 +689,7 @@ describe('IgxGrid Master Detail #grid', () => {
 
     describe('Integration', () => {
         describe('Paging', () => {
-             it('Should not take into account expanded detail views as additional records.', fakeAsync(() => {
+            it('Should not take into account expanded detail views as additional records.', fakeAsync(() => {
                 fix = TestBed.createComponent(DefaultGridMasterDetailComponent);
                 grid = fix.componentInstance.grid;
                 fix.detectChanges();
@@ -859,6 +859,48 @@ describe('IgxGrid Master Detail #grid', () => {
                 fix.detectChanges();
                 expect(grid.getSelectedData()).toEqual(expectedData);
             }));
+
+            it('getSelectedData should return correct values when there are master details and paging is enabled', fakeAsync(() => {
+                const range = { rowStart: 0, rowEnd: 5, columnStart: 'ContactName', columnEnd: 'ContactName' };
+                const expectedDataFromSecondPage = [
+                    { ContactName: 'Hanna Moos' },
+                    { ContactName: 'Frédérique Citeaux' },
+                    { ContactName: 'Martín Sommer' }
+                ];
+                fix.componentInstance.paging = true;
+                fix.detectChanges();
+                grid.paginator.perPage = 5;
+                fix.detectChanges();
+                tick(16);
+                grid.paginator.paginate(1);
+                fix.detectChanges();
+                tick(16);
+
+                grid.expandAll();
+                tick(100);
+                fix.detectChanges();
+
+                grid.selectRange(range);
+                fix.detectChanges();
+                expect(grid.getSelectedData()).toEqual(expectedDataFromSecondPage);
+
+                const expectedDataFromThirdPage = [
+                    { ContactName: 'Victoria Ashworth' },
+                    { ContactName: 'Patricio Simpson' },
+                    { ContactName: 'Francisco Chang' }
+                ];
+                grid.paginator.paginate(2);
+                fix.detectChanges();
+                tick(16);
+
+                grid.expandAll();
+                tick(100);
+                fix.detectChanges();
+
+                grid.selectRange(range);
+                fix.detectChanges();
+                expect(grid.getSelectedData()).toEqual(expectedDataFromThirdPage);
+            }));
         });
 
         describe('Row Selection', () => {