mirror of
https://github.com/angular/angular.git
synced 2026-09-14 13:54:52 +08:00
feat(ripple): support ripple fade-out on pointer up (#9694)
* feat(ripple): support ripple fade-out on pointer up By default, ripples in Angular Material will only fade out if the pointer is released and the enter animation completed. This behavior is similar in the MDC implementation of the Material Design guidelines. In some scenarios, developers prefer fading out the ripples immediately on pointer release. Similarly the Material Design guidelines also have some videos that show ripples that seem to follow that behavior as well. To be able to provide the necessary flexibility (as we already did with the animation durations), the `terminateOnPointerUp` global option has been added. Closes #9577 * Comment improvements * Remove unnecessary whitespace
This commit is contained in:
committed by
tinayuangao
parent
acbf3c8ec0
commit
efb03c9ec8
@@ -15,6 +15,7 @@ export type RippleConfig = {
|
||||
radius?: number;
|
||||
persistent?: boolean;
|
||||
animation?: RippleAnimationConfig;
|
||||
terminateOnPointerUp?: boolean;
|
||||
/** @deprecated Use the animation property instead. */
|
||||
speedFactor?: number;
|
||||
};
|
||||
@@ -244,9 +245,14 @@ export class RippleRenderer {
|
||||
|
||||
this._isPointerDown = false;
|
||||
|
||||
// Fade-out all ripples that are completely visible and not persistent.
|
||||
// Fade-out all ripples that are visible and not persistent.
|
||||
this._activeRipples.forEach(ripple => {
|
||||
if (!ripple.config.persistent && ripple.state === RippleState.VISIBLE) {
|
||||
// By default, only ripples that are completely visible will fade out on pointer release.
|
||||
// If the `terminateOnPointerUp` option is set, ripples that still fade in will also fade out.
|
||||
const isVisible = ripple.state === RippleState.VISIBLE ||
|
||||
ripple.config.terminateOnPointerUp && ripple.state === RippleState.FADING_IN;
|
||||
|
||||
if (!ripple.config.persistent && isVisible) {
|
||||
ripple.fadeOut();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -500,6 +500,27 @@ describe('MatRipple', () => {
|
||||
|
||||
expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(0);
|
||||
}));
|
||||
|
||||
it('should allow ripples to fade out immediately on pointer up', fakeAsync(() => {
|
||||
createTestComponent({
|
||||
terminateOnPointerUp: true
|
||||
});
|
||||
|
||||
dispatchMouseEvent(rippleTarget, 'mousedown');
|
||||
dispatchMouseEvent(rippleTarget, 'mouseup');
|
||||
|
||||
expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(1);
|
||||
|
||||
// Ignore the enter duration, because we immediately fired the mouseup after the mousedown.
|
||||
// This means that the ripple should just fade out, and there shouldn't be an enter animation.
|
||||
tick(exitDuration);
|
||||
|
||||
expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(0);
|
||||
|
||||
// Since the enter duration is bigger than the exit duration, the enter duration timer
|
||||
// will still exist. To properly finish all timers, we just wait the remaining time.
|
||||
tick(enterDuration - exitDuration);
|
||||
}));
|
||||
});
|
||||
|
||||
describe('configuring behavior', () => {
|
||||
|
||||
@@ -42,6 +42,12 @@ export interface RippleGlobalOptions {
|
||||
* @deprecated Use the `animation` global option instead.
|
||||
*/
|
||||
baseSpeedFactor?: number;
|
||||
|
||||
/**
|
||||
* Whether ripples should start fading out immediately after the mouse our touch is released. By
|
||||
* default, ripples will wait for the enter animation to complete and for mouse or touch release.
|
||||
*/
|
||||
terminateOnPointerUp?: boolean;
|
||||
}
|
||||
|
||||
/** Injection token that can be used to specify the global ripple options. */
|
||||
@@ -159,6 +165,7 @@ export class MatRipple implements OnInit, OnDestroy, RippleTarget {
|
||||
radius: this.radius,
|
||||
color: this.color,
|
||||
animation: {...this._globalOptions.animation, ...this.animation},
|
||||
terminateOnPointerUp: this._globalOptions.terminateOnPointerUp,
|
||||
speedFactor: this.speedFactor * (this._globalOptions.baseSpeedFactor || 1),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -240,6 +240,7 @@ export class MatTabLink extends _MatTabLinkMixinBase
|
||||
|
||||
if (globalOptions) {
|
||||
this.rippleConfig = {
|
||||
terminateOnPointerUp: globalOptions.terminateOnPointerUp,
|
||||
speedFactor: globalOptions.baseSpeedFactor,
|
||||
animation: globalOptions.animation,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user