Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into mtsvyatkova/fix-8786-master

Author: kdinev

projects/igniteui-angular/migrations/update-12_0_0/changes/outputs.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "../../common/schema/binding.schema.json",
+    "changes": [
+        {
+            "name": "onColumnChange",
+            "replaceWith": "columnChange",
+            "owner": {
+                "selector": "igx-column",
+                "type": "component"
+            }
+        }
+    ]
+}

projects/igniteui-angular/migrations/update-12_0_0/index.spec.ts

@@ -56,6 +56,31 @@ $theme: igx-avatar-theme(
     $color: black,
     $border-radius: 14px
 );
+`
+        );
+    });
+
+    it('should update onColumnChange', async () => {
+        appTree.create(
+            `/testSrc/appPrefix/component/test.component.html`,
+`
+<igx-grid>
+  <igx-column (onColumnChange)="columnChanged()"></igx-column>
+</igx-grid>
+`
+        );
+
+        const tree = await runner
+            .runSchematicAsync(migrationName, {}, appTree)
+            .toPromise();
+
+        expect(
+            tree.readContent('/testSrc/appPrefix/component/test.component.html')
+        ).toEqual(
+`
+<igx-grid>
+  <igx-column (columnChange)="columnChanged()"></igx-column>
+</igx-grid>
 `
         );
     });

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

@@ -777,19 +777,19 @@ describe('IgxCalendar - ', () => {
 
                 UIInteractions.triggerKeyDownEvtUponElem('PageUp', component.nativeElement);
                 fixture.detectChanges();
-                tick(100);
+                tick();
                 expect(calendar.viewDate.getMonth()).toEqual(4);
 
                 calendar.viewDate = new Date(2017, 5, 13);
                 fixture.detectChanges();
                 UIInteractions.triggerKeyDownEvtUponElem('PageDown', component.nativeElement);
                 fixture.detectChanges();
-                tick(100);
+                tick();
 
                 expect(calendar.viewDate.getMonth()).toEqual(6);
                 UIInteractions.triggerKeyDownEvtUponElem('PageUp', component.nativeElement, true, false, true);
                 fixture.detectChanges();
-                tick(100);
+                tick();
 
                 expect(calendar.viewDate.getFullYear()).toEqual(2016);
 
@@ -798,7 +798,7 @@ describe('IgxCalendar - ', () => {
 
                 UIInteractions.triggerKeyDownEvtUponElem('PageDown', component.nativeElement, true, false, true);
                 fixture.detectChanges();
-                tick(100);
+                tick();
 
                 expect(calendar.viewDate.getFullYear()).toEqual(2018);
             }));
@@ -1957,13 +1957,13 @@ describe('IgxCalendar - ', () => {
                 // Have no idea how this test worked before,
                 // changing expectation based on my udnerstanding of that the test does
                 UIInteractions.simulateMouseEvent('mousedown', prevMonthBtn, 0, 0);
-                tick(900);
+                tick();
                 UIInteractions.simulateMouseEvent('mouseup', prevMonthBtn, 0, 0);
                 fixture.detectChanges();
                 expect(calendar.viewDate.getMonth()).toEqual(4);
 
                 UIInteractions.simulateMouseEvent('mousedown', nextMonthBtn, 0, 0);
-                tick(900);
+                tick();
                 UIInteractions.simulateMouseEvent('mouseup', nextMonthBtn, 0, 0);
                 fixture.detectChanges();
                 flush();
@@ -1975,13 +1975,13 @@ describe('IgxCalendar - ', () => {
 
                 prevMonthBtn.focus();
                 UIInteractions.triggerKeyDownEvtUponElem('Enter', prevMonthBtn);
-                tick(800);
+                tick(100);
                 fixture.detectChanges();
                 expect(calendar.viewDate.getMonth()).toEqual(4);
 
                 nextMonthBtn.focus();
                 UIInteractions.triggerKeyDownEvtUponElem('Enter', nextMonthBtn);
-                tick(800);
+                tick(100);
                 fixture.detectChanges();
                 expect(calendar.viewDate.getMonth()).toEqual(5);
             }));

projects/igniteui-angular/src/lib/directives/template-outlet/template_outlet.directive.ts

@@ -38,7 +38,7 @@ export class IgxTemplateOutletDirective implements OnChanges {
     constructor(public _viewContainerRef: ViewContainerRef, private _zone: NgZone, public cdr: ChangeDetectorRef) {
     }
 
-    ngOnChanges(changes: SimpleChanges) {
+    public ngOnChanges(changes: SimpleChanges) {
         const actionType: TemplateOutletAction = this._getActionType(changes);
         switch (actionType) {
             case TemplateOutletAction.CreateView: this._recreateView(); break;

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

@@ -165,7 +165,7 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
         return args;
     }
 
-    update_cell(cell: IgxCell, value: any, event?: Event) {
+    public update_cell(cell: IgxCell, value: any, event?: Event) {
         cell.editValue = value;
         const args = cell.createEditEventArgs(true, event);
 
@@ -195,31 +195,15 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
         if (!this.grid.rowEditable || !this.grid.crudService.row ||
                 this.grid.crudService.row.id !== cell.id.rowID || !this.grid.transactions.enabled) {
             this.grid.summaryService.clearSummaryCache(args);
-            (this.grid as any)._pipeTrigger++;
+            this.grid.pipeTrigger++;
         }
 
         const doneArgs = cell.createDoneEditEventArgs(args.newValue, event);
         this.grid.cellEditDone.emit(doneArgs);
         return args;
     }
 
-    _update_row(row: IgxRow, value?: any) {
-        const grid = this.grid;
-
-        const rowInEditMode = grid.crudService.row;
-        row.newData = value ?? rowInEditMode.transactionState;
-
-
-        if (rowInEditMode && row.id === rowInEditMode.id) {
-            row.data = { ...row.data, ...rowInEditMode.transactionState };
-        // TODO: Workaround for updating a row in edit mode through the API
-        } else if (this.grid.transactions.enabled) {
-            const state = grid.transactions.getState(row.id);
-            row.data = state ? Object.assign({}, row.data, state.value) : row.data;
-        }
-    }
-
-    update_row(row: IgxRow, value: any, event?: Event) {
+    public update_row(row: IgxRow, value: any, event?: Event) {
         const grid = this.grid;
         const selected = grid.selectionService.isRowSelected(row.id);
         const rowInEditMode = grid.crudService.row;
@@ -269,7 +253,7 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
         if (hasSummarized) {
             grid.summaryService.removeSummaries(newId);
         }
-        (grid as any)._pipeTrigger++;
+        grid.pipeTrigger++;
 
         const doneArgs = row.createDoneEditEventArgs(cachedRowData, event);
         grid.rowEditDone.emit(doneArgs);
@@ -448,7 +432,7 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
         } else {
             grid.selectionService.clearHeaderCBState();
         }
-        (grid as any)._pipeTrigger++;
+        grid.pipeTrigger++;
         grid.notifyChanges();
         // Data needs to be recalculated if transactions are in place
         // If no transactions, `data` will be a reference to the grid getter, otherwise it will be stale
@@ -652,4 +636,20 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
         return this.get_column_by_name(fieldName) ?
             this.get_column_by_name(fieldName).sortStrategy : undefined;
     }
+
+    private _update_row(row: IgxRow, value?: any) {
+        const grid = this.grid;
+
+        const rowInEditMode = grid.crudService.row;
+        row.newData = value ?? rowInEditMode.transactionState;
+
+
+        if (rowInEditMode && row.id === rowInEditMode.id) {
+            row.data = { ...row.data, ...rowInEditMode.transactionState };
+        // TODO: Workaround for updating a row in edit mode through the API
+        } else if (this.grid.transactions.enabled) {
+            const state = grid.transactions.getState(row.id);
+            row.data = state ? Object.assign({}, row.data, state.value) : row.data;
+        }
+    }
 }