fix(BlockUIContent): Fully clean up on destroy

kuuurt13 · Apr 30, 2020 · 3cddef2 · 3cddef2
1 parent 240be3a
commit 3cddef2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/components/block-ui-content/block-ui-content.component.ts b/lib/components/block-ui-content/block-ui-content.component.ts
@@ -56,7 +56,7 @@ export class BlockUIContentComponent implements OnInit, AfterViewInit, AfterView
     private blockUI: BlockUIInstanceService,
     private resolver: ComponentFactoryResolver,
     private changeDetectionRef: ChangeDetectorRef
-  ) {}
+  ) { }
 
   ngOnInit() {
     this.settings = this.blockUI.getSettings();
@@ -199,5 +199,6 @@ export class BlockUIContentComponent implements OnInit, AfterViewInit, AfterView
   ngOnDestroy() {
     this.resetState();
     this.onUnsubscribe(this.name);
+    this.blockUI.clearInstance(this.name);
   }
 }
diff --git a/lib/services/block-ui-instance.service.ts b/lib/services/block-ui-instance.service.ts
@@ -11,7 +11,7 @@ import { BlockUIEvent } from '../models/block-ui-event.model';
 export class BlockUIInstanceService {
   blockUISettings: BlockUISettings | any = {};
   blockUIInstances: any = {};
-  private blockUISubject: ReplaySubject<any> = new ReplaySubject();
+  private blockUISubject: ReplaySubject<any> = new ReplaySubject(1);
   private blockUIObservable: Observable<any> = this.blockUISubject.asObservable();
 
   constructor() {
@@ -47,6 +47,10 @@ export class BlockUIInstanceService {
     return this.blockUIObservable;
   }
 
+  clearInstance(instanceName: string) {
+    this.dispatch(this.blockUISubject, BlockUIActions.RESET, instanceName);
+  }
+
   private blockUIMiddleware({ action, name }: BlockUIEvent): void {
     let isActive: boolean = null;