Skip to content

fix(progress-spinner): animation not working when default size is set via token #11688

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
Jun 7, 2018
Merged

fix(progress-spinner): animation not working when default size is set via token #11688

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: 14 additions & 5 deletions src/lib/progress-spinner/progress-spinner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ const INDETERMINATE_ANIMATION_TEMPLATE = `
export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements CanColor {

private _value = 0;
private _strokeWidth = this._defaults ? this._defaults.strokeWidth : undefined;
private _strokeWidth: number;
private _fallbackAnimation = false;

/** Tracks diameters of existing instances to de-dupe generated styles (default d = 100) */
Expand All @@ -141,8 +141,7 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
this._attachStyleNode();
}
}
private _diameter = this._defaults && this._defaults.diameter ?
this._defaults.diameter : BASE_SIZE;
private _diameter = BASE_SIZE;

/** Stroke width of the progress spinner. */
@Input()
Expand All @@ -168,14 +167,24 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
constructor(public _elementRef: ElementRef,
platform: Platform,
@Optional() @Inject(DOCUMENT) private _document: any,
// @deletion-target 7.0.0 _animationMode and _defaults parameters to be made required.
// @deletion-target 7.0.0 _animationMode and defaults parameters to be made required.
@Optional() @Inject(ANIMATION_MODULE_TYPE) public _animationMode?: string,
@Inject(MAT_PROGRESS_SPINNER_DEFAULT_OPTIONS)
private _defaults?: MatProgressSpinnerDefaultOptions) {
defaults?: MatProgressSpinnerDefaultOptions) {

super(_elementRef);
this._fallbackAnimation = platform.EDGE || platform.TRIDENT;

if (defaults) {
if (defaults.diameter) {
this.diameter = defaults.diameter;
}

if (defaults.strokeWidth) {
this.strokeWidth = defaults.strokeWidth;
}
}

// On IE and Edge, we can't animate the `stroke-dashoffset`
// reliably so we fall back to a non-spec animation.
const animationClass =
Expand Down