@@ -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 , animationFrameScheduler } from 'rxjs' ;
35
35
import { takeUntil , first , filter , throttleTime , map , shareReplay , takeWhile } from 'rxjs/operators' ;
36
36
import { cloneArray , mergeObjects , compareMaps , resolveNestedPath , isObject , PlatformUtil } from '../core/utils' ;
37
37
import { GridColumnDataType } from '../data-operations/data-util' ;
@@ -2816,7 +2816,6 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
2816
2816
protected _allowAdvancedFiltering = false ;
2817
2817
protected _filterMode : FilterMode = FilterMode . quickFilter ;
2818
2818
2819
- protected observer : ResizeObserver = new ( getResizeObserver ( ) ) ( noop ) ;
2820
2819
2821
2820
protected _defaultTargetRecordNumber = 10 ;
2822
2821
protected _expansionStates : Map < any , boolean > = new Map < any , boolean > ( ) ;
@@ -3310,7 +3309,11 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
3310
3309
this . notifyChanges ( ) ;
3311
3310
} ) ;
3312
3311
3313
- this . resizeNotify . pipe ( destructor , filter ( ( ) => ! this . _init ) , throttleTime ( 100 , undefined , { leading : true , trailing : true } ) )
3312
+ this . resizeNotify . pipe (
3313
+ destructor ,
3314
+ filter ( ( ) => ! this . _init ) ,
3315
+ throttleTime ( 0 , animationFrameScheduler , { leading : true , trailing : true } )
3316
+ )
3314
3317
. subscribe ( ( ) => {
3315
3318
this . zone . run ( ( ) => {
3316
3319
this . notifyChanges ( true ) ;
@@ -3590,8 +3593,8 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
3590
3593
this . zone . runOutsideAngular ( ( ) => {
3591
3594
this . verticalScrollContainer . getScroll ( ) . addEventListener ( 'scroll' , this . verticalScrollHandler . bind ( this ) ) ;
3592
3595
this . headerContainer . getScroll ( ) . addEventListener ( 'scroll' , this . horizontalScrollHandler . bind ( this ) ) ;
3593
- this . observer = new ( getResizeObserver ( ) ) ( ( ) => this . resizeNotify . next ( ) ) ;
3594
- this . observer . observe ( this . nativeElement ) ;
3596
+ fromEvent ( window , 'resize' ) . pipe ( takeUntil ( this . destroy$ ) ) . subscribe ( ( ) => this . resizeNotify . next ( ) ) ;
3597
+ resizeObservable ( this . nativeElement ) . pipe ( takeUntil ( this . destroy$ ) ) . subscribe ( ( ) => this . resizeNotify . next ( ) ) ;
3595
3598
} ) ;
3596
3599
}
3597
3600
@@ -3700,7 +3703,6 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
3700
3703
} ) ;
3701
3704
3702
3705
this . zone . runOutsideAngular ( ( ) => {
3703
- this . observer . disconnect ( ) ;
3704
3706
this . verticalScrollContainer ?. getScroll ( ) ?. removeEventListener ( 'scroll' , this . verticalScrollHandler ) ;
3705
3707
this . headerContainer ?. getScroll ( ) ?. removeEventListener ( 'scroll' , this . horizontalScrollHandler ) ;
3706
3708
const vertScrDC = this . verticalScrollContainer ?. displayContainer ;
@@ -5844,7 +5846,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
5844
5846
/**
5845
5847
* @hidden @internal
5846
5848
*/
5847
- public closeRowEditingOverlay ( ) {
5849
+ public closeRowEditingOverlay ( ) {
5848
5850
this . rowEditingOverlay . element . removeEventListener ( 'wheel' , this . rowEditingWheelHandler ) ;
5849
5851
this . rowEditPositioningStrategy . isTopInitialPosition = null ;
5850
5852
this . rowEditingOverlay . close ( ) ;
@@ -5969,7 +5971,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
5969
5971
/**
5970
5972
* @hidden
5971
5973
*/
5972
- public rowEditingWheelHandler ( event : WheelEvent ) {
5974
+ public rowEditingWheelHandler ( event : WheelEvent ) {
5973
5975
if ( event . deltaY > 0 ) {
5974
5976
this . verticalScrollContainer . scrollNext ( ) ;
5975
5977
} else {
0 commit comments