Merge branch '9.0.x' into nrobakova/refactor-hiding-tests-90

Author: kdinev

package-lock.json

@@ -53,11 +53,12 @@
     "@angular/platform-browser-dynamic": "^9.0.0",
     "@angular/router": "^9.0.0",
     "@types/hammerjs": "^2.0.36",
+    "@types/jszip": "^3.1.7",
     "@types/source-map": "0.5.2",
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.6.2",
     "hammerjs": "^2.0.8",
-    "jszip": "^3.1.5",
+    "jszip": "^3.3.0",
     "resize-observer-polyfill": "^1.5.1",
     "rxjs": "^6.5.4",
     "tslib": "^1.10.0",

package.json

@@ -7,6 +7,7 @@
   },
   "whitelistedNonPeerDependencies": [
       "@types/hammerjs",
+      "@types/jszip",
       "hammerjs",
       "jszip",
       "resize-observer-polyfill"

projects/igniteui-angular/ng-package.json

@@ -10,6 +10,7 @@
   },
   "whitelistedNonPeerDependencies": [
       "@types/hammerjs",
+      "@types/jszip",
       "hammerjs",
       "jszip",
       "resize-observer-polyfill"

projects/igniteui-angular/ng-package.prod.json

@@ -67,8 +67,9 @@
     ],
     "dependencies": {
         "@types/hammerjs": "^2.0.36",
+        "@types/jszip": "^3.1.7",
         "hammerjs": "^2.0.8",
-        "jszip": "^3.1.5",
+        "jszip": "^3.3.0",
         "resize-observer-polyfill": "^1.5.1"
     },
     "peerDependencies": {

projects/igniteui-angular/package.json

@@ -49,21 +49,21 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             rowIsland2 = fix.componentInstance.rowIsland2;
         }));
 
