Skip to content

perf(ripple): cache ClientRect between overlapping ripples #10206

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
Mar 6, 2018
Merged

perf(ripple): cache ClientRect between overlapping ripples #10206

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
20 changes: 16 additions & 4 deletions src/lib/core/ripple/ripple-renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ const ignoreMouseEventsTimeout = 800;
* @docs-private
*/
export class RippleRenderer {

/** Element where the ripples are being added to. */
private _containerElement: HTMLElement;

Expand All @@ -91,6 +90,12 @@ export class RippleRenderer {
/** Options that apply to all the event listeners that are bound by the renderer. */
private _eventOptions = supportsPassiveEventListeners() ? ({passive: true} as any) : false;

/**
* Cached dimensions of the ripple container. Set when the first
* ripple is shown and cleared once no more ripples are visible.
*/
private _containerRect: ClientRect | null;

constructor(private _target: RippleTarget,
private _ngZone: NgZone,
elementRef: ElementRef,
Expand All @@ -117,7 +122,8 @@ export class RippleRenderer {
* @param config Extra ripple options.
*/
fadeInRipple(x: number, y: number, config: RippleConfig = {}): RippleRef {
const containerRect = this._containerElement.getBoundingClientRect();
const containerRect = this._containerRect =
this._containerRect || this._containerElement.getBoundingClientRect();
const animationConfig = {...defaultRippleAnimationConfig, ...config.animation};

if (config.centered) {
Expand Down Expand Up @@ -173,8 +179,15 @@ export class RippleRenderer {

/** Fades out a ripple reference. */
fadeOutRipple(rippleRef: RippleRef) {
const wasActive = this._activeRipples.delete(rippleRef);

// Clear out the cached bounding rect if we have no more ripples.
if (!this._activeRipples.size) {
this._containerRect = null;
}

// For ripples that are not active anymore, don't re-un the fade-out animation.
if (!this._activeRipples.delete(rippleRef)) {
if (!wasActive) {
return;
}

Expand All @@ -183,7 +196,6 @@ export class RippleRenderer {

rippleEl.style.transitionDuration = `${animationConfig.exitDuration}ms`;
rippleEl.style.opacity = '0';

rippleRef.state = RippleState.FADING_OUT;

// Once the ripple faded out, the ripple can be safely removed from the DOM.
Expand Down