Skip to content

Use new class .mat-button-disabled for applying disabled button styles. #19406

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 5 commits into from
Jun 29, 2020
Merged

Use new class .mat-button-disabled for applying disabled button styles. #19406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45b36f4
Use new class .mat-button-disabled for applying disabled button styles.
nickwalther May 20, 2020
2d115cb
Merge branch 'master' into mat-button-disbaled
nickwalther May 20, 2020
599ed04
Add class to anchor too
nickwalther May 26, 2020
7195f27
Merge branch 'mat-button-disbaled' of https://github.com/nickwalther/…
nickwalther May 26, 2020
da70133
Add comment
nickwalther Jun 23, 2020
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/material/button/_button-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ $mat-mini-fab-padding: 8px !default;
// on most browsers except on IE11 where it defaults to `hidden`.
overflow: visible;

&[disabled] {
&.mat-button-disabled {
cursor: default;
}

Expand Down
16 changes: 8 additions & 8 deletions src/material/button/_button-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $_mat-button-ripple-opacity: 0.1;
background-color: mat-color($warn);
}

&[disabled] .mat-button-focus-overlay {
&.mat-button-disabled .mat-button-focus-overlay {
background-color: transparent;
}
}
Expand Down Expand Up @@ -76,8 +76,8 @@ $_mat-button-ripple-opacity: 0.1;
#{$property}: mat-color($warn, $hue);
}

&.mat-primary, &.mat-accent, &.mat-warn, &[disabled] {
&[disabled] {
&.mat-primary, &.mat-accent, &.mat-warn, &.mat-button-disabled {
&.mat-button-disabled {
$palette: if($property == 'color', $foreground, $background);
#{$property}: mat-color($palette, disabled-button);
}
Expand Down Expand Up @@ -118,7 +118,7 @@ $_mat-button-ripple-opacity: 0.1;

// Note: this needs a bit extra specificity, because we're not guaranteed the inclusion
// order of the theme styles and the button reset may end up resetting this as well.
.mat-stroked-button:not([disabled]) {
.mat-stroked-button:not(.mat-button-disabled) {
border-color: mat-color($foreground, divider);
}

Expand All @@ -139,23 +139,23 @@ $_mat-button-ripple-opacity: 0.1;
.mat-raised-button {
@include _mat-theme-overridable-elevation(2, $config);

&:not([disabled]):active {
&:not(.mat-button-disabled):active {
@include _mat-theme-overridable-elevation(8, $config);
}

&[disabled] {
&.mat-button-disabled {
@include _mat-theme-overridable-elevation(0, $config);
}
}

.mat-fab, .mat-mini-fab {
@include _mat-theme-overridable-elevation(6, $config);

&:not([disabled]):active {
&:not(.mat-button-disabled):active {
@include _mat-theme-overridable-elevation(12, $config);
}

&[disabled] {
&.mat-button-disabled {
@include _mat-theme-overridable-elevation(0, $config);
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/material/button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

// Only basic and stroked buttons (not raised, FABs or icon buttons) have a hover style.
// Use the same visual treatment for hover as for focus.
.mat-button:hover,
.mat-stroked-button:hover {
.mat-button-focus-overlay {
.mat-button,
.mat-stroked-button {
&:hover:not(.mat-button-disabled) .mat-button-focus-overlay {
opacity: 0.04;
}
}
Expand All @@ -23,9 +23,9 @@
// enhancement and not all desktop browsers support this kind of media query, we can't
// use something like `@media (hover)`.
@media (hover: none) {
.mat-button:hover,
.mat-stroked-button:hover {
.mat-button-focus-overlay {
.mat-button,
.mat-stroked-button {
&:hover:not(.mat-button-disabled) .mat-button-focus-overlay {
opacity: 0;
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/material/button/button.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ const _MatButtonMixinBase: CanDisableRippleCtor & CanDisableCtor & CanColorCtor
host: {
'[attr.disabled]': 'disabled || null',
'[class._mat-animation-noopable]': '_animationMode === "NoopAnimations"',
// Add a class for disabled button styling instead of the using attribute
// selector or pseudo-selector. This allows users to create focusabled
// disabled buttons without recreating the styles.
'[class.mat-button-disabled]': 'disabled',
'class': 'mat-focus-indicator',
},
templateUrl: 'button.html',
Expand Down Expand Up @@ -157,6 +161,7 @@ export class MatButton extends _MatButtonMixinBase
'[attr.aria-disabled]': 'disabled.toString()',
'(click)': '_haltDisabledEvents($event)',
'[class._mat-animation-noopable]': '_animationMode === "NoopAnimations"',
'[class.mat-button-disabled]': 'disabled',
'class': 'mat-focus-indicator',
},
inputs: ['disabled', 'disableRipple', 'color'],
Expand Down