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.

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

Jump to bottom

fix(button): accent color not set on fab buttons with build optimizer #9376

Merged
merged 1 commit into from
Jan 23, 2018
Merged

fix(button): accent color not set on fab buttons with build optimizer #9376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions src/demo-app/button/button-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@
<section>
<button mat-button>flat</button>
<button mat-raised-button>raised</button>
<button mat-fab>
<mat-icon>check</mat-icon>
</button>
<button mat-fab>Btn</button>
<a mat-fab routerLink=".">Link</a>

<button mat-fab><mat-icon>check</mat-icon></button>
<button mat-fab color="primary">Btn</button>
<a mat-fab color="warn" routerLink=".">Link</a>
<a mat-fab routerLink="."><mat-icon>check</mat-icon></a>
<button mat-mini-fab>
<mat-icon>check</mat-icon>
</button>
<button mat-mini-fab>Btn</button>
<a mat-mini-fab routerLink=".">Link</a>

<button mat-mini-fab><mat-icon>check</mat-icon></button>
<button mat-mini-fab color="primary">Btn</button>
<a mat-mini-fab color="warn" routerLink=".">Link</a>
<a mat-mini-fab routerLink="."><mat-icon>check</mat-icon></a>
</section>

<section>
Expand Down
28 changes: 8 additions & 20 deletions src/lib/button/button.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ import {
Component,
Directive,
ElementRef,
forwardRef,
Inject,
OnDestroy,
Optional,
Self,
ViewEncapsulation,
} from '@angular/core';
import {
Expand Down Expand Up @@ -74,30 +70,17 @@ export class MatIconButtonCssMatStyler {}
selector: 'button[mat-fab], a[mat-fab]',
host: {'class': 'mat-fab'}
})
export class MatFab {
constructor(@Self() @Optional() @Inject(forwardRef(() => MatButton)) button: MatButton,
@Self() @Optional() @Inject(forwardRef(() => MatAnchor)) anchor: MatAnchor) {
// Set the default color palette for the mat-fab components.
(button || anchor).color = DEFAULT_ROUND_BUTTON_COLOR;
}
}
export class MatFab {}

/**
* Directive that targets mini-fab buttons and anchors. It's used to apply the `mat-` class
* to all mini-fab buttons and also is responsible for setting the default color palette.
* Directive whose purpose is to add the mat- CSS styling to this selector.
* @docs-private
*/
@Directive({
selector: 'button[mat-mini-fab], a[mat-mini-fab]',
host: {'class': 'mat-mini-fab'}
})
export class MatMiniFab {
constructor(@Self() @Optional() @Inject(forwardRef(() => MatButton)) button: MatButton,
@Self() @Optional() @Inject(forwardRef(() => MatAnchor)) anchor: MatAnchor) {
// Set the default color palette for the mat-mini-fab components.
(button || anchor).color = DEFAULT_ROUND_BUTTON_COLOR;
}
}
export class MatMiniFab {}


// Boilerplate for applying mixins to MatButton.
Expand Down Expand Up @@ -139,7 +122,12 @@ export class MatButton extends _MatButtonMixinBase
private _platform: Platform,
private _focusMonitor: FocusMonitor) {
super(elementRef);

this._focusMonitor.monitor(this._elementRef.nativeElement, true);

if (this._isRoundButton) {
this.color = DEFAULT_ROUND_BUTTON_COLOR;
}
}

ngOnDestroy() {
Expand Down