Merge branch '9.0.x' into dmdimitrov/issue7480-9.0.x

Author: kdinev

projects/igniteui-angular/src/lib/directives/autocomplete/autocomplete.directive.spec.ts

@@ -593,6 +593,31 @@ describe('IgxAutocomplete', () => {
             UIInteractions.triggerKeyDownEvtUponElem('enter', input.nativeElement, true);
             expect(fixture.componentInstance.townSelected).toBe('s');
         }));
+        it('Should trigger onItemSelected only once when the event is cancelled (issue #7483)', fakeAsync(() => {
+            spyOn(autocomplete.onItemSelected, 'emit').and.callThrough();
+
+            fixture.componentInstance.onItemSelected = (args) => { args.cancel = true; };
+            UIInteractions.setInputElementValue(input, 's', fixture);
+            fixture.detectChanges();
+            tick();
+            UIInteractions.triggerKeyDownEvtUponElem('enter', input.nativeElement, true);
+            expect(fixture.componentInstance.townSelected).toBe('s');
+            tick();
+            fixture.detectChanges();
+            expect(autocomplete.onItemSelected.emit).toHaveBeenCalledTimes(1);
+            expect(autocomplete.onItemSelected.emit).toHaveBeenCalledWith({ value: 'Sofia', cancel: true });
+
+            fixture.componentInstance.onItemSelected = (args) => { args.cancel = true; };
+            UIInteractions.setInputElementValue(input, 's', fixture);
+            fixture.detectChanges();
+            tick();
+            UIInteractions.triggerKeyDownEvtUponElem('enter', input.nativeElement, true);
+            expect(fixture.componentInstance.townSelected).toBe('s');
+            tick();
+            fixture.detectChanges();
+            expect(autocomplete.onItemSelected.emit).toHaveBeenCalledTimes(2);
+            expect(autocomplete.onItemSelected.emit).toHaveBeenCalledWith({ value: 'Sofia', cancel: true });
+        }));
         it('Should call onInput/open/close methods properly', fakeAsync(() => {
             let startsWith = 'g';
             spyOn(autocomplete, 'onInput').and.callThrough();

projects/igniteui-angular/src/lib/directives/autocomplete/autocomplete.directive.ts

@@ -3,7 +3,7 @@ import {
     NgModule, ElementRef, HostListener, ChangeDetectorRef, OnDestroy } from '@angular/core';
 import { NgModel, FormControlName } from '@angular/forms';
 import { CommonModule } from '@angular/common';
-import { Subject } from 'rxjs';
+import { Subject, Subscription } from 'rxjs';
 import { first, takeUntil } from 'rxjs/operators';
 import { CancelableEventArgs, IBaseEventArgs } from '../../core/utils';
 import { OverlaySettings, AbsoluteScrollStrategy, IScrollStrategy, IPositionStrategy, AutoPositionStrategy } from '../../services/index';
@@ -68,6 +68,9 @@ export class IgxAutocompleteDirective extends IgxDropDownItemNavigationDirective
         excludePositionTarget: true
     };
 
+    /** @hidden  @internal */
+    private subscriptions: Subscription[] = [];
+
     protected id: string;
     protected dropDownOpened$ = new Subject<boolean>();
     protected get model() {
@@ -280,9 +283,18 @@ export class IgxAutocompleteDirective extends IgxDropDownItemNavigationDirective
         // If no drop-down width is set, the drop-down will be as wide as the autocomplete input;
         this.target.width = this.target.width || (this.parentElement.clientWidth + 'px');
         this.target.open(this.settings);
-        this.target.onSelection.pipe(takeUntil(this.dropDownOpened$)).subscribe(this.select);
-        this.target.onOpened.pipe(first()).subscribe(this.highlightFirstItem);
-        this.target.children.changes.pipe(takeUntil(this.dropDownOpened$)).subscribe(this.highlightFirstItem);
+
+        // unsubscribe from previous subscriptions, before creating new subscriptions.
+        this.unsubscribe();
+
+        this.subscriptions.push(this.target.onSelection.pipe(takeUntil(this.dropDownOpened$)).subscribe(this.select));
+        this.subscriptions.push(this.target.onOpened.pipe(first()).subscribe(this.highlightFirstItem));
+        this.subscriptions.push(this.target.children.changes.pipe(takeUntil(this.dropDownOpened$)).subscribe(this.highlightFirstItem));
+    }
+
+    /** @hidden  @internal */
+    private unsubscribe() {
+        this.subscriptions.forEach(subscription => subscription.unsubscribe());
     }
 
     private get collapsed(): boolean {

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

@@ -540,10 +540,6 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
         return false;
     }
 
-    public atInexistingPage(): boolean {
-        return this.grid.totalPages - 1 > this.grid.page;
-    }
-
     public get_row_expansion_state(record: any): boolean {
         const grid = this.grid;
         const states = grid.expansionStates;

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

@@ -2639,12 +2639,6 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
             this.summaryService.clearSummaryCache();
             this._pipeTrigger++;
             this.notifyChanges();
-            if (this.transactions.getAggregatedChanges(false).length === 0) {
-                // Needs better check, calling 'transactions.clear()' will also trigger this
-                if (this.gridAPI.atInexistingPage()) {
-                    this.page--;
-                }
-            }
         });
 
         this.resizeNotify.pipe(destructor, filter(() => !this._init), throttleTime(100))

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

@@ -91,7 +91,7 @@ <h4>Cancel Grid Edit Events</h4>
             </div>
             <app-grid-with-transactions>
                 <igx-grid #gridRowEditTransaction [data]="data" [primaryKey]="'ProductID'" width="900px" height="700px"
-                    [rowEditable]="true" [paging]="true" [perPage]="10" (onRowEdit)="rowEditDone($event)"
+                    [rowEditable]="true" [paging]="true" [perPage]="5" (onRowEdit)="rowEditDone($event)"
                     (onRowEditCancel)="rowEditCancel($event)" (onRowEditEnter)="rowEditEnter($event)"
                     (onCellEditEnter)="cellEnterEditMode($event)" (onCellEdit)="cellEditDone($event)"
                     (onCellEditCancel)="cellEditCancel($event)">