Merge branch 'master' into ddincheva/fixIssue5551-master

Author: ddincheva

projects/igniteui-angular/src/lib/core/grid-selection.ts

@@ -272,11 +272,11 @@ export class IgxGridSelectionService {
      * Adds a single node.
      * Single clicks | Ctrl + single clicks on cells is the usual case.
      */
-    add(node: ISelectionNode): void {
+    add(node: ISelectionNode, addToRange = true): void {
         this.selection.has(node.row) ? this.selection.get(node.row).add(node.column) :
             this.selection.set(node.row, new Set<number>()).get(node.row).add(node.column);
 
-        this._ranges.add(JSON.stringify(this.generateRange(node)));
+        if (addToRange) { this._ranges.add(JSON.stringify(this.generateRange(node))); }
     }
 
     /**
@@ -307,10 +307,10 @@ export class IgxGridSelectionService {
         return (this.isActiveNode(node) && this.grid.isCellSelectable) || this.isInMap(node);
     }
 
-    isActiveNode(node: ISelectionNode, mrl = false): boolean {
+    isActiveNode(node: ISelectionNode): boolean {
         if (this.activeElement) {
             const isActive = this.activeElement.column === node.column && this.activeElement.row === node.row;
-            if (mrl) {
+            if (this.grid.hasColumnLayouts) {
                 const layout = this.activeElement.layout;
                 return isActive && this.isActiveLayout(layout, node.layout);
             }

projects/igniteui-angular/src/lib/grids/cell.component.ts

@@ -802,11 +802,7 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
         this.focused = true;
         this.row.focused = true;
         const node = this.selectionNode;
-        const mrl = this.grid.hasColumnLayouts;
-
-        if (this.grid.isCellSelectable && !this.selectionService.isActiveNode(node, mrl)) {
-            this.grid.onSelection.emit({ cell: this, event });
-        }
+        const shouldEmitSelection = !this.selectionService.isActiveNode(node);
 
         if (this.selectionService.primaryButton) {
             this._updateCRUDStatus();
@@ -819,9 +815,13 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
         }
 
         this.selectionService.primaryButton = true;
-        if (this.cellSelectionMode === GridSelectionMode.multiple) {
+        if (this.cellSelectionMode === GridSelectionMode.multiple && this.selectionService.activeElement) {
+            this.selectionService.add(this.selectionService.activeElement, false); // pointer events handle range generation
             this.selectionService.keyboardStateOnFocus(node, this.grid.onRangeSelection, this.nativeElement);
         }
+        if (this.grid.isCellSelectable && shouldEmitSelection) {
+            this.grid.onSelection.emit({ cell: this, event });
+        }
     }
 
     /**

projects/igniteui-angular/src/lib/grids/grid/grid-cell-selection.spec.ts

@@ -831,6 +831,28 @@ describe('IgxGrid - Cell selection #grid', () => {
             expect(grid.getSelectedData()).toEqual([]);
             expect(selectionChangeSpy).toHaveBeenCalledTimes(0);
         });
+
+        it('Should return correct selected data when onSelection event is emitted', () => {
+            let selectedData = [];
+            grid.onSelection.subscribe((e) => {
+                selectedData = grid.getSelectedData();
+            });
+
+            const cell =  grid.getCellByColumn(2, 'Name');
+            UIInteractions.simulateClickAndSelectCellEvent(cell);
+            fix.detectChanges();
+
+            expect(selectedData.length).toBe(1);
+            expect(selectedData[0]).toEqual({'Name': 'Monica Reyes'});
+
+            const idCell =  grid.getCellByColumn(1, 'ID');
+            UIInteractions.simulateClickAndSelectCellEvent(idCell, false, true);
+            fix.detectChanges();
+
+            expect(selectedData.length).toBe(2);
+            expect(selectedData[0]).toEqual({'Name': 'Monica Reyes'});
+            expect(selectedData[1]).toEqual({'ID':  957});
+        });
     });
 
     describe('Keyboard navigation', () => {
@@ -3183,6 +3205,25 @@ describe('IgxGrid - Cell selection #grid', () => {
             expect(grid.getSelectedData()).toEqual([]);
             expect(grid.getSelectedRanges()).toEqual([]);
         });
+
+        it('Should return correct selected data when onSelection event is emitted using mouse click and kb navigation', () => {
+            let selectedData = [];
+            grid.onSelection.subscribe((e) => {
+                selectedData = grid.getSelectedData();
+            });
+
+            const cell =  grid.getCellByColumn(2, 'Name');
+            UIInteractions.simulateClickAndSelectCellEvent(cell);
+            fix.detectChanges();
+            expect(selectedData.length).toBe(1);
+            expect(selectedData[0]).toEqual({'Name': 'Monica Reyes'});
+
+            UIInteractions.triggerKeyDownWithBlur('arrowdown', cell.nativeElement, true, false, true);
+            fix.detectChanges();
+
+            expect(selectedData.length).toBe(1);
+            expect(selectedData[0]).toEqual({'Name': 'Laurence Johnson'});
+        });
     });
 
 });

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-selection.spec.ts

@@ -690,22 +690,24 @@ describe('IgxTreeGrid - Selection #tGrid', () => {
         it('should return the correct type of cell when clicking on a cells', () => {
             const rows = TreeGridFunctions.getAllRows(fix);
             const normalCells = TreeGridFunctions.getNormalCells(rows[0]);
-            normalCells[0].triggerEventHandler('focus', new Event('focus'));
+            UIInteractions.simulateClickAndSelectCellEvent(normalCells[0]);
+            fix.detectChanges();
 
             expect(treeGrid.selectedCells.length).toBe(1);
             expect(treeGrid.selectedCells[0] instanceof IgxGridCellComponent).toBe(true);
 
             let treeGridCell = TreeGridFunctions.getTreeCell(rows[0]);
-            treeGridCell.triggerEventHandler('focus', new Event('focus'));
+            UIInteractions.simulateClickAndSelectCellEvent(treeGridCell);
+            fix.detectChanges();
 
             expect(treeGrid.selectedCells.length).toBe(1);
             expect(treeGrid.selectedCells[0] instanceof IgxTreeGridCellComponent).toBe(true);
 
             // perform 2 clicks and check selection again
             treeGridCell = TreeGridFunctions.getTreeCell(rows[0]);
-            treeGridCell.triggerEventHandler('focus', new Event('focus'));
+            UIInteractions.simulateClickAndSelectCellEvent(treeGridCell);
             treeGridCell = TreeGridFunctions.getTreeCell(rows[0]);
-            treeGridCell.triggerEventHandler('focus', new Event('focus'));
+            UIInteractions.simulateClickAndSelectCellEvent(treeGridCell);
             fix.detectChanges();
 
             expect(treeGrid.selectedCells.length).toBe(1);
@@ -717,21 +719,24 @@ describe('IgxTreeGrid - Selection #tGrid', () => {
 
             // level 1
             let treeGridCell = TreeGridFunctions.getTreeCell(rows[0]);
-            treeGridCell.triggerEventHandler('focus', new Event('focus'));
+            UIInteractions.simulateClickAndSelectCellEvent(treeGridCell);
+            fix.detectChanges();
             expect(treeGrid.selectedCells.length).toBe(1);
             expect(treeGrid.selectedCells[0] instanceof IgxGridCellComponent).toBe(true);
             expect(treeGrid.selectedCells[0].value).toBe(147);
 
             // level 2
             treeGridCell = TreeGridFunctions.getTreeCell(rows[1]);
-            treeGridCell.triggerEventHandler('focus', new Event('focus'));
+            UIInteractions.simulateClickAndSelectCellEvent(treeGridCell);
+            fix.detectChanges();
             expect(treeGrid.selectedCells.length).toBe(1);
             expect(treeGrid.selectedCells[0] instanceof IgxGridCellComponent).toBe(true);
             expect(treeGrid.selectedCells[0].value).toBe(475);
 
             // level 3
             treeGridCell = TreeGridFunctions.getTreeCell(rows[2]);
-            treeGridCell.triggerEventHandler('focus', new Event('focus'));
+            UIInteractions.simulateClickAndSelectCellEvent(treeGridCell);
+            fix.detectChanges();
             expect(treeGrid.selectedCells.length).toBe(1);
             expect(treeGrid.selectedCells[0] instanceof IgxGridCellComponent).toBe(true);
             expect(treeGrid.selectedCells[0].value).toBe(957);