refactor(toggle): update overlay subscription filter to tuple (#2898)

IgniteUI · Nov 13, 2018 · e651389 · e651389
1 parent c996f2f
commit e651389
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.ts b/projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.ts
@@ -17,7 +17,7 @@ import { IgxNavigationService, IToggleView } from '../../core/navigation';
 import { IgxOverlayService } from '../../services/overlay/overlay';
 import { OverlaySettings, OverlayEventArgs, ConnectedPositioningStrategy, AbsoluteScrollStrategy } from '../../services';
 import { filter, takeUntil } from 'rxjs/operators';
-import { Subscription, OperatorFunction, Subject } from 'rxjs';
+import { Subscription, Subject, MonoTypeOperatorFunction } from 'rxjs';
 import { OverlayCancelableEventArgs } from '../../services/overlay/utilities';
 import { CancelableEventArgs } from '../../core/utils';
 
@@ -28,8 +28,9 @@ import { CancelableEventArgs } from '../../core/utils';
 export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
     private _overlayId: string;
     private destroy$ = new Subject<boolean>();
-    private _overlaySubFilter: OperatorFunction<OverlayEventArgs, OverlayEventArgs>[] = [
-        filter(x => x.id === this._overlayId)
+    private _overlaySubFilter: [MonoTypeOperatorFunction<OverlayEventArgs>, MonoTypeOperatorFunction<OverlayEventArgs>] = [
+        filter(x => x.id === this._overlayId),
+        takeUntil(this.destroy$)
     ];
     private _overlayOpenedSub: Subscription;
     private _overlayClosingSub: Subscription;
@@ -189,12 +190,12 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
         }
 
         this.unsubscribe();
-        this._overlayOpenedSub = this.overlayService.onOpened.pipe(...this._overlaySubFilter, takeUntil(this.destroy$)).subscribe(() => {
+        this._overlayOpenedSub = this.overlayService.onOpened.pipe(...this._overlaySubFilter).subscribe(() => {
             this.onOpened.emit();
         });
         this._overlayClosingSub = this.overlayService
             .onClosing
-            .pipe(...this._overlaySubFilter, takeUntil(this.destroy$))
+            .pipe(...this._overlaySubFilter)
             .subscribe((e: OverlayCancelableEventArgs) => {
                 const eventArgs: CancelableEventArgs = { cancel: false };
                 this.onClosing.emit(eventArgs);
@@ -208,7 +209,7 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
                 }
             });
         this._overlayClosedSub = this.overlayService.onClosed
-            .pipe(...this._overlaySubFilter, takeUntil(this.destroy$))
+            .pipe(...this._overlaySubFilter)
             .subscribe(this.overlayClosed);
     }