refactor: implement overlay stack per plugin for vex & bootstrap

shlomiassaf · Aug 23, 2016 · ab4d51a · ab4d51a
1 parent 18acd51
commit ab4d51a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/components/angular2-modal/plugins/bootstrap/modal.ts b/src/components/angular2-modal/plugins/bootstrap/modal.ts
@@ -62,8 +62,8 @@ export class Modal extends Modal_ {
     }
 
     // on removal, remove if last.
-    dialogRef.onDestroy
-      .subscribe(() => this.overlay.stackLength === 0 && document.body.classList.remove('modal-open'));
+    // dialogRef.onDestroy
+    //   .subscribe(() => this.overlay.groupStackLength(dialogRef) === 0 && document.body.classList.remove('modal-open'));
 
     backdrop.addClass('modal-backdrop fade');
     backdrop.addClass('in', true);
@@ -90,7 +90,10 @@ export class Modal extends Modal_ {
       // running inside zone didn't help.
       overlay.tick();
 
-      backdrop.animationEnd$.first().subscribe(type => completer.resolve());
+      backdrop.animationEnd$.first().subscribe(type => {
+        this.overlay.groupStackLength(dialogRef) === 1 && document.body.classList.remove('modal-open');
+        completer.resolve()
+      });
 
       return completer.promise;
     });

diff --git a/src/components/angular2-modal/plugins/vex/modal.ts b/src/components/angular2-modal/plugins/vex/modal.ts
@@ -57,9 +57,6 @@ export class Modal extends Modal_ {
     if (!document.body.classList.contains('vex-open')) {
       document.body.classList.add('vex-open');
     }
-    // on removal, remove if last.
-    dialogRef.onDestroy
-      .subscribe(() => this.overlay.stackLength === 0 && document.body.classList.remove('vex-open'));
 
     overlay.addClass(`vex vex-theme-${dialogRef.context.className}`);
     backdrop.addClass('vex-overlay');
@@ -87,7 +84,12 @@ export class Modal extends Modal_ {
       overlay.tick();
 
       const completer = new PromiseCompleter<void>();
-      container.animationEnd$.first().subscribe(type => completer.resolve());
+      container.animationEnd$.first().subscribe(type => {
+        // on removal, remove if last.
+
+        this.overlay.groupStackLength(dialogRef) === 1 && document.body.classList.remove('vex-open');
+        completer.resolve()
+      });
       return completer.promise;
     });