Skip to content

Commit ebb1c73

Browse files
crisbetoandrewseguin
authored andcommitted
fix(material-experimental/mdc-button): not disabling animations under noop animations module (#23027)
Fixes that the MDC-based buttons weren't disabling their animations when noop animations are enabled. (cherry picked from commit 72ae5a2)
1 parent c10c257 commit ebb1c73

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

src/material-experimental/mdc-button/button.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@use '@material/button/button' as mdc-button;
22
@use '@material/button/variables' as mdc-button-variables;
3+
@use '../../material/core/style/private';
34
@use '../mdc-helpers/mdc-helpers';
45
@use '../../cdk/a11y';
56
@use 'button-base';
@@ -11,6 +12,7 @@
1112
@include button-base.mat-private-button-interactive();
1213
@include button-base.mat-private-button-disabled();
1314
@include button-base.mat-private-button-touch-target(false);
15+
@include private.private-animation-noop();
1416
}
1517

1618
// MDC expects button icons to contain this HTML content:

src/material-experimental/mdc-button/fab.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use '@material/fab' as mdc-fab;
2+
@use '../../material/core/style/private';
23
@use '../mdc-helpers/mdc-helpers';
34
@use 'button-base';
45

@@ -8,6 +9,7 @@
89
@include button-base.mat-private-button-interactive();
910
@include button-base.mat-private-button-disabled();
1011
@include button-base.mat-private-button-touch-target(true);
12+
@include private.private-animation-noop();
1113

1214
// MDC adds some styles to fab and mini-fab that conflict with some of our focus indicator
1315
// styles and don't actually do anything. This undoes those conflicting styles.

src/material-experimental/mdc-button/icon-button.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use '@material/icon-button' as mdc-icon-button;
2+
@use '../../material/core/style/private';
23
@use '../mdc-helpers/mdc-helpers';
34
@use 'button-base';
45

@@ -14,6 +15,7 @@
1415

1516
@include button-base.mat-private-button-disabled();
1617
@include button-base.mat-private-button-touch-target(true);
18+
@include private.private-animation-noop();
1719

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

0 commit comments

Comments
 (0)