@@ -29,9 +29,9 @@ import {
29
29
LOCALE_ID ,
30
30
HostListener
31
31
} from '@angular/core' ;
32
- import { getResizeObserver } from '../core/utils' ;
32
+ import { resizeObservable } from '../core/utils' ;
33
33
import 'igniteui-trial-watermark' ;
34
- import { Subject , pipe , fromEvent , noop } from 'rxjs' ;
34
+ import { Subject , pipe , fromEvent , noop , animationFrameScheduler } from 'rxjs' ;
35
35
import { takeUntil , first , filter , throttleTime , map , shareReplay } from 'rxjs/operators' ;
36
36
import { cloneArray , mergeObjects , compareMaps , resolveNestedPath , isObject , PlatformUtil } from '../core/utils' ;
37
37
import { GridColumnDataType } from '../data-operations/data-util' ;
@@ -2811,7 +2811,6 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
2811
2811
protected _allowAdvancedFiltering = false ;
2812
2812
protected _filterMode : FilterMode = FilterMode . quickFilter ;
2813
2813
2814
- protected observer : ResizeObserver = new ( getResizeObserver ( ) ) ( noop ) ;
2815
2814
2816
2815
protected _defaultTargetRecordNumber = 10 ;
2817
2816
protected _expansionStates : Map < any , boolean > = new Map < any , boolean > ( ) ;
@@ -3300,7 +3299,11 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
3300
3299
this . notifyChanges ( ) ;
3301
3300
} ) ;
3302
3301
3303
- this . resizeNotify . pipe ( destructor , filter ( ( ) => ! this . _init ) , throttleTime ( 100 , undefined , { leading : true , trailing : true } ) )
3302
+ this . resizeNotify . pipe (
3303
+ destructor ,
3304
+ filter ( ( ) => ! this . _init ) ,
3305
+ throttleTime ( 0 , animationFrameScheduler , { leading : true , trailing : true } )
3306
+ )
3304
3307
. subscribe ( ( ) => {
3305
3308
this . zone . run ( ( ) => {
3306
3309
this . notifyChanges ( true ) ;
@@ -3553,8 +3556,8 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
3553
3556
this . zone . runOutsideAngular ( ( ) => {
3554
3557
this . verticalScrollContainer . getScroll ( ) . addEventListener ( 'scroll' , this . verticalScrollHandler . bind ( this ) ) ;
3555
3558
this . headerContainer . getScroll ( ) . addEventListener ( 'scroll' , this . horizontalScrollHandler . bind ( this ) ) ;
3556
- this . observer = new ( getResizeObserver ( ) ) ( ( ) => this . resizeNotify . next ( ) ) ;
3557
- this . observer . observe ( this . nativeElement ) ;
3559
+ fromEvent ( window , 'resize' ) . pipe ( takeUntil ( this . destroy$ ) ) . subscribe ( ( ) => this . resizeNotify . next ( ) ) ;
3560
+ resizeObservable ( this . nativeElement ) . pipe ( takeUntil ( this . destroy$ ) ) . subscribe ( ( ) => this . resizeNotify . next ( ) ) ;
3558
3561
} ) ;
3559
3562
}
3560
3563
@@ -3659,7 +3662,6 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
3659
3662
} ) ;
3660
3663
3661
3664
this . zone . runOutsideAngular ( ( ) => {
3662
- this . observer . disconnect ( ) ;
3663
3665
this . verticalScrollContainer ?. getScroll ( ) ?. removeEventListener ( 'scroll' , this . verticalScrollHandler ) ;
3664
3666
this . headerContainer ?. getScroll ( ) ?. removeEventListener ( 'scroll' , this . horizontalScrollHandler ) ;
3665
3667
const vertScrDC = this . verticalScrollContainer ?. displayContainer ;
@@ -5811,7 +5813,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
5811
5813
/**
5812
5814
* @hidden @internal
5813
5815
*/
5814
- public closeRowEditingOverlay ( ) {
5816
+ public closeRowEditingOverlay ( ) {
5815
5817
this . rowEditingOverlay . element . removeEventListener ( 'wheel' , this . rowEditingWheelHandler ) ;
5816
5818
this . rowEditPositioningStrategy . isTopInitialPosition = null ;
5817
5819
this . rowEditingOverlay . close ( ) ;
@@ -5936,7 +5938,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
5936
5938
/**
5937
5939
* @hidden
5938
5940
*/
5939
- public rowEditingWheelHandler ( event : WheelEvent ) {
5941
+ public rowEditingWheelHandler ( event : WheelEvent ) {
5940
5942
if ( event . deltaY > 0 ) {
5941
5943
this . verticalScrollContainer . scrollNext ( ) ;
5942
5944
} else {
0 commit comments