Skip to content

fix(material-experimental/mdc-progress-bar): changed after checked error on animation end event with noop animations #18508

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions src/material-experimental/mdc-progress-bar/progress-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
// Explicitly set to `block` since the browser defaults custom elements to `inline`.
display: block;

&._mat-animation-noopable {
.mdc-linear-progress__primary-bar {
// There's a `transitionend` event that depends on this element. Add a very short
// transition when animations are disabled so that the event can still fire.
transition: transform 1ms;
}
}

&:not(._mat-animation-noopable) {
@include mdc-linear-progress-core-styles($query: animation);
}
Expand Down
30 changes: 1 addition & 29 deletions src/material-experimental/mdc-progress-bar/progress-bar.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import {TestBed, async, ComponentFixture} from '@angular/core/testing';
import {TestBed, ComponentFixture} from '@angular/core/testing';
import {Component, DebugElement, Type} from '@angular/core';
import {By} from '@angular/platform-browser';
import {dispatchFakeEvent} from '@angular/cdk/testing/private';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {MatProgressBarModule} from './index';
import {MatProgressBar} from './progress-bar';

Expand Down Expand Up @@ -213,33 +212,6 @@ describe('MDC-based MatProgressBar', () => {
});
});

describe('With NoopAnimations', () => {
let progressComponent: MatProgressBar;
let primaryValueBar: DebugElement;
let fixture: ComponentFixture<BasicProgressBar>;

beforeEach(async(() => {
fixture = createComponent(BasicProgressBar, [MatProgressBarModule, NoopAnimationsModule]);
const progressElement = fixture.debugElement.query(By.css('mat-progress-bar'))!;
progressComponent = progressElement.componentInstance;
primaryValueBar = progressElement.query(By.css('.mdc-linear-progress__primary-bar'))!;
}));

it('should not bind transition end listener', () => {
spyOn(primaryValueBar.nativeElement, 'addEventListener');
fixture.detectChanges();

expect(primaryValueBar.nativeElement.addEventListener).not.toHaveBeenCalled();
});

it('should trigger the animationEnd output on value set', () => {
fixture.detectChanges();
spyOn(progressComponent.animationEnd, 'next');

progressComponent.value = 40;
expect(progressComponent.animationEnd.next).toHaveBeenCalledWith({ value: 40 });
});
});
});

@Component({template: '<mat-progress-bar></mat-progress-bar>'})
Expand Down
34 changes: 12 additions & 22 deletions src/material-experimental/mdc-progress-bar/progress-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,6 @@ export class MatProgressBar extends _MatProgressBarMixinBase implements AfterVie
set value(v: number) {
this._value = clamp(v || 0);
this._syncFoundation();

// When noop animation is set to true, trigger animationEnd directly.
if (this._isNoopAnimation) {
this._emitAnimationEnd();
}
}
private _value = 0;

Expand Down Expand Up @@ -162,16 +157,18 @@ export class MatProgressBar extends _MatProgressBarMixinBase implements AfterVie
this._foundation.init();
this._syncFoundation();

if (!this._isNoopAnimation) {
// Run outside angular so change detection didn't get triggered on every transition end
// instead only on the animation that we care about (primary value bar's transitionend)
this._ngZone.runOutsideAngular((() => {
this._animationEndSubscription =
(fromEvent(this._primaryBar, 'transitionend') as Observable<TransitionEvent>)
.pipe(filter(((e: TransitionEvent) => e.target === this._primaryBar)))
.subscribe(() => this._ngZone.run(() => this._emitAnimationEnd()));
}));
}
// Run outside angular so change detection didn't get triggered on every transition end
// instead only on the animation that we care about (primary value bar's transitionend)
this._ngZone.runOutsideAngular((() => {
this._animationEndSubscription =
(fromEvent(this._primaryBar, 'transitionend') as Observable<TransitionEvent>)
.pipe(filter(((e: TransitionEvent) => e.target === this._primaryBar)))
.subscribe(() => {
if (this.mode === 'determinate' || this.mode === 'buffer') {
this._ngZone.run(() => this.animationEnd.next({value: this.value}));
}
});
}));
}

ngOnDestroy() {
Expand All @@ -182,13 +179,6 @@ export class MatProgressBar extends _MatProgressBarMixinBase implements AfterVie
this._dirChangeSubscription.unsubscribe();
}

/** Emit an animationEnd event if in determinate or buffer mode. */
private _emitAnimationEnd(): void {
if (this.mode === 'determinate' || this.mode === 'buffer') {
this.animationEnd.next({value: this.value});
}
}

/** Syncs the state of the progress bar with the MDC foundation. */
private _syncFoundation() {
const foundation = this._foundation;
Expand Down