Merge branch 'master' into pivot-grid-master

Author: MKirova

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

@@ -6758,7 +6758,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
 
         // eslint-disable-next-line prefer-const
         for (let [row, set] of selectionMap) {
-            row = this.paginator && source === this.filteredSortedData ? row + (this.paginator.perPage * this.paginator.page) : row;
+            row = this.paginator && (this.pagingMode === GridPagingMode.Local && 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;

src/app/grid-remote-paging/grid-remote-paging.sample.html

@@ -1,5 +1,6 @@
 <div class="dark-grid">
-    <igx-grid igxPreventDocumentScroll #grid1 [data]="data | async" width="100%" height="540px">
+    <igx-grid igxPreventDocumentScroll #grid1 [data]="data | async" width="100%" height="540px" [batchEditing]="true"
+              [pagingMode]="mode">
         <igx-column field="ID"></igx-column>
         <igx-column field="ProductName"></igx-column>
         <igx-column field="QuantityPerUnit"></igx-column>

src/app/grid-remote-paging/grid-remote-paging.sample.ts

@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { IgxGridComponent } from 'igniteui-angular';
+import { GridPagingMode, IgxGridComponent } from 'igniteui-angular';
 import { RemoteService } from '../shared/remote.service';
 import { Observable } from 'rxjs';
 
@@ -10,6 +10,7 @@ import { Observable } from 'rxjs';
 export class GridRemotePagingSampleComponent implements OnInit, AfterViewInit, OnDestroy {
     @ViewChild('grid1', { static: true }) public grid1: IgxGridComponent;
 
+    public mode: GridPagingMode = GridPagingMode.Remote;
     public page = 0;
     public totalCount = 0;
     public pages = [];

src/app/grid-row-edit/grid-row-edit-sample.component.html

@@ -222,4 +222,4 @@ <h4>Performance grid with transactions and row edit</h4>
             <button igxButton (click)="toggle.close()">Cancel</button>
         </div>
     </div>
-</div>
+</div>