Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "fix(snack-bar): announcing same message twice to screen readers" #14494

Merged
merged 6 commits into from
Dec 13, 2018
8 changes: 5 additions & 3 deletions src/lib/snack-bar/snack-bar.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,16 +186,18 @@ describe('MatSnackBar', () => {
}));


it('should clear the announcement message if it is the same as main message', fakeAsync(() => {
it('should default to the passed message for the announcement message', fakeAsync(() => {
spyOn(liveAnnouncer, 'announce');

snackBar.open(simpleMessage, undefined, {announcementMessage: simpleMessage});
snackBar.open(simpleMessage);
viewContainerFixture.detectChanges();

expect(overlayContainerElement.childElementCount)
.toBe(1, 'Expected the overlay with the default announcement message to be added');

expect(liveAnnouncer.announce).not.toHaveBeenCalled();
// 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));
}));

it('should be able to specify a custom announcement message', fakeAsync(() => {
Expand Down
6 changes: 2 additions & 4 deletions src/lib/snack-bar/snack-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,8 @@ export class MatSnackBar implements OnDestroy {
// override the data to pass in our own message and action.
_config.data = {message, action};

// Since the snack bar has `role="alert"`, we don't
// want to announce the same message twice.
if (_config.announcementMessage === message) {
_config.announcementMessage = undefined;
if (!_config.announcementMessage) {
_config.announcementMessage = message;
}

return this.openFromComponent(SimpleSnackBar, _config);
Expand Down