Skip to content

Commit

Permalink
perf(tabs): use a transform to resize and move the ink bar (angular#1…
Browse files Browse the repository at this point in the history
…0664)

Uses a transform, rather than `left` and `width` to move/resize the ink bar in order to ensure a smoother transition.
  • Loading branch information
crisbeto authored and josephperrott committed May 29, 2018
1 parent 7ceedc7 commit b090f6d
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 10 deletions.
10 changes: 8 additions & 2 deletions src/lib/tabs/_tabs-common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,23 @@ $mat-tab-animation-duration: 500ms !default;
$height: 2px;

position: absolute;
left: 0;
bottom: 0;
height: $height;
transition: $mat-tab-animation-duration $ease-in-out-curve-function;
width: 1px;
transform-origin: 0;

.mat-tab-group-inverted-header & {
bottom: auto;
top: 0;
}

&.mat-ink-bar-animations-enabled {
transition: transform $mat-tab-animation-duration $ease-in-out-curve-function;
}

@include cdk-high-contrast {
outline: solid $height;
border-bottom: solid $height;
height: 0;
}
}
20 changes: 12 additions & 8 deletions src/lib/tabs/ink-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@

import {Directive, ElementRef, Inject, InjectionToken, NgZone} from '@angular/core';


/**
* Interface for a a MatInkBar positioner method, defining the positioning and width of the ink
* bar in a set of tabs.
*/
// tslint:disable-next-line class-name Using leading underscore to denote internal interface.
export interface _MatInkBarPositioner {
(element: HTMLElement): { left: string, width: string };
(element: HTMLElement): {left: number, width: number};
}

/** Injection token for the MatInkBar's Positioner. */
Expand All @@ -31,8 +30,8 @@ export const _MAT_INK_BAR_POSITIONER =
*/
export function _MAT_INK_BAR_POSITIONER_FACTORY(): _MatInkBarPositioner {
const method = (element: HTMLElement) => ({
left: element ? (element.offsetLeft || 0) + 'px' : '0',
width: element ? (element.offsetWidth || 0) + 'px' : '0',
left: element ? (element.offsetLeft || 0) : 0,
width: element ? (element.offsetWidth || 0) : 0,
});

return method;
Expand All @@ -50,7 +49,7 @@ export function _MAT_INK_BAR_POSITIONER_FACTORY(): _MatInkBarPositioner {
})
export class MatInkBar {
constructor(
private _elementRef: ElementRef,
private _elementRef: ElementRef<HTMLElement>,
private _ngZone: NgZone,
@Inject(_MAT_INK_BAR_POSITIONER) private _inkBarPositioner: _MatInkBarPositioner) { }

Expand Down Expand Up @@ -87,9 +86,14 @@ export class MatInkBar {
*/
private _setStyles(element: HTMLElement) {
const positions = this._inkBarPositioner(element);
const inkBar: HTMLElement = this._elementRef.nativeElement;
const inkBar = this._elementRef.nativeElement;

// We want to prevent the ink bar from animating on the initial load.
// Enable animations only if the ink bar has been translated before.
if (inkBar.style.transform) {
inkBar.classList.add('mat-ink-bar-animations-enabled');
}

inkBar.style.left = positions.left;
inkBar.style.width = positions.width;
inkBar.style.transform = `translateX(${positions.left}px) scaleX(${positions.width})`;
}
}

0 comments on commit b090f6d

Please sign in to comment.