Skip to content

fix(material-experimental/mdc-button): not disabling animations under noop animations module #23027

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 1 commit into from
Jul 2, 2021
Merged

fix(material-experimental/mdc-button): not disabling animations under noop animations module #23027

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
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use '@material/button/button' as mdc-button;
@use '@material/button/variables' as mdc-button-variables;
@use '../../material/core/style/private';
@use '../mdc-helpers/mdc-helpers';
@use '../../cdk/a11y';
@use 'button-base';
Expand All @@ -11,6 +12,7 @@
@include button-base.mat-private-button-interactive();
@include button-base.mat-private-button-disabled();
@include button-base.mat-private-button-touch-target(false);
@include private.private-animation-noop();
}

// MDC expects button icons to contain this HTML content:
Expand Down
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-button/fab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use '@material/fab' as mdc-fab;
@use '../../material/core/style/private';
@use '../mdc-helpers/mdc-helpers';
@use 'button-base';

Expand All @@ -8,6 +9,7 @@
@include button-base.mat-private-button-interactive();
@include button-base.mat-private-button-disabled();
@include button-base.mat-private-button-touch-target(true);
@include private.private-animation-noop();

// MDC adds some styles to fab and mini-fab that conflict with some of our focus indicator
// styles and don't actually do anything. This undoes those conflicting styles.
Expand Down
2 changes: 2 additions & 0 deletions src/material-experimental/mdc-button/icon-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use '@material/icon-button' as mdc-icon-button;
@use '../../material/core/style/private';
@use '../mdc-helpers/mdc-helpers';
@use 'button-base';

Expand All @@ -14,6 +15,7 @@

@include button-base.mat-private-button-disabled();
@include button-base.mat-private-button-touch-target(true);
@include private.private-animation-noop();

// MDC adds some styles to icon buttons that conflict with some of our focus indicator styles
// and don't actually do anything. This undoes those conflicting styles.
Expand Down