Merge branch 'master' into sstoychev/reemit-events-master

Author: dkamburov

CHANGELOG.md

@@ -13,6 +13,9 @@ All notable changes for each version of this project will be documented in this
     ```
 - `IgxTabs` have full right-to-left (RTL) support.
 
+- `IgxExcelExporterService`
+    - Added support for exporting the grids' headers by default when the data is empty. This behavior can be controlled by the `alwaysExportHeaders` option of the IgxExcelExporterOptions object.
+
 ### General
 
 - `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`

projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.ts

@@ -241,7 +241,7 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
      * this.myToggle.close();
      * ```
      */
-    public close() {
+    public close(event?: Event) {
         //  if toggle is collapsed do nothing
         //  if there is close animation do nothing, toggle will close anyway
         const info = this.overlayService.getOverlayById(this._overlayId);
@@ -250,7 +250,7 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
             return;
         }
 
-        this.overlayService.hide(this._overlayId);
+        this.overlayService.hide(this._overlayId, event);
     }
 
     /**

projects/igniteui-angular/src/lib/drop-down/drop-down.component.spec.ts

@@ -8,7 +8,7 @@ import { IgxDropDownComponent, IgxDropDownModule } from './public_api';
 import { ISelectionEventArgs } from './drop-down.common';
 import { IgxTabsComponent, IgxTabsModule } from '../tabs/tabs/public_api';
 import { UIInteractions, wait } from '../test-utils/ui-interactions.spec';
-import { CancelableEventArgs } from '../core/utils';
+import { CancelableEventArgs, IBaseCancelableBrowserEventArgs } from '../core/utils';
 import { configureTestSuite } from '../test-utils/configure-suite';
 import { take } from 'rxjs/operators';
 import { IgxDropDownGroupComponent } from './drop-down-group.component';
@@ -524,6 +524,47 @@ describe('IgxDropDown ', () => {
                 };
                 expect(dropdown.selectionChanging.emit).toHaveBeenCalledWith(canceledSelectionArgs);
             }));
+            it('should provide correct event argument when closing through keyboard', fakeAsync(() => {
+                spyOn(dropdown.closing, 'emit').and.callThrough();
+                const dropdownElement = fixture.debugElement.query(By.css(`.${CSS_CLASS_DROP_DOWN_BASE}`));
+    
+                dropdown.toggle();
+                tick();
+                fixture.detectChanges();
+                let focusedItem = fixture.debugElement.query(By.css(`.${CSS_CLASS_FOCUSED}`));
+                expect(focusedItem).toBeDefined();
+    
+                let eventArgs: IBaseCancelableBrowserEventArgs;
+                dropdown.closing.pipe(take(1)).subscribe((args: IBaseCancelableBrowserEventArgs) => {
+                    eventArgs = args;
+                });
+    
+                UIInteractions.triggerEventHandlerKeyDown('escape', dropdownElement);
+                tick();
+                fixture.detectChanges();
+                expect(dropdown.closing.emit).toHaveBeenCalledTimes(1);
+                expect(eventArgs.event).toBeDefined();
+                expect((eventArgs.event as KeyboardEvent).type).toEqual('keydown');
+                expect((eventArgs.event as KeyboardEvent).key).toEqual('escape');
+    
+                dropdown.toggle();
+                tick();
+                fixture.detectChanges();
+                focusedItem = fixture.debugElement.query(By.css(`.${CSS_CLASS_FOCUSED}`));
+                expect(focusedItem).toBeDefined();
+    
+                dropdown.closing.pipe(take(1)).subscribe((args: IBaseCancelableBrowserEventArgs) => {
+                    eventArgs = args;
+                });
+    
+                UIInteractions.triggerEventHandlerKeyDown('enter', dropdownElement);
+                tick();
+                fixture.detectChanges();
+                expect(dropdown.closing.emit).toHaveBeenCalledTimes(2);
+                expect(eventArgs.event).toBeDefined();
+                expect((eventArgs.event as KeyboardEvent).type).toEqual('keydown');
+                expect((eventArgs.event as KeyboardEvent).key).toEqual('enter');
+            }));
             it('should be able to change selection when manipulating ISelectionEventArgs', fakeAsync(() => {
                 expect(dropdown.selectedItem).toEqual(null);
                 dropdown.toggle();

projects/igniteui-angular/src/lib/drop-down/drop-down.component.ts

@@ -242,8 +242,8 @@ export class IgxDropDownComponent extends IgxDropDownBaseDirective implements ID
      * this.dropdown.close();
      * ```
      */
