igniteui-angular 18.2.23 → 18.2.25

package/fesm2022/igniteui-angular.mjs

@@ -3000,31 +3000,49 @@ class IgxBaseExporter {
         if (keys.length === 0) {
             return;
         }
-        let startIndex = 0;
-        const key = keys[0];
         const records = this.flatRecords.map(r => r.data);
-        const groupedRecords = {};
-        records.forEach(obj => {
-            const keyValue = obj[key.name];
-            if (!groupedRecords[keyValue]) {
-                groupedRecords[keyValue] = [];
-            }
-            groupedRecords[keyValue].push(obj);
-        });
-        if (columnGroupParent) {
-            const mapKeys = [...this.pivotGridKeyValueMap.keys()];
-            const mapValues = [...this.pivotGridKeyValueMap.values()];
-            for (const k of Object.keys(groupedRecords)) {
-                groupedRecords[k] = groupedRecords[k].filter(row => mapKeys.every(mk => Object.keys(row).includes(mk))
-                    && mapValues.every(mv => Object.values(row).includes(mv)));
-                if (groupedRecords[k].length === 0) {
-                    delete groupedRecords[k];
-                }
-            }
+        const groupedRecords = this.groupByKeys(records, keys);
+        this.createRowDimension(groupedRecords, keys, columnGroupParent);
+    }
+    groupByKeys(items, keys) {
+        const group = (data, groupKeys) => {
+            if (groupKeys.length === 0)
+                return data;
+            const newKeys = [...groupKeys];
+            const key = newKeys.shift().name;
+            const map = new Map();
+            for (const item of data) {
+                const keyValue = item[key];
+                if (!map.has(keyValue)) {
+                    map.set(keyValue, []);
+                }
+                map.get(keyValue).push(item);
+            }
+            for (const [keyValue, value] of map) {
+                map.set(keyValue, group(value, newKeys));
+            }
+            return map;
+        };
+        return group(items, keys);
+    }
+    calculateRowSpan(value) {
+        if (value instanceof Map) {
+            return Array.from(value.values()).reduce((total, current) => total + this.calculateRowSpan(current), 0);
+        }
+        else if (Array.isArray(value)) {
+            return value.length;
         }
-        for (const k of Object.keys(groupedRecords)) {
+        return 0;
+    }
+    createRowDimension(node, keys, columnGroupParent) {
+        if (!(node instanceof Map))
+            return;
+        const key = keys[0];
+        const newKeys = keys.filter(k => k.level > key.level);
+        let startIndex = 0;
+        for (const k of node.keys()) {
             let groupKey = k;
-            const rowSpan = groupedRecords[k].length;
+            const rowSpan = this.calculateRowSpan(node.get(k));
             const rowDimensionColumn = {
                 columnSpan: 1,
                 rowSpan,
@@ -3035,30 +3053,26 @@ class IgxBaseExporter {
                 pinnedIndex: 0,
                 level: key.level,
                 dataType: 'string',
-                headerType: groupedRecords[groupKey].length > 1 ? ExportHeaderType.MultiRowHeader : ExportHeaderType.RowHeader,
+                headerType: rowSpan > 1 ? ExportHeaderType.MultiRowHeader : ExportHeaderType.RowHeader,
             };
-            if (groupKey === 'undefined') {
-                this.pivotGridColumns[this.pivotGridColumns.length - 1].columnSpan += 1;
+            if (!groupKey) {
+                // if (this.pivotGridColumns?.length)
+                //     this.pivotGridColumns[this.pivotGridColumns.length - 1].columnSpan += 1;
                 rowDimensionColumn.headerType = ExportHeaderType.PivotMergedHeader;
                 groupKey = columnGroupParent;
             }
-            if (columnGroupParent) {
+            if (key.level > 0) {
                 rowDimensionColumn.columnGroupParent = columnGroupParent;
             }
             else {
                 rowDimensionColumn.columnGroup = groupKey;
             }
             this.pivotGridColumns.push(rowDimensionColumn);
-            if (keys.length > 1) {
-                if (groupKey !== columnGroupParent) {
-                    this.pivotGridKeyValueMap.set(key.name, groupKey);
-                }
-                const newKeys = keys.filter(kdd => kdd !== key);
-                this.preparePivotGridColumns(newKeys, groupKey);
-                this.pivotGridKeyValueMap.delete(key.name);
-            }
             startIndex += rowSpan;
         }
+        for (const k of node.keys()) {
+            this.createRowDimension(node.get(k), newKeys, columnGroupParent);
+        }
     }
     addLevelColumns() {
         if (this.options.exportSummaries && this.summaries.size > 0) {
@@ -4166,7 +4180,7 @@ class WorksheetFile {
             : owner.maxLevel;
         for (const currentCol of headersForLevel) {
             const spanLength = isVertical ? currentCol.rowSpan : currentCol.columnSpan;
-            if (currentCol.level === i && currentCol.headerType !== ExportHeaderType.PivotMergedHeader) {
+            if (currentCol.level === i) {
                 let columnCoordinate;
                 const column = isVertical
                     ? this.rowIndex
@@ -4177,7 +4191,9 @@ class WorksheetFile {
                 if (currentCol.headerType === ExportHeaderType.PivotRowHeader) {
                     rowCoordinate = startValue + 1;
                 }
-                const columnValue = dictionary.saveValue(currentCol.header, true, false);
+                const columnValue = currentCol.headerType === ExportHeaderType.PivotMergedHeader ?
+                    dictionary.saveValue(currentCol.field, true, true) :
+                    dictionary.saveValue(currentCol.header, true, false);
                 columnCoordinate = (currentCol.field === GRID_LEVEL_COL
                     ? ExcelStrings.getExcelColumn(worksheetData.columnCount + 1)
                     : ExcelStrings.getExcelColumn(column)) + rowCoordinate;
@@ -19631,6 +19647,7 @@ class IgxTooltipTargetDirective extends IgxToggleActionDirective {
      * @hidden
      */
     ngOnDestroy() {
+        this.hideTooltip();
         this.destroy$.next();
         this.destroy$.complete();
     }