Merge branch 'master' into enrich-deprecation-msgs-m

Author: zdrawku

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

@@ -105,7 +105,6 @@ describe('CSV Grid Exporter', () => {
 
         const grid = fix.componentInstance.grid;
         grid.columns[0].hidden = true;
-        options.ignoreColumnsOrder = true;
         options.ignoreColumnsVisibility = false;
 
         fix.detectChanges();

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

@@ -121,7 +121,6 @@ describe('Excel Exporter', () => {
 
             const grid = fix.componentInstance.grid;
             grid.columns[0].hidden = true;
-            options.ignoreColumnsOrder = true;
             options.ignoreColumnsVisibility = false;
             fix.detectChanges();
 

projects/igniteui-angular/src/lib/services/exporter-common/base-export-service.ts

@@ -151,7 +151,7 @@ export abstract class IgxBaseExporter {
         columns.forEach((column) => {
             const columnHeader = !ExportUtilities.isNullOrWhitespaces(column.header) ? column.header : column.field;
             const exportColumn = !column.hidden || options.ignoreColumnsVisibility;
-            const index = options.ignoreColumnsOrder ? column.index : column.visibleIndex;
+            const index = options.ignoreColumnsOrder || options.ignoreColumnsVisibility ? column.index : column.visibleIndex;
             const columnWidth = Number(column.width.slice(0, -2));
 
             const columnInfo = {