-    public close() {
-        this.toggleDirective.close();
+    public close(event?: Event) {
+        this.toggleDirective.close(event);
     }
 
     /**
@@ -438,7 +438,7 @@ export class IgxDropDownComponent extends IgxDropDownBaseDirective implements ID
     /** Keydown Handler */
     public onItemActionKey(key: DropDownActionKey, event?: Event) {
         super.onItemActionKey(key, event);
-        this.close();
+        this.close(event);
     }
 
     /**
@@ -527,7 +527,7 @@ export class IgxDropDownComponent extends IgxDropDownBaseDirective implements ID
                     }
                 }
                 if (event) {
-                    this.toggleDirective.close();
+                    this.toggleDirective.close(event);
                 }
             } else {
                 throw new Error('Please provide a valid drop-down item for the selection!');

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

@@ -389,6 +389,8 @@ describe('Excel Exporter', () => {
 
         it('should not export columns when \'columnExporting\' is canceled.', async () => {
             const fix = TestBed.createComponent(GridIDNameJobTitleComponent);
+            options.alwaysExportHeaders = false;
+
             fix.detectChanges();
             await wait();
 
@@ -477,6 +479,8 @@ describe('Excel Exporter', () => {
 
         it('should not export rows when \'rowExporting\' is canceled.', async () => {
             const fix = TestBed.createComponent(GridIDNameJobTitleComponent);
+            options.alwaysExportHeaders = false;
+
             fix.detectChanges();
             await wait();
 
@@ -902,12 +906,13 @@ describe('Excel Exporter', () => {
             await exportAndVerify(hGrid, options, actualData.exportMultiColumnHeadersDataWithSkippedParentMCH);
         });
 
-        it('should export empty file when all parent multi column headers are skipped', async () => {
+        it('should export empty file when all parent multi column headers are skipped and alwaysExportHeaders is false', async () => {
             const fix = TestBed.createComponent(IgxHierarchicalGridMultiColumnHeadersExportComponent);
             fix.detectChanges();
 
             const hGrid = fix.componentInstance.hGrid;
             options = createExportOptions('HierarchicalGridMCHExcelExport');
+            options.alwaysExportHeaders = false;
 
             exporter.columnExporting.subscribe((args: IColumnExportingEventArgs) => {
                 if (args.header === 'General Information' || args.header === 'Address Information' || args.field === 'CustomerID') {
@@ -918,6 +923,19 @@ describe('Excel Exporter', () => {
 
             await exportAndVerify(hGrid, options, actualData.exportMultiColumnHeadersDataWithAllParentsSkipped);
         });
+
+        it('should export headers when exporting empty hierarchical grid with multi column headers', async () => {
+            const fix = TestBed.createComponent(IgxHierarchicalGridMultiColumnHeadersExportComponent);
+            fix.detectChanges();
+
+            const hGrid = fix.componentInstance.hGrid;
+            fix.componentInstance.data = [];
+            options = createExportOptions('HierarchicalGridMCHExcelExport');
+
+            fix.detectChanges();
+
+            await exportAndVerify(hGrid, options, actualData.exportEmptyMultiColumnHeadersDataWithExportedHeaders);
+        });
     });
 
     describe('', () => {
@@ -1094,6 +1112,13 @@ describe('Excel Exporter', () => {
 
             await exportAndVerify(treeGrid, options, actualData.treeGridWithAdvancedFilters);
         });
+
+        it('should export headers when exporting empty tree grid.', async () => {
+            fix.componentInstance.data = [];
+            fix.detectChanges();
+
+            await exportAndVerify(treeGrid, options, actualData.emptyTreeGridWithExportedHeaders);
+        });
     });
 
     describe('', () => {
@@ -1160,6 +1185,14 @@ describe('Excel Exporter', () => {
             fix.detectChanges();
             await exportAndVerify(grid, options, actualData.exportFrozenMultiColumnHeadersData, false);
         });
+
+        it('should export headers when exporting empty grid with multi column headers', async () => {
+            fix.componentInstance.data = [];
+
+            fix.detectChanges();
+
+            await exportAndVerify(grid, options, actualData.exportEmptyGridWithMultiColumnHeadersData, false);
+        });
     });
 
     const getExportedData = (grid, exportOptions: IgxExcelExporterOptions) => {

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

@@ -25,13 +25,16 @@ describe('Excel Exporter', () => {
 
     /* ExportData() tests */
     it('should not fail when data is empty.', async () => {
+        options.alwaysExportHeaders = false;
+
         const wrapper = await getExportedData([], options);
 
         wrapper.verifyStructure();
         await wrapper.verifyTemplateFilesContent();
     });
 
     it('should export empty objects successfully.', async () => {
+        options.alwaysExportHeaders = false;
         const wrapper = await getExportedData(SampleTestData.emptyObjectData(), options);
 
         wrapper.verifyStructure();

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

@@ -123,6 +123,12 @@ export class IgxExcelExporterService extends IgxBaseExporter {
                 columnCount = columns.length;
                 rootKeys = columns.map(c => c.field);
             }
+        } else {
+            const ownersKeys = Array.from(this._ownersMap.keys());
+
+            defaultOwner = this._ownersMap.get(ownersKeys[0]);
+            columnWidths = defaultOwner.columnWidths;
+            columnCount = defaultOwner.columns.filter(col => !col.skip && col.headerType === HeaderType.ColumnHeader).length;
         }
 
         const worksheetData =

projects/igniteui-angular/src/lib/services/excel/excel-files.ts

@@ -38,7 +38,7 @@ export class CoreFile implements IExcelFile {
  */
 export class WorkbookRelsFile implements IExcelFile {
     public writeElement(folder: JSZip, worksheetData: WorksheetData) {
-        const hasSharedStrings = worksheetData.isEmpty === false;
+        const hasSharedStrings = !worksheetData.isEmpty || worksheetData.options.alwaysExportHeaders;
         folder.file('workbook.xml.rels', ExcelStrings.getWorkbookRels(hasSharedStrings));
     }
 }
@@ -71,11 +71,11 @@ export class WorksheetFile implements IExcelFile {
     public async writeElementAsync(folder: JSZip, worksheetData: WorksheetData) {
         return new Promise<void>(resolve => {
             this.prepareDataAsync(worksheetData, (cols, rows) => {
-                const hasTable = !worksheetData.isEmpty && worksheetData.options.exportAsTable;
-                const isHierarchicalGrid = worksheetData.data[0]?.type === ExportRecordType.HierarchicalGridRecord;
+                const hasTable = (!worksheetData.isEmpty || worksheetData.options.alwaysExportHeaders)
+                    && worksheetData.options.exportAsTable;
 
                 folder.file('sheet1.xml', ExcelStrings.getSheetXML(
-                    this.dimension, this.freezePane, cols, rows, hasTable, this.maxOutlineLevel, isHierarchicalGrid));
+                    this.dimension, this.freezePane, cols, rows, hasTable, this.maxOutlineLevel, worksheetData.isHierarchical));
                 resolve();
             });
         });
@@ -87,14 +87,15 @@ export class WorksheetFile implements IExcelFile {
         const dictionary = worksheetData.dataDictionary;
         this.rowIndex = 0;
 
-        if (worksheetData.isEmpty) {
+        if (worksheetData.isEmpty && (!worksheetData.options.alwaysExportHeaders || worksheetData.owner.columns.length === 0)) {
             sheetData += '<sheetData/>';
             this.dimension = 'A1';
             done('', sheetData);
         } else {
             const owner = worksheetData.owner;
-            const isHierarchicalGrid = worksheetData.data[0].type === ExportRecordType.HierarchicalGridRecord;
+            const isHierarchicalGrid = worksheetData.isHierarchical;
             const hasMultiColumnHeader = worksheetData.hasMultiColumnHeader;
+
             const hasUserSetIndex = owner.columns.some(col => col.exportIndex !== undefined);
 
             const height =  worksheetData.options.rowHeight;
@@ -182,7 +183,7 @@ export class WorksheetFile implements IExcelFile {
                 const indexOfLastPinnedColumn = worksheetData.indexOfLastPinnedColumn;
                 const frozenColumnCount = indexOfLastPinnedColumn + 1;
                 let firstCell = ExcelStrings.getExcelColumn(frozenColumnCount) + freezeHeaders;
-                if (indexOfLastPinnedColumn !== -1 &&
+                if (indexOfLastPinnedColumn !== undefined && indexOfLastPinnedColumn !== -1 &&
                     !worksheetData.options.ignorePinning &&
                     !worksheetData.options.ignoreColumnsOrder) {
                     this.freezePane =
@@ -209,7 +210,7 @@ export class WorksheetFile implements IExcelFile {
                 sheetData += rows;
                 sheetData += '</sheetData>';
 
-                if (hasMultiColumnHeader) {
+                if (hasMultiColumnHeader && this.mergeCellsCounter > 0) {
                     sheetData += `<mergeCells count="${this.mergeCellsCounter}">${this.mergeCellStr}</mergeCells>`;
                 }
 
@@ -223,40 +224,41 @@ export class WorksheetFile implements IExcelFile {
         const height =  worksheetData.options.rowHeight;
         this.rowHeight = height ? ' ht="' + height + '" customHeight="1"' : '';
 
-        const isHierarchicalGrid =
-            worksheetData.data.some(r => r.type === ExportRecordType.HeaderRecord || r.type === ExportRecordType.HierarchicalGridRecord);
+        const isHierarchicalGrid = worksheetData.isHierarchical;
         const hasUserSetIndex = worksheetData.owner.columns.some(c => c.exportIndex !== undefined);
 
         let recordHeaders = [];
 
         yieldingLoop(worksheetData.rowCount - 1, 1000,
             (i) => {
-                if (!isHierarchicalGrid) {
-                    if (hasUserSetIndex) {
-                        recordHeaders = worksheetData.rootKeys;
+                if (!worksheetData.isEmpty){
+                    if (!isHierarchicalGrid) {
+                        if (hasUserSetIndex) {
+                            recordHeaders = worksheetData.rootKeys;
+                        } else {
+                            recordHeaders = worksheetData.owner.columns
+                                .filter(c => c.headerType !== HeaderType.MultiColumnHeader && !c.skip)
+                                .sort((a, b) => a.startIndex-b.startIndex)
+                                .sort((a, b) => a.pinnedIndex-b.pinnedIndex)
+                                .map(c => c.field);
+                        }
                     } else {
-                        recordHeaders = worksheetData.owner.columns
-                            .filter(c => c.headerType !== HeaderType.MultiColumnHeader && !c.skip)
-                            .sort((a, b) => a.startIndex-b.startIndex)
-                            .sort((a, b) => a.pinnedIndex-b.pinnedIndex)
-                            .map(c => c.field);
-                    }
-                } else {
-                    const record = worksheetData.data[i];
+                        const record = worksheetData.data[i];
 
-                    if (record.type === ExportRecordType.HeaderRecord) {
-                        const recordOwner = worksheetData.owners.get(record.owner);
-                        const hasMultiColumnHeaders = recordOwner.columns.some(c => !c.skip && c.headerType === HeaderType.MultiColumnHeader);
+                        if (record.type === ExportRecordType.HeaderRecord) {
+                            const recordOwner = worksheetData.owners.get(record.owner);
+                            const hasMultiColumnHeaders = recordOwner.columns.some(c => !c.skip && c.headerType === HeaderType.MultiColumnHeader);
 
-                        if (hasMultiColumnHeaders) {
-                            this.hGridPrintMultiColHeaders(worksheetData, rowDataArr, record, recordOwner);
+                            if (hasMultiColumnHeaders) {
+                                this.hGridPrintMultiColHeaders(worksheetData, rowDataArr, record, recordOwner);
+                            }
                         }
+
+                        recordHeaders = Object.keys(worksheetData.data[i].data);
                     }
 
-                    recordHeaders = Object.keys(worksheetData.data[i].data);
+                    rowDataArr.push(this.processRow(worksheetData, i, recordHeaders, isHierarchicalGrid));
                 }
-
-                rowDataArr.push(this.processRow(worksheetData, i, recordHeaders, isHierarchicalGrid));
             },
             () => {
                 done(rowDataArr.join(''));
@@ -404,7 +406,8 @@ export class WorkbookFile implements IExcelFile {
  */
 export class ContentTypesFile implements IExcelFile {
     public writeElement(folder: JSZip, worksheetData: WorksheetData) {
-        folder.file('[Content_Types].xml', ExcelStrings.getContentTypesXML(!worksheetData.isEmpty, worksheetData.options.exportAsTable));
+        const hasSharedStrings = !worksheetData.isEmpty || worksheetData.options.alwaysExportHeaders;
+        folder.file('[Content_Types].xml', ExcelStrings.getContentTypesXML(hasSharedStrings, worksheetData.options.exportAsTable));
     }
 }
 
@@ -436,7 +439,10 @@ export class TablesFile implements IExcelFile {
     public writeElement(folder: JSZip, worksheetData: WorksheetData) {
         const columnCount = worksheetData.columnCount;
         const lastColumn = ExcelStrings.getExcelColumn(columnCount - 1) + worksheetData.rowCount;
-        const dimension = 'A1:' + lastColumn;
+        const autoFilterDimension = 'A1:' + lastColumn;
+        const tableDimension = worksheetData.isEmpty
+            ? 'A1:' + ExcelStrings.getExcelColumn(columnCount - 1) + (worksheetData.rowCount + 1)
+            : autoFilterDimension;
         const hasUserSetIndex = worksheetData.owner.columns.some(c => c.exportIndex !== undefined);
         const values = hasUserSetIndex
             ? worksheetData.rootKeys
@@ -463,7 +469,7 @@ export class TablesFile implements IExcelFile {
             sortString = `<sortState ref="A2:${lastColumn}"><sortCondition descending="${dir}" ref="${sc}1:${sc}15"/></sortState>`;
         }
 
-        folder.file('table1.xml', ExcelStrings.getTablesXML(dimension, tableColumns, sortString));
+        folder.file('table1.xml', ExcelStrings.getTablesXML(autoFilterDimension, tableDimension, tableColumns, sortString));
     }
 }