Skip to content

fix(snack-bar): allow multi-line text #3626

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 11, 2017
Merged

fix(snack-bar): allow multi-line text #3626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97e1081
fix(snack-bar): allow multi-line text
crisbeto Mar 15, 2017
1f3f9f0
chore: fix unit tests
crisbeto Mar 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/snack-bar/simple-snack-bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<span class="mat-simple-snackbar-message">{{message}}</span>
{{message}}
<button class="mat-simple-snackbar-action" *ngIf="hasAction" (click)="dismiss()">{{action}}</button>
11 changes: 4 additions & 7 deletions src/lib/snack-bar/simple-snack-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
@import '../core/style/button-common';
@import '../core/style/list-common';

$mat-snack-bar-button-margin: 48px !default;

:host {
display: flex;
justify-content: space-between;
Expand All @@ -13,20 +15,15 @@
}
}

.mat-simple-snackbar-message {
@include mat-truncate-line;
}

.mat-simple-snackbar-action {
@include mat-button-reset;

background: none;
margin: -5px 0 0;
padding: 5px;
text-transform: uppercase;
color: inherit;
line-height: inherit;
line-height: 1;
flex-shrink: 0;
margin-left: $mat-snack-bar-button-margin;
font: {
family: inherit;
size: inherit;
Expand Down
3 changes: 0 additions & 3 deletions src/lib/snack-bar/snack-bar-container.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@import '../core/a11y/a11y';

$mat-snack-bar-padding: 14px 24px !default;
$mat-snack-bar-height: 20px !default;
$mat-snack-bar-min-width: 288px !default;
$mat-snack-bar-max-width: 568px !default;

Expand All @@ -13,10 +12,8 @@ $mat-snack-bar-max-width: 568px !default;
border-radius: 2px;
box-sizing: content-box;
display: block;
height: $mat-snack-bar-height;
max-width: $mat-snack-bar-max-width;
min-width: $mat-snack-bar-min-width;
overflow: hidden;
padding: $mat-snack-bar-padding;
// Initial transformation is applied to start snack bar out of view.
transform: translateY(100%);
Expand Down
16 changes: 7 additions & 9 deletions src/lib/snack-bar/snack-bar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ describe('MdSnackBar', () => {
let snackBarRef = snackBar.open('Snack time!', 'CHEW');
viewContainerFixture.detectChanges();

let messageElement = overlayContainerElement.querySelector('.mat-simple-snackbar-message');
expect(messageElement.textContent)
.toBe('Snack time!', 'Expected snack bar to show a message without a ViewContainerRef');
let messageElement = overlayContainerElement.querySelector('snack-bar-container');
expect(messageElement.textContent).toContain('Snack time!',
'Expected snack bar to show a message without a ViewContainerRef');

snackBarRef.dismiss();
viewContainerFixture.detectChanges();
Expand All @@ -94,10 +94,9 @@ describe('MdSnackBar', () => {
expect(snackBarRef.instance.snackBarRef)
.toBe(snackBarRef, 'Expected the snack bar reference to be placed in the component instance');

let messageElement = overlayContainerElement.querySelector('span.mat-simple-snackbar-message');
expect(messageElement.tagName).toBe('SPAN', 'Expected snack bar message element to be <span>');
let messageElement = overlayContainerElement.querySelector('snack-bar-container');
expect(messageElement.textContent)
.toBe(simpleMessage, `Expected the snack bar message to be '${simpleMessage}''`);
.toContain(simpleMessage, `Expected the snack bar message to be '${simpleMessage}''`);

let buttonElement = overlayContainerElement.querySelector('button.mat-simple-snackbar-action');
expect(buttonElement.tagName)
Expand All @@ -119,10 +118,9 @@ describe('MdSnackBar', () => {
expect(snackBarRef.instance.snackBarRef)
.toBe(snackBarRef, 'Expected the snack bar reference to be placed in the component instance');

let messageElement = overlayContainerElement.querySelector('span.mat-simple-snackbar-message');
expect(messageElement.tagName).toBe('SPAN', 'Expected snack bar message element to be <span>');
let messageElement = overlayContainerElement.querySelector('snack-bar-container');
expect(messageElement.textContent)
.toBe(simpleMessage, `Expected the snack bar message to be '${simpleMessage}''`);
.toContain(simpleMessage, `Expected the snack bar message to be '${simpleMessage}''`);
expect(overlayContainerElement.querySelector('button.mat-simple-snackbar-action'))
.toBeNull('Expected the query selection for action label to be null');
});
Expand Down