Skip to content

Commit fe1de10

Browse files
mmalerbaamysorto
authored andcommitted
fix(material-experimental/mdc-snack-bar): use same container selector as non-mdc version (#23075)
(cherry picked from commit fa35251)
1 parent c21da30 commit fe1de10

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/material-experimental/mdc-snack-bar/snack-bar-container.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const MDC_SNACKBAR_LABEL_CLASS = 'mdc-snackbar__label';
4444
* @docs-private
4545
*/
4646
@Component({
47-
selector: 'mat-mdc-snack-bar-container',
47+
selector: 'mat-snack-bar-container',
4848
templateUrl: 'snack-bar-container.html',
4949
styleUrls: ['snack-bar-container.css'],
5050
// In Ivy embedded views will be change detected from their declaration place, rather than

src/material-experimental/mdc-snack-bar/snack-bar.spec.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ describe('MatSnackBar', () => {
6868
snackBar.open('Snack time!', 'Chew');
6969
viewContainerFixture.detectChanges();
7070

71-
const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
71+
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
7272
const inertElement = containerElement.querySelector('[aria-hidden]')!;
7373

7474
expect(inertElement.getAttribute('aria-hidden'))
@@ -85,7 +85,7 @@ describe('MatSnackBar', () => {
8585
snackBar.open('Snack time!', 'Chew');
8686
viewContainerFixture.detectChanges();
8787

88-
const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
88+
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
8989
const liveElement = containerElement.querySelector('[aria-live]')!;
9090
tick(announceDelay);
9191

@@ -120,7 +120,7 @@ describe('MatSnackBar', () => {
120120

121121
viewContainerFixture.detectChanges();
122122

123-
const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
123+
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
124124
const liveElement = containerElement.querySelector('[aria-live]')!;
125125

126126
expect(liveElement.getAttribute('aria-live')).toBe('assertive',
@@ -133,7 +133,7 @@ describe('MatSnackBar', () => {
133133
{announcementMessage: 'Yay Burritos', politeness: 'assertive'});
134134
viewContainerFixture.detectChanges();
135135

136-
const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
136+
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
137137
const liveElement = containerElement.querySelector('[aria-live]')!;
138138

139139
expect(liveElement.getAttribute('aria-live'))
@@ -144,7 +144,7 @@ describe('MatSnackBar', () => {
144144
snackBar.openFromComponent(BurritosNotification, {politeness: 'polite'});
145145
viewContainerFixture.detectChanges();
146146

147-
const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
147+
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
148148
const liveElement = containerElement.querySelector('[aria-live]')!;
149149

150150
expect(liveElement.getAttribute('aria-live'))
@@ -155,7 +155,7 @@ describe('MatSnackBar', () => {
155155
snackBar.openFromComponent(BurritosNotification, {politeness: 'off'});
156156
viewContainerFixture.detectChanges();
157157

158-
const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
158+
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
159159
const liveElement = containerElement.querySelector('[aria-live]')!;
160160

161161
expect(liveElement.getAttribute('aria-live'))
@@ -167,7 +167,7 @@ describe('MatSnackBar', () => {
167167
snackBar.openFromComponent(BurritosNotification, {politeness: 'assertive'});
168168
viewContainerFixture.detectChanges();
169169

170-
const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
170+
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
171171
const liveElement = containerElement.querySelector('[aria-live]')!;
172172

173173
expect(liveElement.getAttribute('role'))
@@ -179,7 +179,7 @@ describe('MatSnackBar', () => {
179179
snackBar.openFromComponent(BurritosNotification, {politeness: 'polite'});
180180
viewContainerFixture.detectChanges();
181181

182-
const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
182+
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
183183
const liveElement = containerElement.querySelector('[aria-live]')!;
184184

185185
expect(liveElement.getAttribute('role'))
@@ -198,7 +198,7 @@ describe('MatSnackBar', () => {
198198
let snackBarRef = snackBar.open('Snack time!', 'Chew');
199199
viewContainerFixture.detectChanges();
200200

201-
let messageElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
201+
let messageElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
202202
expect(messageElement.textContent).toContain('Snack time!',
203203
'Expected snack bar to show a message without a ViewContainerRef');
204204

@@ -222,7 +222,7 @@ describe('MatSnackBar', () => {
222222
.toBe(snackBarRef,
223223
'Expected the snack bar reference to be placed in the component instance');
224224

225-
let messageElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
225+
let messageElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
226226
expect(messageElement.textContent)
227227
.toContain(simpleMessage, `Expected the snack bar message to be '${simpleMessage}'`);
228228

@@ -246,7 +246,7 @@ describe('MatSnackBar', () => {
246246
.toBe(snackBarRef,
247247
'Expected the snack bar reference to be placed in the component instance');
248248

249-
let messageElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
249+
let messageElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
250250
expect(messageElement.textContent)
251251
.toContain(simpleMessage, `Expected the snack bar message to be '${simpleMessage}'`);
252252
expect(overlayContainerElement.querySelector('button.mat-mdc-button'))
@@ -266,7 +266,7 @@ describe('MatSnackBar', () => {
266266

267267
snackBarRef.dismiss();
268268
viewContainerFixture.detectChanges();
269-
const messageElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
269+
const messageElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
270270
expect (messageElement.hasAttribute('mat-exit'))
271271
.toBe(true, 'Expected the snackbar container to have the "exit" attribute upon dismiss');
272272

@@ -485,7 +485,7 @@ describe('MatSnackBar', () => {
485485
viewContainerFixture.detectChanges();
486486

487487
let containerClasses =
488-
overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!.classList;
488+
overlayContainerElement.querySelector('mat-snack-bar-container')!.classList;
489489

490490
expect(containerClasses).toContain('one');
491491
expect(containerClasses).toContain('two');
@@ -522,7 +522,7 @@ describe('MatSnackBar', () => {
522522
snackBar.open(simpleMessage);
523523
flush();
524524

525-
expect(overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!.classList)
525+
expect(overlayContainerElement.querySelector('mat-snack-bar-container')!.classList)
526526
.toContain('custom-class', 'Expected class applied through the defaults to be applied.');
527527
}));
528528

@@ -621,7 +621,7 @@ describe('MatSnackBar', () => {
621621
templateFixture.detectChanges();
622622

623623
const containerElement =
624-
overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
624+
overlayContainerElement.querySelector('mat-snack-bar-container')!;
625625

626626
expect(containerElement.textContent).toContain('Fries');
627627
expect(containerElement.textContent).toContain('Pizza');
@@ -639,7 +639,7 @@ describe('MatSnackBar', () => {
639639
templateFixture.detectChanges();
640640

641641
const containerElement =
642-
overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
642+
overlayContainerElement.querySelector('mat-snack-bar-container')!;
643643

644644
expect(containerElement.textContent).toContain('Oranges');
645645
});

0 commit comments

Comments
 (0)