igniteui-angular 18.2.21 → 18.2.23

package/fesm2022/igniteui-angular.mjs

@@ -2267,11 +2267,15 @@ class IgxBaseExporter {
         if (!isSpecialData) {
             const owner = record.owner === undefined ? DEFAULT_OWNER : record.owner;
             const ownerCols = this._ownersMap.get(owner).columns;
+            const hasRowHeaders = ownerCols.some(c => c.headerType === ExportHeaderType.RowHeader);
             if (record.type !== ExportRecordType.HeaderRecord) {
                 const columns = ownerCols
                     .filter(c => c.headerType === ExportHeaderType.ColumnHeader && !c.skip)
                     .sort((a, b) => a.startIndex - b.startIndex)
                     .sort((a, b) => a.pinnedIndex - b.pinnedIndex);
+                if (hasRowHeaders) {
+                    record.rawData = record.data;
+                }
                 record.data = columns.reduce((a, e) => {
                     if (!e.skip) {
                         let rawValue = resolveNestedPath(record.data, e.field);
@@ -2393,6 +2397,9 @@ class IgxBaseExporter {
             };
             this.flatRecords.push(pivotGridRecord);
         }
+        if (this.flatRecords.length) {
+            this.flatRecords[0].dimensionKeys = Object.values(this.pivotGridRowDimensionsMap);
+        }
     }
     prepareHierarchicalGridData(grid, hasFiltering, hasSorting) {
         const skipOperations = (!hasFiltering || !this.options.ignoreFiltering) &&
@@ -3132,7 +3139,10 @@ class CharSeparatedValueData {
         this._isSpecialData = ExportUtilities.isSpecialData(this._data[0]);
         this._escapeCharacters.push(this._delimiter);
         const headers = columns && columns.length ?
-            columns.map(c => c.header ?? c.field) :
+            /* When column groups are present, always use the field as it indicates the group the column belongs to.
+            * Otherwise, in PivotGrid scenarios we can end up with many duplicated column names without a hint what they represent.
+            */
+            columns.map(c => c.columnGroupParent ? c.field : c.header ?? c.field) :
             keys;
         this._headerRecord = this.processHeaderRecord(headers, this._data.length);
         if (keys.length === 0 || ((!this._data || this._data.length === 0) && keys.length === 0)) {
@@ -3471,9 +3481,28 @@ class IgxCsvExporterService extends IgxBaseExporter {
         this.exportEnded = new EventEmitter();
     }
     exportDataImplementation(data, options, done) {
-        data = data.map((item) => item.data);
+        const dimensionKeys = data[0]?.dimensionKeys;
+        data = dimensionKeys?.length ?
+            data.map((item) => item.rawData) :
+            data.map((item) => item.data);
         const columnList = this._ownersMap.get(DEFAULT_OWNER);
-        const csvData = new CharSeparatedValueData(data, options.valueDelimiter, columnList?.columns);
+        const columns = columnList?.columns.filter(c => c.headerType === ExportHeaderType.ColumnHeader);
+        if (dimensionKeys) {
+            const dimensionCols = dimensionKeys.map((key) => {
+                const columnInfo = {
+                    header: key,
+                    field: key,
+                    dataType: 'string',
+                    skip: false,
+                    headerType: ExportHeaderType.ColumnHeader,
+                    columnSpan: 1,
+                    startIndex: 0
+                };
+                return columnInfo;
+            });
+            columns.unshift(...dimensionCols);
+        }
+        const csvData = new CharSeparatedValueData(data, options.valueDelimiter, columns);
         csvData.prepareDataAsync((r) => {
             this._stringData = r;
             this.saveFile(options);
@@ -18277,7 +18306,7 @@ class IgxTextHighlightDirective {
      */
     activateIfNecessary() {
         const group = this.service.highlightGroupsMap.get(this.groupName);
-        if (group.index >= 0 && group.column === this.column && group.row === this.row && compareMaps(this.metadata, group.metadata)) {
+        if (group && group.index >= 0 && group.column === this.column && group.row === this.row && compareMaps(this.metadata, group.metadata)) {
             this.activate(group.index);
         }
     }