Skip to content

Commit 437feeb

Browse files
committed
More checkbox animation to user interaction trigger
1 parent 0884afa commit 437feeb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/lib/checkbox/checkbox.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,11 +356,11 @@ describe('MdCheckbox', () => {
356356

357357
describe('state transition css classes', () => {
358358
it('should transition unchecked -> checked -> unchecked', () => {
359-
testComponent.isChecked = true;
359+
inputElement.click();
360360
fixture.detectChanges();
361361
expect(checkboxNativeElement.classList).toContain('mat-checkbox-anim-unchecked-checked');
362362

363-
testComponent.isChecked = false;
363+
inputElement.click();
364364
fixture.detectChanges();
365365
expect(checkboxNativeElement.classList)
366366
.not.toContain('mat-checkbox-anim-unchecked-checked');

src/lib/checkbox/checkbox.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ export class MdCheckbox implements ControlValueAccessor {
195195
this.indeterminateChange.emit(this._indeterminate);
196196
}
197197
this._checked = checked;
198-
this._transitionCheckState(
199-
this._checked ? TransitionCheckState.Checked : TransitionCheckState.Unchecked);
200198
this._changeDetectorRef.markForCheck();
201199
}
202200
}
@@ -342,6 +340,8 @@ export class MdCheckbox implements ControlValueAccessor {
342340

343341
if (!this.disabled) {
344342
this.toggle();
343+
this._transitionCheckState(
344+
this._checked ? TransitionCheckState.Checked : TransitionCheckState.Unchecked);
345345

346346
// Emit our custom change event if the native input emitted one.
347347
// It is important to only emit it, if the native input triggered one, because

0 commit comments

Comments
 (0)