Merge branch 'pivot-grid-master' of https://github.com/IgniteUI/igniteui-angular into dkamburov/pivot-keyboard-nav

Author: mddragnev

projects/igniteui-angular/src/lib/data-operations/pivot-strategy.ts

@@ -28,47 +28,58 @@ export class PivotRowDimensionsStrategy implements IPivotDimensionStrategy {
     }
 
     public process(
-            collection: any,
-            rows: IPivotDimension[],
-            values?: IPivotValue[],
-            pivotKeys: IPivotKeys =
-            { aggregations: 'aggregations', records: 'records', children: 'children', level: 'level'}
-        ): any[] {
-            let hierarchies;
-            let data;
-            const prevRowDims = [];
-            let prevDim;
-            const currRows = cloneArray(rows, true);
-            PivotUtil.assignLevels(currRows);
-            for (const row of currRows) {
-                if (!data) {
-                    // build hierarchies - groups and subgroups
-                    hierarchies = PivotUtil.getFieldsHierarchy(collection, [row], PivotDimensionType.Row, pivotKeys);
-                    // generate flat data from the hierarchies
-                    data = PivotUtil.processHierarchy(hierarchies, collection[0] ?? [], pivotKeys, 0, true);
-                    prevRowDims.push(row);
-                    prevDim = row;
-                } else {
-                    const newData = [...data];
-                    for (let i = 0; i < newData.length; i++) {
-                        const currData = newData[i][prevDim.memberName + '_' + pivotKeys.records];
-                        const leafData = PivotUtil.getDirectLeafs(currData, pivotKeys);
-                        const hierarchyFields = PivotUtil
-                            .getFieldsHierarchy(leafData, [row], PivotDimensionType.Row, pivotKeys);
-                        const siblingData = PivotUtil
-                            .processHierarchy(hierarchyFields, newData[i] ?? [], pivotKeys, 0);
-                        PivotUtil.processSiblingProperties(newData[i], siblingData, pivotKeys);
+        collection: any,
+        rows: IPivotDimension[],
+        values?: IPivotValue[],
+        pivotKeys: IPivotKeys =
+            { aggregations: 'aggregations', records: 'records', children: 'children', level: 'level' }
+    ): any[] {
+        let hierarchies;
+        let data;
+        const prevRowDims = [];
+        let prevDim;
+        let prevDimTopRecords = [];
+        const currRows = cloneArray(rows, true);
+        PivotUtil.assignLevels(currRows);
+        for (const row of currRows) {
+            if (!data) {
+                // build hierarchies - groups and subgroups
+                hierarchies = PivotUtil.getFieldsHierarchy(collection, [row], PivotDimensionType.Row, pivotKeys);
+                // generate flat data from the hierarchies
+                data = PivotUtil.processHierarchy(hierarchies, collection[0] ?? [], pivotKeys, 0, true);
+                prevRowDims.push(row);
+                prevDim = row;
+                prevDimTopRecords = data;
+            } else {
+                const newData = [...data];
+                const curDimTopRecords = [];
+                for (let i = 0; i < newData.length; i++) {
+                    const currData = newData[i][prevDim.memberName + '_' + pivotKeys.records];
+                    const leafData = PivotUtil.getDirectLeafs(currData, pivotKeys);
+                    const hierarchyFields = PivotUtil
+                        .getFieldsHierarchy(leafData, [row], PivotDimensionType.Row, pivotKeys);
+                    const siblingData = PivotUtil
+                        .processHierarchy(hierarchyFields, newData[i] ?? [], pivotKeys, 0);
+                    PivotUtil.processSiblingProperties(newData[i], siblingData, pivotKeys);
 
                     PivotUtil.processSubGroups(row, prevRowDims.slice(0), siblingData, pivotKeys);
-                    if (PivotUtil.getDimensionDepth(prevDim) > PivotUtil.getDimensionDepth(row) && siblingData.length > 1) {
+                    if ((prevDimTopRecords[i].length != undefined && prevDimTopRecords[i].length < siblingData.length) || prevDimTopRecords.length < siblingData.length) {
+                        // Add the sibling data as child records because the previous dimension contains more dense version of the previous dimension records.
                         newData[i][row.memberName + '_' + pivotKeys.records] = siblingData;
                     } else {
+                        // Replace the current record with the sibling records because the current dimension is a denser version or produces the same amount of records.
                         newData.splice(i, 1, ...siblingData);
+                        // Shift the prevDimTopRecords item to the right because of the previous row transforms the newData and increases the elements in newData
+                        prevDimTopRecords.splice(siblingData.length, prevDimTopRecords.length - siblingData.length, ...prevDimTopRecords);
+                        // Increase the index the amount of sibling record that replaces the current one. Subtract 1 because there is already i++ in the for cycle.
                         i += siblingData.length - 1;
                     }
+                    // Add the current top sibling elements for the dimension
+                    curDimTopRecords.push(cloneArray(siblingData, true));
                 }
                 data = newData;
                 prevDim = row;
+                prevDimTopRecords = curDimTopRecords;
                 prevRowDims.push(row);
             }
         }

projects/igniteui-angular/src/lib/grids/common/grid.interface.ts

@@ -34,7 +34,7 @@ import { IGridGroupingStrategy, IGridSortingStrategy } from './strategy';
 import { IForOfState, IgxGridForOfDirective } from '../../directives/for-of/for_of.directive';
 import { OverlaySettings } from '../../services/overlay/utilities';
 import { IPinningConfig } from '../grid.common';
-import { IDimensionsChange, IPivotConfiguration, IPivotDimension, IPivotValue, IValuesChange } from '../pivot-grid/pivot-grid.interface';
+import { IDimensionsChange, IPivotConfiguration, IPivotDimension, IPivotKeys, IPivotValue, IValuesChange } from '../pivot-grid/pivot-grid.interface';
 
 
 export const IGX_GRID_BASE = new InjectionToken<GridType>('IgxGridBaseToken');
@@ -631,6 +631,7 @@ export interface PivotGridType extends GridType {
     resolveRowDimensionWidth(dim: IPivotDimension): number;
     dimensionsChange: EventEmitter<IDimensionsChange>;
     valuesChange: EventEmitter<IValuesChange>;
+    pivotKeys: IPivotKeys;
 }
 export interface GridSVGIcon {
     name: string;

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

@@ -5909,51 +5909,6 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
         }
     }
 
-    protected _createColumn(col) {
-        let ref;
-        if (col instanceof IgxColumnGroupComponent) {
-            ref = this._createColGroupComponent(col);
-        } else {
-            ref = this._createColComponent(col);
-        }
-        return ref;
-    }
-
-    protected _createColGroupComponent(col: IgxColumnGroupComponent) {
-        const factoryGroup = this.resolver.resolveComponentFactory(IgxColumnGroupComponent);
-        const ref = this.viewRef.createComponent(factoryGroup, null, this.viewRef.injector);
-        ref.changeDetectorRef.detectChanges();
-        factoryGroup.inputs.forEach((input) => {
-            const propName = input.propName;
-            ref.instance[propName] = col[propName];
-        });
-        if (col.children.length > 0) {
-            const newChildren = [];
-            col.children.forEach(child => {
-                const newCol = this._createColumn(child).instance;
-                newCol.parent = ref.instance;
-                newChildren.push(newCol);
-            });
-            ref.instance.children.reset(newChildren);
-            ref.instance.children.notifyOnChanges();
-        }
-        return ref;
-    }
-
-    protected _createColComponent(col) {
-        const factoryColumn = this.resolver.resolveComponentFactory(IgxColumnComponent);
-        const ref = this.viewRef.createComponent(factoryColumn, null, this.viewRef.injector);
-        factoryColumn.inputs.forEach((input) => {
-            const propName = input.propName;
-            if (!(col[propName] instanceof IgxSummaryOperand)) {
-                ref.instance[propName] = col[propName];
-            } else {
-                ref.instance[propName] = col[propName].constructor;
-            }
-        });
-        return ref;
-    }
-
     protected switchTransactionService(val: boolean) {
         if (val) {
             this._transactions = this.transactionFactory.create(TRANSACTION_TYPE.Base);

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.html

@@ -34,7 +34,7 @@
         | pivotGridSort:pivotConfiguration:sortStrategy:id:pipeTrigger
         | pivotGridRow:pivotConfiguration:expansionStates:pipeTrigger:sortingExpressions
         | pivotGridColumn:pivotConfiguration:expansionStates:pipeTrigger:sortingExpressions
-        | pivotGridColumnSort:sortingExpressions:sortStrategy:pipeTrigger
+        | pivotGridColumnSort:sortingExpressions:sortStrategy:pipeTrigger:pivotKeys
         | pivotGridRowExpansion:pivotConfiguration:expansionStates:defaultExpandState:pipeTrigger"
             let-rowIndex="index" [igxForScrollOrientation]="'vertical'" [igxForScrollContainer]='verticalScroll'
             [igxForContainerSize]='calcHeight'
@@ -119,7 +119,7 @@
     <div class="igx-grid__tr--header">
         <igx-icon [attr.draggable]="false"
                   (click)="toggleColumn(column)">
-                  {{columnGroupStates.get(column.field) ? 'expand_more' : 'expand_less'}}</igx-icon>
+                  {{getColumnGroupExpandState(column) ? 'chevron_right' : 'expand_more'}}</igx-icon>
         {{column.header}}
     </div>
 </ng-template>