fix(snackbar): snacksbars sometimes don't get removed (#1795)

angular · Nov 10, 2016 · fcd29c8 · fcd29c8
1 parent 52e5cb5
commit fcd29c8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
@@ -219,6 +219,23 @@ describe('MdSnackBar', () => {
       });
     });
   }));
+
+  it('should remove past snackbars when opening new snackbars', async(() => {
+    snackBar.open('First snackbar');
+    viewContainerFixture.detectChanges();
+
+    snackBar.open('Second snackbar');
+    viewContainerFixture.detectChanges();
+
+    viewContainerFixture.whenStable().then(() => {
+      snackBar.open('Third snackbar');
+      viewContainerFixture.detectChanges();
+
+      viewContainerFixture.whenStable().then(() => {
+        expect(overlayContainerElement.textContent.trim()).toBe('Third snackbar');
+      });
+    });
+  }));
 });
 
 @Directive({selector: 'dir-with-view-container'})

diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
@@ -48,7 +48,10 @@ export class MdSnackBar {
 
     // When the snackbar is dismissed, clear the reference to it.
     snackBarRef.afterDismissed().subscribe(() => {
-      this._snackBarRef = null;
+      // Clear the snackbar ref if it hasn't already been replaced by a newer snackbar.
+      if (this._snackBarRef == snackBarRef) {
+        this._snackBarRef = null;
+      }
     });
 
     // If a snack bar is already in view, dismiss it and enter the new snack bar after exit