From 4660c93e75fd9379915087a237a5f81cfdf524e9 Mon Sep 17 00:00:00 2001
From: crisbeto <crisbeto@abv.bg>
Date: Mon, 24 Sep 2018 22:39:10 +0200
Subject: [PATCH] fix(snack-bar): announcing same message twice to screen
 readers

Currently we have `role="alert"` on the snack bar which will cause screen readers to announce the message automatically. On top of it, we also use the `LiveAnnouncer` to announce the same message, if the consumer hasn't set one. These changes clear the `announcementMessage` if it's the same as the main message.
---
 src/material/snack-bar/snack-bar.spec.ts | 8 +++-----
 src/material/snack-bar/snack-bar.ts      | 6 ++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/material/snack-bar/snack-bar.spec.ts b/src/material/snack-bar/snack-bar.spec.ts
index d71d28222f02..4bbbbb5861f1 100644
--- a/src/material/snack-bar/snack-bar.spec.ts
+++ b/src/material/snack-bar/snack-bar.spec.ts
@@ -190,18 +190,16 @@ describe('MatSnackBar', () => {
   }));
 
 
-  it('should default to the passed message for the announcement message', fakeAsync(() => {
+  it('should clear the announcement message if it is the same as main message', fakeAsync(() => {
     spyOn(liveAnnouncer, 'announce');
 
-    snackBar.open(simpleMessage);
+    snackBar.open(simpleMessage, undefined, {announcementMessage: simpleMessage});
     viewContainerFixture.detectChanges();
 
     expect(overlayContainerElement.childElementCount)
       .toBe(1, 'Expected the overlay with the default announcement message to be added');
 
-    // Expect the live announcer to have been called with the display message and some
-    // string for the politeness. We do not want to test for the default politeness here.
-    expect(liveAnnouncer.announce).toHaveBeenCalledWith(simpleMessage, jasmine.any(String));
+    expect(liveAnnouncer.announce).not.toHaveBeenCalled();
   }));
 
   it('should be able to specify a custom announcement message', fakeAsync(() => {
diff --git a/src/material/snack-bar/snack-bar.ts b/src/material/snack-bar/snack-bar.ts
index 18def6ea40de..4ff6b8b0f9fd 100644
--- a/src/material/snack-bar/snack-bar.ts
+++ b/src/material/snack-bar/snack-bar.ts
@@ -114,8 +114,10 @@ export class MatSnackBar implements OnDestroy {
     // override the data to pass in our own message and action.
     _config.data = {message, action};
 
-    if (!_config.announcementMessage) {
-      _config.announcementMessage = message;
+    // Since the snack bar has `role="alert"`, we don't
+    // want to announce the same message twice.
+    if (_config.announcementMessage === message) {
+      _config.announcementMessage = undefined;
     }
 
     return this.openFromComponent(SimpleSnackBar, _config);