Skip to content

Commit 03ccaae

Browse files
authored
Merge branch '8.2.x' into SKrastev/fix-6180-8.2.x
2 parents 4f69a82 + 16283d7 commit 03ccaae

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -817,19 +817,15 @@ describe('igxOverlay', () => {
817817
spyOn(scrollStrat, 'attach').and.callThrough();
818818
spyOn(scrollStrat, 'detach').and.callThrough();
819819
const scrollSpy = spyOn<any>(scrollStrat, 'onScroll').and.callThrough();
820-
const wheelSpy = spyOn<any>(scrollStrat, 'onWheel').and.callThrough();
821820
overlay.show(SimpleDynamicComponent, overlaySettings);
822821
tick();
823822

824823
expect(scrollStrat.attach).toHaveBeenCalledTimes(1);
825824
expect(scrollStrat.initialize).toHaveBeenCalledTimes(1);
826825
expect(scrollStrat.detach).toHaveBeenCalledTimes(0);
827826
document.dispatchEvent(new Event('scroll'));
828-
829827
expect(scrollSpy).toHaveBeenCalledTimes(1);
830828

831-
document.dispatchEvent(new Event('wheel'));
832-
expect(wheelSpy).toHaveBeenCalledTimes(1);
833829
overlay.hide('0');
834830
tick();
835831
expect(scrollStrat.detach).toHaveBeenCalledTimes(1);

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@ export class BlockScrollStrategy extends ScrollStrategy {
2828
/** @inheritdoc */
2929
public attach(): void {
3030
this._document.addEventListener('scroll', this.onScroll, true);
31-
this._document.addEventListener('wheel', this.onWheel, true);
3231
}
3332

3433
/** @inheritdoc */
3534
public detach(): void {
3635
this._document.removeEventListener('scroll', this.onScroll, true);
37-
this._document.removeEventListener('wheel', this.onWheel, true);
3836
this._sourceElement = null;
3937
this._initialScrollTop = 0;
4038
this._initialScrollLeft = 0;
@@ -52,9 +50,4 @@ export class BlockScrollStrategy extends ScrollStrategy {
5250
this._sourceElement.scrollTop = this._initialScrollTop;
5351
this._sourceElement.scrollLeft = this._initialScrollLeft;
5452
}
55-
56-
private onWheel(ev: WheelEvent) {
57-
ev.stopImmediatePropagation();
58-
ev.preventDefault();
59-
}
6053
}

0 commit comments

Comments
 (0)