Merge branch '8.2.x' into rkaraivanov/radio-group-fix-82

Author: Lipata

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts

@@ -540,10 +540,12 @@ describe('IgxGrid - Advanced Filtering', () => {
             fix.detectChanges();
 
             // Verify the filter results.
-            expect(grid.filteredData.length).toEqual(6);
-            expect(grid.rowList.length).toBe(6);
-            expect(GridFunctions.getCurrentCellFromGrid(grid, 0, 1).value).toBe('Ignite UI for JavaScript');
-            expect(GridFunctions.getCurrentCellFromGrid(grid, 1, 1).value).toBe('NetAdvantage');
+            const expectedData = fix.componentInstance.data.filter(r =>
+                r.ReleaseDate && r.ReleaseDate.getFullYear() === (new Date()).getFullYear());
+            expect(grid.filteredData.length).toEqual(expectedData.length);
+            expect(grid.rowList.length).toBe(expectedData.length);
+            expect(GridFunctions.getCurrentCellFromGrid(grid, 0, 1).value).toBe(expectedData[0].ProductName);
+            expect(GridFunctions.getCurrentCellFromGrid(grid, 1, 1).value).toBe(expectedData[1].ProductName);
         }));
 
         it('Should correctly filter by a \'date\' column through UI with value from calendar.', fakeAsync(() => {

projects/igniteui-angular/src/lib/services/overlay/overlay.spec.ts

@@ -817,19 +817,15 @@ describe('igxOverlay', () => {
             spyOn(scrollStrat, 'attach').and.callThrough();
             spyOn(scrollStrat, 'detach').and.callThrough();
             const scrollSpy = spyOn<any>(scrollStrat, 'onScroll').and.callThrough();
-            const wheelSpy = spyOn<any>(scrollStrat, 'onWheel').and.callThrough();
             overlay.show(SimpleDynamicComponent, overlaySettings);
             tick();
 
             expect(scrollStrat.attach).toHaveBeenCalledTimes(1);
             expect(scrollStrat.initialize).toHaveBeenCalledTimes(1);
             expect(scrollStrat.detach).toHaveBeenCalledTimes(0);
             document.dispatchEvent(new Event('scroll'));
-
             expect(scrollSpy).toHaveBeenCalledTimes(1);
 
-            document.dispatchEvent(new Event('wheel'));
-            expect(wheelSpy).toHaveBeenCalledTimes(1);
             overlay.hide('0');
             tick();
             expect(scrollStrat.detach).toHaveBeenCalledTimes(1);

projects/igniteui-angular/src/lib/services/overlay/scroll/block-scroll-strategy.ts

@@ -28,13 +28,11 @@ export class BlockScrollStrategy extends ScrollStrategy {
     /** @inheritdoc */
     public attach(): void {
         this._document.addEventListener('scroll', this.onScroll, true);
-        this._document.addEventListener('wheel', this.onWheel, true);
     }
 
     /** @inheritdoc */
     public detach(): void {
         this._document.removeEventListener('scroll', this.onScroll, true);
-        this._document.removeEventListener('wheel', this.onWheel, true);
         this._sourceElement = null;
         this._initialScrollTop = 0;
         this._initialScrollLeft = 0;
@@ -52,9 +50,4 @@ export class BlockScrollStrategy extends ScrollStrategy {
         this._sourceElement.scrollTop = this._initialScrollTop;
         this._sourceElement.scrollLeft = this._initialScrollLeft;
     }
-
-    private onWheel(ev: WheelEvent) {
-        ev.stopImmediatePropagation();
-        ev.preventDefault();
-    }
 }