Merge branch '19.2.x' into gedinakova/advanced-filtering-resources-15788

Author: gedinakova

package-lock.json

@@ -74,7 +74,7 @@
     "@types/source-map": "0.5.2",
     "express": "^4.21.1",
     "fflate": "^0.8.1",
-    "igniteui-theming": "^17.2.0",
+    "igniteui-theming": "^18.0.1",
     "igniteui-trial-watermark": "^3.0.2",
     "lodash-es": "^4.17.21",
     "rxjs": "^7.8.2",

package.json

@@ -73,7 +73,7 @@
         "tslib": "^2.3.0",
         "igniteui-trial-watermark": "^3.0.2",
         "lodash-es": "^4.17.21",
-        "igniteui-theming": "^17.2.0",
+        "igniteui-theming": "^18.0.1",
         "@igniteui/material-icons-extended": "^3.1.0"
     },
     "peerDependencies": {

projects/igniteui-angular/package.json

@@ -187,6 +187,7 @@
         button-ripple-color: $button-ripple-color,
         border-color: $border-color,
         border-radius: $border-radius,
+        border-color--hover: $border-color--hover,
         theme: map.get($schema, '_meta', 'theme'),
         _meta: map.merge(if($meta, $meta, ()), (
             variant: map.get($schema, '_meta', 'theme'),
@@ -409,7 +410,7 @@
             &:focus {
                 border-top: rem(1px) solid transparent;
                 border-inline: none;
-                border-bottom: rem(1px) solid var-get($theme, 'border-color');
+                border-bottom: rem(1px) solid var-get($theme, 'border-color--hover');
             }
 
             igx-icon {

projects/igniteui-angular/src/lib/core/styles/components/tabs/_tabs-theme.scss

@@ -47,8 +47,8 @@ import { IgxHierarchicalGridExportComponent,
 import { IgxHierarchicalGridComponent } from '../../grids/hierarchical-grid/public_api';
 import { IgxHierarchicalRowComponent } from '../../grids/hierarchical-grid/hierarchical-row.component';
 import { GridFunctions } from '../../test-utils/grid-functions.spec';
-import { IgxPivotGridMultipleRowComponent, IgxPivotGridTestComplexHierarchyComponent } from '../../test-utils/pivot-grid-samples.spec';
-import { IgxPivotGridComponent, PivotRowLayoutType } from '../../grids/pivot-grid/public_api';
+import { IgxPivotGridMultipleRowComponent, IgxPivotGridTestComplexHierarchyComponent, SALES_DATA } from '../../test-utils/pivot-grid-samples.spec';
+import { IgxPivotGridComponent, IgxPivotNumericAggregate, PivotRowLayoutType } from '../../grids/pivot-grid/public_api';
 
 describe('Excel Exporter', () => {
     let exporter: IgxExcelExporterService;
@@ -1461,7 +1461,7 @@ describe('Excel Exporter', () => {
         let grid: IgxPivotGridComponent;
 
         beforeEach(waitForAsync(() => {
-            options = createExportOptions('PivotGridGridExcelExport');
+            options = createExportOptions('PivotGridExcelExport');
         }));
 
         it('should export pivot grid', async () => {
@@ -1486,6 +1486,80 @@ describe('Excel Exporter', () => {
             await exportAndVerify(grid, options, actualData.exportPivotGridDataWithHeaders, false);
         });
 
+        it('should export pivot grid with hierarchical row dimensions.', async () => {
+            fix = TestBed.createComponent(IgxPivotGridMultipleRowComponent);
+            fix.detectChanges();
+
+            grid = fix.componentInstance.pivotGrid;
+            fix.componentInstance.data = SALES_DATA;
+            fix.componentInstance.pivotConfigHierarchy = {
+                rows: [
+                    {                     
+                        memberName: 'All_Srep Code Alts',
+                        enabled: true,
+                        width: '150px',
+                        childLevel: {
+                            memberName: 'SREP_CODE_ALT',
+                            displayName: 'Srep Code Alt',
+                            sortDirection: 1,
+                            enabled: true,
+                        },
+                    },
+                    {
+                        memberName: 'All_Srep Codes',
+                        enabled: true,
+                        width: '150px',
+                            childLevel: {
+                            memberName: 'SREP_CODE',
+                            displayName: 'Srep Code',
+                            sortDirection: 1,
+                            enabled: true,
+                        },
+                    },
+                    {
+                        memberName: 'All_Customers',
+                        enabled: true,
+                        width: '150px',
+                        childLevel: {
+                            memberName: 'CUST_CODE',
+                            displayName: 'Customer',
+                            sortDirection: 1,
+                            enabled: true,
+                        },
+                    }
+                ],
+                columns: [],
+                values: [
+                  {
+                    member: 'JOBS',
+                    aggregate: {
+                      key: 'Count of Jobs',
+                      aggregator: IgxPivotNumericAggregate.count,
+                      label: 'Count of Jobs',
+                    },
+                    enabled: true,
+                    dataType: 'number',
+                  },
+                  {
+                    member: 'INV_SALES',
+                    aggregate: {
+                      key: 'Sum of Sales',
+                      aggregator: IgxPivotNumericAggregate.sum,
+                      label: 'Sum of Sales',
+                    },
+                    enabled: true,
+                    dataType: 'number',
+                  },
+                ],
+                filters: [],
+              };
+            grid.pivotUI.showRowHeaders = true;
+            fix.detectChanges();
+            await wait(300);
+
+            await exportAndVerify(grid, options, actualData.exportPivotGridHierarchicalRowDimensions, false);
+        });
+
         it('should export hierarchical pivot grid', async () => {
             fix = TestBed.createComponent(IgxPivotGridTestComplexHierarchyComponent);
             fix.detectChanges();

projects/igniteui-angular/src/lib/services/excel/excel-exporter-grid.spec.ts

@@ -632,7 +632,7 @@ export class WorksheetFile implements IExcelFile {
         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
@@ -644,7 +644,10 @@ export class WorksheetFile implements IExcelFile {
                 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)