Merge remote-tracking branch 'remotes/origin/master' into vslavov/tree-POC

Author: ViktorSlavov

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

@@ -6749,6 +6749,10 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
             selectionMap.push([activeEl.row, new Set<number>().add(activeEl.column)]);
         }
 
+        if (this.cellSelection === GridSelectionMode.none && activeEl) {
+            selectionMap.push([activeEl.row, new Set<number>().add(activeEl.column)]);
+        }
+
         // eslint-disable-next-line prefer-const
         for (let [row, set] of selectionMap) {
             row = this.paging ? row + (this.perPage * this.page) : row;

projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts

@@ -136,7 +136,7 @@ export class IgxGridNavigationService {
             const shouldClearSelection = hasLastActiveNode && (this.lastActiveNode.row < 0 || this.lastActiveNode.row > gridRows - 1);
             this.setActiveNode(this.lastActiveNode.row >= 0 && this.lastActiveNode.row < gridRows ?
                 this.firstVisibleNode(this.lastActiveNode.row) : this.firstVisibleNode());
-            if (shouldClearSelection) {
+            if (shouldClearSelection || (this.grid.cellSelection !== GridSelectionMode.multiple)) {
                 this.grid.clearCellSelection();
                 this.grid.navigateTo(this.activeNode.row, this.activeNode.column, (obj) => {
                     obj.target?.activate(event);

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

@@ -418,7 +418,7 @@ describe('IgxGrid - Cell selection #grid', () => {
             GridSelectionFunctions.verifyCellsRegionSelected(grid, 0, 2, 1, 2, false);
             expect(rangeChangeSpy).toHaveBeenCalledTimes(1);
             expect(grid.selectedCells.length).toBe(0);
-            expect(grid.getSelectedData()).toEqual([]);
+            expect(grid.getSelectedData().length).toBe(1);
             expect(grid.getSelectedRanges()).toEqual([]);
         });
 
@@ -2918,7 +2918,7 @@ describe('IgxGrid - Cell selection #grid', () => {
             GridSelectionFunctions.verifyCellSelected(secondCell, false);
             GridSelectionFunctions.verifyCellSelected(thirdCell, false);
             expect(grid.selectedCells.length).toBe(0);
-            expect(grid.getSelectedData()).toEqual([]);
+            expect(grid.getSelectedData().length).toBe(1);
             expect(grid.getSelectedRanges()).toEqual([]);
         });
 
@@ -2963,7 +2963,7 @@ describe('IgxGrid - Cell selection #grid', () => {
             cell = grid.getCellByColumn(1, 'ParentID');
             GridSelectionFunctions.verifyCellSelected(cell, false);
             expect(grid.selectedCells.length).toBe(0);
-            expect(grid.getSelectedData()).toEqual([]);
+            expect(grid.getSelectedData().length).toBe(1);
             expect(grid.getSelectedRanges()).toEqual([]);
         });
 
@@ -2980,7 +2980,7 @@ describe('IgxGrid - Cell selection #grid', () => {
             GridSelectionFunctions.verifyCellSelected(endCell, false);
             expect(rangeChangeSpy).toHaveBeenCalledTimes(0);
             expect(grid.selectedCells.length).toBe(0);
-            expect(grid.getSelectedData()).toEqual([]);
+            expect(grid.getSelectedData().length).toBe(1);
             expect(grid.getSelectedRanges()).toEqual([]);
         });
 

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

@@ -80,7 +80,7 @@ describe('IgxTreeGrid - Multi Cell selection #tGrid', () => {
             GridSelectionFunctions.verifyCellsRegionSelected(treeGrid, 0, 2, 0, 0, false);
             expect(rangeChangeSpy).toHaveBeenCalledTimes(1);
             expect(treeGrid.selectedCells.length).toBe(0);
-            expect(treeGrid.getSelectedData()).toEqual([]);
+            expect(treeGrid.getSelectedData().length).toBe(1);
             expect(treeGrid.getSelectedRanges()).toEqual([]);
         });