Skip to content

fix(material/core): noop animations not applying to selector lists #24904

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
May 11, 2022
Merged

fix(material/core): noop animations not applying to selector lists #24904

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: 5 additions & 14 deletions src/material/core/style/_private.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,11 @@
// NOTE: Currently this mixin should only be used with components that do not
// have any projected content.
@mixin private-animation-noop() {
// @at-root is used to steps outside of the hierarchy of the scss rules. This is
// done to allow a class to be added to be added to base of the scss nesting
// context.
// For example:
// .my-root {
// .my-subclass {
// @include mat-private-animation-noop();
// }
// }
// results in:
// ._mat-animation-noopable.my-root .my-subclass { ... }
@at-root ._mat-animation-noopable#{&} {
transition: none;
animation: none;
&._mat-animation-noopable {
// Use !important here since we don't know what context this mixin will
// be included in and MDC can have some really specific selectors.
transition: none !important;
animation: none !important;
@content;
}
}
13 changes: 8 additions & 5 deletions src/material/progress-spinner/progress-spinner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use '@angular/cdk';

@use '../core/style/variables';
@use '../core/style/private';

$_default-radius: 45px;
$_default-circumference: variables.$pi * $_default-radius * 2;
Expand All @@ -24,7 +23,6 @@ $_default-circumference: variables.$pi * $_default-radius * 2;
}

circle {
@include private.private-animation-noop();
fill: transparent;
transition: stroke-dashoffset 225ms linear;

Expand All @@ -37,22 +35,27 @@ $_default-circumference: variables.$pi * $_default-radius * 2;
}
}

&.mat-progress-spinner-indeterminate-animation[mode='indeterminate'] {
&[mode='indeterminate'] {
svg {
@include private.private-animation-noop();
animation: mat-progress-spinner-linear-rotate variables.$swift-ease-in-out-duration * 4
linear infinite;
}

circle {
@include private.private-animation-noop();
transition-property: stroke;
// Note: we multiply the duration by 8, because the animation is spread out in 8 stages.
animation-duration: variables.$swift-ease-in-out-duration * 8;
animation-timing-function: variables.$ease-in-out-curve-function;
animation-iteration-count: infinite;
}
}

&._mat-animation-noopable {
svg, circle {
animation: none;
transition: none;
}
}
}


Expand Down