Merge pull request #7495 from IgniteUI/mvenkov/call_notifychanges_correctly

Unsubscribe all subscriptions in IgxSelect

Author: Lipata

projects/igniteui-angular/src/lib/select/select.component.ts

@@ -1,4 +1,3 @@
-import { IgxInputDirective, IgxInputState } from './../directives/input/input.directive';
 import {
     AfterContentInit,
     AfterViewInit,
@@ -20,24 +19,27 @@ import {
     TemplateRef,
     ViewChild
 } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR, NgControl, AbstractControl } from '@angular/forms';
-import { Subscription } from 'rxjs';
-
-import { IgxDropDownItemBaseDirective } from '../drop-down/public_api';
+import { AbstractControl, ControlValueAccessor, NgControl, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { DisplayDensityToken, IDisplayDensityOptions } from '../core/density';
+import { EditorProvider } from '../core/edit-provider';
+import { IgxSelectionAPIService } from '../core/selection';
+import { CancelableEventArgs } from '../core/utils';
+import { IgxLabelDirective } from '../directives/label/label.directive';
+import { IgxDropDownItemBaseDirective } from '../drop-down/drop-down-item.base';
+import { IGX_DROPDOWN_BASE, ISelectionEventArgs, Navigate } from '../drop-down/drop-down.common';
 import { IgxInputGroupComponent } from '../input-group/input-group.component';
-
+import { AbsoluteScrollStrategy } from '../services/overlay/scroll/absolute-scroll-strategy';
+import { OverlaySettings } from '../services/overlay/utilities';
+import { IgxInputDirective, IgxInputState } from './../directives/input/input.directive';
 import { IgxDropDownComponent } from './../drop-down/drop-down.component';
 import { IgxSelectItemComponent } from './select-item.component';
 import { SelectPositioningStrategy } from './select-positioning-strategy';
-
-import { OverlaySettings, AbsoluteScrollStrategy } from '../services/public_api';
-import { IGX_DROPDOWN_BASE, ISelectionEventArgs, Navigate } from '../drop-down/drop-down.common';
-import { CancelableEventArgs } from '../core/utils';
-import { IgxLabelDirective } from '../directives/label/label.directive';
 import { IgxSelectBase } from './select.common';
-import { EditorProvider } from '../core/edit-provider';
-import { IgxSelectionAPIService } from '../core/selection';
-import { DisplayDensityToken, IDisplayDensityOptions } from '../core/density';
+
+
+
 
 /** @hidden @internal */
 @Directive({
@@ -94,9 +96,9 @@ export class IgxSelectComponent extends IgxDropDownComponent implements IgxSelec
     AfterContentInit, OnInit, AfterViewInit, OnDestroy, EditorProvider {
 
     private ngControl: NgControl = null;
-    private _statusChanges$: Subscription;
     private _overlayDefaults: OverlaySettings;
     private _value: any;
+    protected destroy$ = new Subject<boolean>();
 
     /** @hidden @internal do not use the drop-down container class */
     public cssClass = false;
@@ -365,11 +367,15 @@ export class IgxSelectComponent extends IgxDropDownComponent implements IgxSelec
             scrollStrategy: new AbsoluteScrollStrategy(),
             excludePositionTarget: true
         };
-        this.children.changes.subscribe(() => {
+        const changes$ = this.children.changes.pipe(takeUntil(this.destroy$)).subscribe(() => {
             this.setSelection(this.items.find(x => x.value === this.value));
             this.cdr.detectChanges();
         });
-        Promise.resolve().then(() => this.children.notifyOnChanges());
+        Promise.resolve().then(() => {
+            if (!changes$.closed) {
+                this.children.notifyOnChanges();
+            }
+        });
     }
 
     /** @hidden @internal */
@@ -408,7 +414,7 @@ export class IgxSelectComponent extends IgxDropDownComponent implements IgxSelec
     public onBlur(): void {
         this._onTouchedCallback();
         if (this.ngControl && !this.ngControl.valid) {
-             this.input.valid = IgxInputState.INVALID;
+            this.input.valid = IgxInputState.INVALID;
         } else {
             this.input.valid = IgxInputState.INITIAL;
         }
@@ -445,7 +451,7 @@ export class IgxSelectComponent extends IgxDropDownComponent implements IgxSelec
      */
     public ngAfterViewInit() {
         if (this.ngControl) {
-            this._statusChanges$ = this.ngControl.statusChanges.subscribe(this.onStatusChanged.bind(this));
+            this.ngControl.statusChanges.pipe(takeUntil(this.destroy$)).subscribe(this.onStatusChanged.bind(this));
             this.manageRequiredAsterisk();
         }
         this.cdr.detectChanges();
@@ -455,17 +461,16 @@ export class IgxSelectComponent extends IgxDropDownComponent implements IgxSelec
      * @hidden @internal
      */
     public ngOnDestroy() {
+        this.destroy$.next(true);
+        this.destroy$.complete();
         this.selection.clear(this.id);
-        if (this._statusChanges$) {
-            this._statusChanges$.unsubscribe();
-        }
     }
 
     /**
      * @hidden @internal
      * Prevent input blur - closing the items container on Header/Footer Template click.
      */
-   public mousedownHandler(event) {
+    public mousedownHandler(event) {
         event.preventDefault();
     }
 }