Merge branch 'master' into ibarakov/fix-7299-9.1.x

kdinev · web-flow · commit d90e3a7f021f · 2020-05-22T11:32:55.000+03:00
diff --git a/projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.module.ts b/projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.module.ts
@@ -42,6 +42,7 @@ import { IgxDateTimeEditorModule } from '../directives/date-time-editor';
         IgxDateRangeStartComponent,
         IgxDateRangeEndComponent,
         IgxDateRangeSeparatorDirective,
+        IgxDateTimeEditorModule,
         IgxPickerToggleComponent
     ]
 })
diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -6287,6 +6287,18 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
             });
         }
     }
+
+    /**
+     * @hidden
+     * @internal
+     */
+    public endRowEdit(commit = true, event?: Event) {
+        this.endEdit(commit, event);
+        const activeCell = this.navigation.activeNode;
+        if (activeCell && activeCell.row !== -1) {
+            this.tbody.nativeElement.focus();
+        }
+    }
     /**
      * @hidden
      */
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts
@@ -434,7 +434,7 @@ describe('IgxGrid - Keyboard navigation #grid', () => {
             fix.detectChanges();
 
             UIInteractions.triggerKeyDownEvtUponElem('end', cell.nativeElement, true, false, false, true);
-            await wait(100);
+            await wait(150);
             fix.detectChanges();
 
             cell = grid.getCellByColumn(499, '49');
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-mrl-keyboard-nav.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-mrl-keyboard-nav.spec.ts
@@ -1693,6 +1693,7 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
                         { field: 'Fax', rowStart: 2, colStart: 1, colEnd: 3, rowEnd: 4 }
                     ]
                 }];
+                await wait(DEBOUNCETIME);
                 fix.detectChanges();
 
                 setupGridScrollDetection(fix, fix.componentInstance.grid);
@@ -1704,6 +1705,8 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
                 GridFunctions.simulateGridContentKeydown(fix, 'end', false, false, true);
                 await wait(200);
                 fix.detectChanges();
+                await wait(200);
+                fix.detectChanges();
 
                 expect(fix.componentInstance.selectedCell.value)
                     .toEqual(fix.componentInstance.data[fix.componentInstance.data.length - 1].Fax);
@@ -1712,6 +1715,8 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
                 GridFunctions.simulateGridContentKeydown(fix, 'home', false, false, true);
                 await wait(200);
                 fix.detectChanges();
+                await wait(200);
+                fix.detectChanges();
 
                 expect(fix.componentInstance.selectedCell.value).toEqual(fix.componentInstance.data[0].CompanyName);
                 expect(fix.componentInstance.selectedCell.column.field).toMatch('CompanyName');
@@ -1816,6 +1821,7 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
                         { field: 'Fax', rowStart: 2, colStart: 1, colEnd: 3, rowEnd: 4 }
                     ]
                 }];
+                await wait(DEBOUNCETIME);
                 fix.detectChanges();
                 setupGridScrollDetection(fix, fix.componentInstance.grid);
                 // last cell from first layout
@@ -1828,13 +1834,15 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
                 GridFunctions.simulateGridContentKeydown(fix, 'End', false, false, true);
                 await wait(200);
                 fix.detectChanges();
+                await wait(200);
+                fix.detectChanges();
 
                 expect(fix.componentInstance.selectedCell.value)
                     .toEqual(fix.componentInstance.data[fix.componentInstance.data.length - 1].Fax);
                 expect(fix.componentInstance.selectedCell.column.field).toMatch('Fax');
 
                 GridFunctions.simulateGridContentKeydown(fix, 'Home', false, false, true);
-                await wait(100);
+                await wait(200);
                 fix.detectChanges();
 
                 expect(fix.componentInstance.selectedCell.value).toEqual(fix.componentInstance.data[0].CompanyName);
@@ -1872,6 +1880,7 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
                         { field: 'Fax', rowStart: 2, colStart: 1, colEnd: 3, rowEnd: 4 }
                     ]
                 }];
+                await wait(DEBOUNCETIME);
                 fix.detectChanges();
                 const firstCell = fix.debugElement.queryAll(By.css(CELL_CSS_CLASS))[0];
 
@@ -1931,6 +1940,7 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
                         { field: 'Fax', rowStart: 2, colStart: 1, colEnd: 3, rowEnd: 4 }
                     ]
                 }];
+                await wait(DEBOUNCETIME);
                 fix.detectChanges();
                 const rows = fix.debugElement.queryAll(By.css(ROW_CSS_CLASS));
                 const firstCell = rows[2].queryAll(By.css(CELL_CSS_CLASS))[0];
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.html b/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
@@ -291,8 +291,8 @@
 </ng-template>
 
 <ng-template #defaultRowEditActions>
-    <button igxButton igxRowEditTabStop (click)="endEdit(false, $event)">Cancel</button>
-    <button igxButton igxRowEditTabStop (click)="endEdit(true, $event)">Done</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(false, $event)">Cancel</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(true, $event)">Done</button>
 </ng-template>
 
 <ng-template #defaultRowEditTemplate>
diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html
@@ -237,8 +237,8 @@
     You have {{ rowChangesCount }} changes in this row
 </ng-template>
 <ng-template #defaultRowEditActions>
-    <button igxButton igxRowEditTabStop (click)="endEdit(false, $event)">Cancel</button>
-    <button igxButton igxRowEditTabStop (click)="endEdit(true, $event)">Done</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(false, $event)">Cancel</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(true, $event)">Done</button>
 </ng-template>
 <ng-template #defaultRowEditTemplate>
     <div class="igx-banner__message">
diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html
@@ -206,8 +206,8 @@
 </ng-template>
 
 <ng-template #defaultRowEditActions>
-    <button igxButton igxRowEditTabStop (click)="endEdit(false, $event)">Cancel</button>
-    <button igxButton igxRowEditTabStop (click)="endEdit(true, $event)">Done</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(false, $event)">Cancel</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(true, $event)">Done</button>
 </ng-template>
 
 <ng-template #defaultRowEditTemplate>

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ import { IgxDateTimeEditorModule } from '../directives/date-time-editor';`
`42`	`42`	`IgxDateRangeStartComponent,`
`43`	`43`	`IgxDateRangeEndComponent,`
`44`	`44`	`IgxDateRangeSeparatorDirective,`
	`45`	`+ IgxDateTimeEditorModule,`
`45`	`46`	`IgxPickerToggleComponent`
`46`	`47`	`]`
`47`	`48`	`})`