Merge branch '9.0.x' into mvenkov/input-with-null-value-9.0

Author: kdinev

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

@@ -1100,11 +1100,11 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
      * @inheritdoc
      */
     getSelectedData(formatters = false, headers = false): any[] {
-        if (this.groupingExpressions.length) {
+        if (this.groupingExpressions.length || this.hasDetails) {
             const source = [];
 
             const process = (record) => {
-                if (record.expression || record.summaries) {
+                if (record.expression || record.summaries || this.isDetailRecord(record)) {
                     source.push(null);
                     return;
                 }

projects/igniteui-angular/src/lib/grids/grid/grid.master-detail.spec.ts

@@ -1,5 +1,5 @@
 import { Component, ViewChild, OnInit } from '@angular/core';
-import { async, TestBed, ComponentFixture } from '@angular/core/testing';
+import { async, TestBed, ComponentFixture, fakeAsync, tick } from '@angular/core/testing';
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
@@ -799,10 +799,13 @@ describe('IgxGrid Master Detail #grid', () => {
         });
 
         describe('Cell Selection', () => {
-            it('Should exclude expanded detail views when doing range cell selection', () => {
+            beforeEach(fakeAsync(() => {
                 fix = TestBed.createComponent(DefaultGridMasterDetailComponent);
                 grid = fix.componentInstance.grid;
                 fix.detectChanges();
+            }));
+
+            it('Should exclude expanded detail views when doing range cell selection', fakeAsync(() => {
                 grid.expandRow(fix.componentInstance.data[2].ID);
                 const selectionChangeSpy = spyOn<any>(grid.onRangeSelection, 'emit').and.callThrough();
                 const startCell =  grid.getCellByColumn(1, 'ContactName');
@@ -837,7 +840,23 @@ describe('IgxGrid Master Detail #grid', () => {
                 expect(selectionChangeSpy).toHaveBeenCalledTimes(1);
                 expect(selectionChangeSpy).toHaveBeenCalledWith(range);
                 expect(rowDetail.querySelector('[class*="selected"]')).toBeNull();
-            });
+            }));
+
+            it('getSelectedData should return correct values when there are master details', fakeAsync(() => {
+                const range = { rowStart: 0, rowEnd: 5, columnStart: 'ContactName', columnEnd: 'ContactName' };
+                const expectedData = [
+                    { ContactName: 'Maria Anders' },
+                    { ContactName: 'Ana Trujillo' },
+                    { ContactName: 'Antonio Moreno' }
+                ];
+                grid.expandAll();
+                tick(100);
+                fix.detectChanges();
+
+                grid.selectRange(range);
+                fix.detectChanges();
+                expect(grid.getSelectedData()).toEqual(expectedData);
+            }));
         });
 
         describe('Row Selection', () => {
@@ -1070,10 +1089,12 @@ describe('IgxGrid Master Detail #grid', () => {
         describe('GroupBy', () => {
             beforeEach(async() => {
                 fix = TestBed.createComponent(DefaultGridMasterDetailComponent);
-                fix.componentInstance.columns[0].hasSummary = true;
                 fix.detectChanges();
 
                 grid = fix.componentInstance.grid;
+                grid.getColumnByName('ContactName').hasSummary = true;
+                fix.detectChanges();
+
                 grid.summaryCalculationMode = GridSummaryCalculationMode.childLevelsOnly;
                 grid.groupingExpressions =
                 [{ fieldName: 'CompanyName', dir: SortingDirection.Asc, ignoreCase: false }];
@@ -1162,9 +1183,7 @@ describe('IgxGrid Master Detail #grid', () => {
     template: `
         <igx-grid [data]="data" [width]="width" [height]="height" [primaryKey]="'ID'" [allowFiltering]='true'
         [paging]="paging" [perPage]="perPage" [rowSelectable]="rowSelectable">
-            <igx-column *ngFor="let c of columns" [field]="c.field" [header]="c.field" [width]="c.width" [dataType]='c.dataType'
-                [hidden]='c.hidden' [sortable]="c.sortable" [movable]='c.movable' [groupable]='c.groupable' [editable]="c.editable"
-                [hasSummary]="c.hasSummary" [pinned]='c.pinned'>
+            <igx-column *ngFor="let c of columns" [field]="c.field" [width]="c.width" [dataType]='c.dataType'>
             </igx-column>
 
             <ng-template igxGridDetail let-dataItem>
@@ -1203,9 +1222,7 @@ export class DefaultGridMasterDetailComponent {
     template: `
         <igx-grid [data]="data" [expansionStates]='expStates'
          [width]="width" [height]="height" [primaryKey]="'ID'" [paging]="paging" [rowSelectable]="rowSelectable">
-            <igx-column *ngFor="let c of columns" [field]="c.field" [header]="c.field" [width]="c.width" [dataType]='c.dataType'
-                [hidden]='c.hidden' [sortable]="c.sortable" [movable]='c.movable' [groupable]='c.groupable' [editable]="c.editable"
-                [hasSummary]="c.hasSummary" [pinned]='c.pinned'>
+            <igx-column *ngFor="let c of columns" [field]="c.field" [header]="c.field" [width]="c.width" [dataType]='c.dataType'>
             </igx-column>
 
             <ng-template igxGridDetail let-dataItem>