Skip to content

Commit 8f2de31

Browse files
committed
Use different curves for opacity and transform
1 parent 110ebe0 commit 8f2de31

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/lib/core/ripple/_ripple.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ $mat-ripple-color-opacity: 0.1;
2424
border-radius: 50%;
2525
pointer-events: none;
2626

27-
transition: opacity, transform 0ms cubic-bezier(0, 0, 0.2, 1);
27+
transition: opacity 0ms cubic-bezier(0.4, 0.0, 1, 1),
28+
transform 0ms cubic-bezier(0, 0, 0.2, 1);
2829
transform: scale(0);
2930
}
3031
}

src/lib/core/ripple/ripple-renderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ export class RippleRenderer {
193193

194194
// Fade-out all ripples that are not persistent.
195195
this._activeRipples.forEach(ripple => {
196-
if (!ripple.config.persistent) {
196+
if (!ripple.config.persistent && ripple.state === RippleState.VISIBLE) {
197197
ripple.fadeOut();
198198
}
199199
});

0 commit comments

Comments
 (0)