Skip to content

Commit 2c0b33b

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into ddincheva/gridPaging12.1
2 parents d857625 + bdf3734 commit 2c0b33b

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import {
2929
LOCALE_ID,
3030
HostListener
3131
} from '@angular/core';
32-
import { getResizeObserver } from '../core/utils';
32+
import { resizeObservable } from '../core/utils';
3333
import 'igniteui-trial-watermark';
34-
import { Subject, pipe, fromEvent, noop } from 'rxjs';
34+
import { Subject, pipe, fromEvent, animationFrameScheduler } from 'rxjs';
3535
import { takeUntil, first, filter, throttleTime, map, shareReplay, takeWhile } from 'rxjs/operators';
3636
import { cloneArray, mergeObjects, compareMaps, resolveNestedPath, isObject, PlatformUtil } from '../core/utils';
3737
import { GridColumnDataType } from '../data-operations/data-util';
@@ -2816,7 +2816,6 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
28162816
protected _allowAdvancedFiltering = false;
28172817
protected _filterMode: FilterMode = FilterMode.quickFilter;
28182818

2819-
protected observer: ResizeObserver = new (getResizeObserver())(noop);
28202819

28212820
protected _defaultTargetRecordNumber = 10;
28222821
protected _expansionStates: Map<any, boolean> = new Map<any, boolean>();
@@ -3310,7 +3309,11 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
33103309
this.notifyChanges();
33113310
});
33123311

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+
)
33143317
.subscribe(() => {
33153318
this.zone.run(() => {
33163319
this.notifyChanges(true);
@@ -3590,8 +3593,8 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
35903593
this.zone.runOutsideAngular(() => {
35913594
this.verticalScrollContainer.getScroll().addEventListener('scroll', this.verticalScrollHandler.bind(this));
35923595
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());
35953598
});
35963599
}
35973600

@@ -3700,7 +3703,6 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
37003703
});
37013704

37023705
this.zone.runOutsideAngular(() => {
3703-
this.observer.disconnect();
37043706
this.verticalScrollContainer?.getScroll()?.removeEventListener('scroll', this.verticalScrollHandler);
37053707
this.headerContainer?.getScroll()?.removeEventListener('scroll', this.horizontalScrollHandler);
37063708
const vertScrDC = this.verticalScrollContainer?.displayContainer;
@@ -5844,7 +5846,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
58445846
/**
58455847
* @hidden @internal
58465848
*/
5847-
public closeRowEditingOverlay() {
5849+
public closeRowEditingOverlay() {
58485850
this.rowEditingOverlay.element.removeEventListener('wheel', this.rowEditingWheelHandler);
58495851
this.rowEditPositioningStrategy.isTopInitialPosition = null;
58505852
this.rowEditingOverlay.close();
@@ -5969,7 +5971,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
59695971
/**
59705972
* @hidden
59715973
*/
5972-
public rowEditingWheelHandler(event: WheelEvent) {
5974+
public rowEditingWheelHandler(event: WheelEvent) {
59735975
if (event.deltaY > 0) {
59745976
this.verticalScrollContainer.scrollNext();
59755977
} else {

0 commit comments

Comments
 (0)