-        it('should allow only one cell to be selected in the whole hierarchical grid.', (async () => {
+        it('should allow only one cell to be selected in the whole hierarchical grid.', fakeAsync(() => {
             hierarchicalGrid.height = '500px';
             hierarchicalGrid.reflow();
             fix.detectChanges();
 
             let firstRow = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
             firstRow.toggle();
             fix.detectChanges();
+            tick(100);
             expect(firstRow.expanded).toBeTruthy();
 
             let fCell = firstRow.cells.toArray()[0];
 
             // select parent cell
             fCell.nativeElement.focus();
-            await wait(100);
             fix.detectChanges();
 
             expect(fCell.selected).toBeTruthy();
@@ -74,7 +74,6 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
 
             // select child cell
             fChildCell.nativeElement.focus();
-            await wait(100);
             fix.detectChanges();
 
             expect(fChildCell.selected).toBeTruthy();
@@ -84,11 +83,11 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             firstRow = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
             fCell = firstRow.cells.toArray()[0];
             fCell.nativeElement.focus();
-            await wait(100);
             fix.detectChanges();
             expect(fChildCell.selected).toBeFalsy();
             expect(fCell.selected).toBeTruthy();
         }));
+
     });
 
     describe('Row Selection', () => {
@@ -102,8 +101,8 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
 
         it('should have checkboxes on each row', fakeAsync(() => {
             hierarchicalGrid.expandChildren = true;
-            fix.detectChanges();
             tick(100);
+            fix.detectChanges();
             rowIsland1.expandChildren = true;
             tick(100);
             fix.detectChanges();
@@ -144,7 +143,7 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             const childGridLevel2 = childGridLevel1.hgridAPI.getChildGrids(false)[0];
 
             hierarchicalGrid.selectAllRows();
-            childGridLevel1.selectedRows(['00']);
+            childGridLevel1.selectRows(['00']);
             fix.detectChanges();
 
             // Change row selection for grids
@@ -493,7 +492,7 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             expect(hierarchicalGrid.selectedRows()).toEqual(['1', '2', '3', '4']);
 
             // Click on a row
-            secondRow.nativeElement.dispatchEvent(new MouseEvent('click'));
+            secondRow.onClick(UIInteractions.getMouseEvent('click'));
             fix.detectChanges();
 
             GridSelectionFunctions.verifyRowSelected(secondRow);
@@ -503,7 +502,7 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
 
         it('should retain selected row when filtering', () => {
             const firstRow = hierarchicalGrid.getRowByIndex(0);
-            GridSelectionFunctions.clickRowCheckbox(firstRow);
+            firstRow.onRowSelectorClick(UIInteractions.getMouseEvent('click'));
             fix.detectChanges();
 
             hierarchicalGrid.filter('ID', '1', IgxStringFilteringOperand.instance().condition('doesNotContain'), true);
@@ -513,7 +512,7 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             GridSelectionFunctions.verifyHeaderRowCheckboxState(fix, false, true);
         });
 
-        it('should child grid selection should not be changed when filter parent', () => {
+        it('child grid selection should not be changed when filter parent', () => {
             rowIsland1.rowSelection = GridSelectionMode.multiple;
             fix.detectChanges();
 
@@ -561,13 +560,14 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             GridSelectionFunctions.verifyRowsArraySelected(childGrid.dataRowList.toArray());
         });
 
-        it('should not be able to select deleted row', () => {
+        it('should not be able to select deleted row', fakeAsync(() => {
             // Expand first row
             const firstRow = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
             firstRow.toggle();
             fix.detectChanges();
 
-            UIInteractions.simulateClickEvent(firstRow.nativeElement);
+            firstRow.onClick(UIInteractions.getMouseEvent('click'));
+            tick();
             fix.detectChanges();
 
             GridSelectionFunctions.verifyRowSelected(firstRow);
@@ -582,15 +582,16 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             expect(hierarchicalGrid.selectedRows()).toEqual([]);
 
             // Click on deleted row
-            UIInteractions.simulateClickEvent(firstRow.nativeElement);
+            firstRow.onClick(UIInteractions.getMouseEvent('click'));
+            tick();
             fix.detectChanges();
 
             GridSelectionFunctions.verifyRowSelected(firstRow, false);
             GridSelectionFunctions.verifyHeaderRowCheckboxState(fix);
             expect(hierarchicalGrid.selectedRows()).toEqual([]);
 
             // Click on checkbox for deleted row
-            GridSelectionFunctions.clickRowCheckbox(firstRow);
+            firstRow.onRowSelectorClick(UIInteractions.getMouseEvent('click'));
             fix.detectChanges();
 
             GridSelectionFunctions.verifyRowSelected(firstRow, false);
@@ -610,14 +611,15 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             expect(childGrid.selectedRows()).toEqual([]);
 
             const childGridFirstRow = childGrid.getRowByIndex(0);
-            UIInteractions.simulateClickEvent(childGridFirstRow.nativeElement, false, true);
+            childGridFirstRow.onClick(UIInteractions.getMouseEvent('click', false, false, true));
+            tick();
             fix.detectChanges();
 
             GridSelectionFunctions.verifyRowSelected(firstRow, false);
             GridSelectionFunctions.verifyHeaderRowCheckboxState(fix, true);
             expect(hierarchicalGrid.selectedRows()).toEqual(['1', '2', '3', '4']);
             expect(childGrid.selectedRows()).toEqual(['00']);
-        });
+        }));
 
         it('should be able to select added row', () => {
             // Set multiple selection to first row island
@@ -684,7 +686,7 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
         }));
 
         it('should deselect deleted row', () => {
-            GridSelectionFunctions.clickHeaderRowCheckbox(hierarchicalGrid);
+            hierarchicalGrid.onHeaderSelectorClick(UIInteractions.getMouseEvent('click'));
             fix.detectChanges();
 
             GridSelectionFunctions.verifyHeaderRowCheckboxState(hierarchicalGrid, true);

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.selection.spec.ts

@@ -1,4 +1,4 @@
-import * as JSZip from 'jszip/dist/jszip';
+import * as JSZip from 'jszip';
 
 import { EventEmitter, Injectable, Output } from '@angular/core';
 import { ExcelElementsFactory } from './excel-elements-factory';
@@ -38,7 +38,7 @@ export interface IExcelExportEndedEventArgs extends IBaseEventArgs {
 @Injectable()
 export class IgxExcelExporterService extends IgxBaseExporter {
 
-    private static ZIP_OPTIONS = { compression: 'DEFLATE', type: 'base64' };
+    private static ZIP_OPTIONS = { compression: 'DEFLATE', type: 'base64' } as JSZip.JSZipGeneratorOptions<'base64'>;
     private _xlsx: JSZip;
 
     /**

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

@@ -2,7 +2,7 @@ import { IExcelFile } from './excel-interfaces';
 import { ExcelStrings } from './excel-strings';
 import { WorksheetData } from './worksheet-data';
 
-import * as JSZip from 'jszip/dist/jszip';
+import * as JSZip from 'jszip';
 
 /**
  * @hidden

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

@@ -1,4 +1,4 @@
-import * as JSZip from 'jszip/dist/jszip';
+import * as JSZip from 'jszip';
 
 import {
     ExcelFileTypes,