Merge branch 'master' into dmdimitrov/issue6845-master

Author: DiyanDimitrov

projects/igniteui-angular/src/lib/paginator/paginator.component.spec.ts

@@ -32,6 +32,19 @@ describe('IgxPaginator with default settings', () => {
         expect(totalPages).toBe(5);
     });
 
+    it('should change current page to equal last page, after changing perPage', () => {
+        const fix = TestBed.createComponent(DefaultPaginatorComponent);
+        fix.detectChanges();
+        const paginator = fix.componentInstance.paginator;
+
+        paginator.paginate(paginator.totalPages - 1);
+        paginator.perPage = paginator.totalRecords / 2;
+
+        fix.detectChanges();
+        const page = paginator.page;
+        expect(page).toBe(1);
+    });
+
     it('should disable go to first page when paginator is on first page', () => {
         const fix = TestBed.createComponent(DefaultPaginatorComponent);
         fix.detectChanges();

projects/igniteui-angular/src/lib/paginator/paginator.component.ts

@@ -79,6 +79,9 @@ export class IgxPaginatorComponent extends DisplayDensityBase {
         this.perPageChange.emit(this._perPage);
         this._selectOptions = this.sortUniqueOptions(this.defaultSelectValues, this._perPage);
         this.totalPages = Math.ceil(this.totalRecords / this._perPage);
+        if (this._page >= this.totalPages) {
+            this._page = this.totalPages - 1;
+        }
     }
 
     /**