Merge pull request #17300 from IgniteUI/ganastasov/fix-17295-21.2.x

fix(hierarchical-grid): align selected data with expanded row indexes - 21.2.x

Author: kacheshmarova

projects/igniteui-angular-elements/src/analyzer/elements.config.ts

@@ -585,6 +585,7 @@ export var registerConfig = [
     methods: [
       "getRowByIndex",
       "getRowByKey",
+      "getSelectedData",
       "getCellByColumn",
       "getCellByKey",
       "pinRow",
@@ -631,7 +632,6 @@ export var registerConfig = [
       "clearCellSelection",
       "selectRange",
       "getSelectedRanges",
-      "getSelectedData",
       "selectedColumns",
       "selectColumns",
       "deselectColumns",

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

@@ -7433,7 +7433,7 @@ export abstract class IgxGridBaseDirective implements GridType,
         const keysAndData = [];
         const activeEl = this.selectionService.activeElement;
 
-        if (this.type === 'hierarchical') {
+        if (this.type === 'hierarchical' && source === this.filteredSortedData) {
             const expansionRowIndexes = [];
             for (const [key, value] of this.expansionStates.entries()) {
                 if (value) {

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

@@ -802,6 +802,29 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
             .reduce((a, b) => a.concat(b), []);
     }
 
+    /**
+     *
+     * Returns an array of the current cell selection in the form of `[{ column.field: cell.value }, ...]`.
+     *
+     * @remarks
+     * If `formatters` is enabled, the cell value will be formatted by its respective column formatter (if any).
+     * If `headers` is enabled, it will use the column header (if any) instead of the column field.
+     */
+    public override getSelectedData(formatters = false, headers = false): any[] {
+        const source: any[] = [];
+
+        const process = (record: any) => {
+            if (this.isChildGridRecord(record)) {
+                source.push(null);
+                return;
+            }
+            source.push(this.isGhostRecord(record) || this.isRecordMerged(record) ? record.recordRef : record);
+        };
+
+        this.dataView.forEach(process);
+        return this.extractDataFromSelection(source, formatters, headers);
+    }
+
     /**
      * Returns a `CellType` object that matches the conditions.
      *
@@ -1165,7 +1188,6 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
         super.initColumns(collection, cb);
     }
 
-
     protected override setupColumns() {
         if (this.parentIsland && this.parentIsland.childColumns.length > 0 && !this.autoGenerate) {
             this.createColumnsList(this.parentIsland.childColumns.toArray());

projects/igniteui-angular/grids/hierarchical-grid/src/hierarchical-grid.integration.spec.ts

@@ -7,6 +7,7 @@ import { IgxColumnMovingDragDirective, IgxGridNavigationService } from 'igniteui
 import { IgxHierarchicalRowComponent } from './hierarchical-row.component';
 import { take } from 'rxjs/operators';
 import {
+    IgxHierarchicalGridEmptyDataExportComponent,
     IgxHierarchicalGridTestBaseComponent,
     IgxHierarchicalGridTestCustomToolbarComponent,
     IgxHierarchicalGridTestInputPaginatorComponent,
@@ -35,6 +36,7 @@ describe('IgxHierarchicalGrid Integration #hGrid', () => {
         TestBed.configureTestingModule({
             imports: [
                 NoopAnimationsModule,
+                IgxHierarchicalGridEmptyDataExportComponent,
                 IgxHierarchicalGridTestBaseComponent,
                 IgxHierarchicalGridTestCustomToolbarComponent,
                 IgxHierarchicalGridWithTransactionProviderComponent,
@@ -162,6 +164,39 @@ describe('IgxHierarchicalGrid Integration #hGrid', () => {
             expect(fChildCell.selected).toBeFalsy();
             expect(fCell.selected).toBeTruthy();
         }));
+
+        it('should not copy the previous row value from an expanded parent row', fakeAsync(() => {
+            const singersFixture = TestBed.createComponent(IgxHierarchicalGridEmptyDataExportComponent);
+            const singersData = SampleTestData.hierarchicalGridSingersFullData();
+            (singersFixture.componentInstance as { data: unknown[] }).data = singersData;
+            singersFixture.detectChanges();
+
+            const grid = singersFixture.componentInstance.hGrid;
+
+            const previousArtist = singersData[1].Artist;
+            const targetArtist = singersData[2].Artist;
+            const targetRow = grid.dataRowList.toArray()
+                .find(row => row.data.Artist === targetArtist) as IgxHierarchicalRowComponent | undefined;
+
+            expect(targetRow).toBeDefined();
+            targetRow!.toggle();
+            tick(DEBOUNCE_TIME);
+            singersFixture.detectChanges();
+
+            grid.selectRange({
+                rowStart: targetRow!.index,
+                rowEnd: targetRow!.index,
+                columnStart: 'Artist',
+                columnEnd: 'Artist'
+            });
+            singersFixture.detectChanges();
+
+            expect(targetRow!.expanded).toBeTruthy();
+
+            const selectedData = grid.getSelectedData();
+            expect(selectedData).toEqual([{ Artist: targetArtist }]);
+            expect(selectedData[0].Artist).not.toBe(previousArtist);
+        }));
     });
 
     describe('Updating', () => {