Skip to content

Commit

Permalink
fix(checkbox): Fix native checked is not true when MdCheckbox initial…
Browse files Browse the repository at this point in the history
… checked value is true (#2055)

* Fix checked is not true when MdCheckbox initial checked value is true

* Add test

* fix lint
  • Loading branch information
tinayuangao authored Dec 2, 2016
1 parent b07aa7e commit 3fd3117
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
9 changes: 9 additions & 0 deletions src/lib/checkbox/checkbox.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,15 @@ describe('MdCheckbox', () => {
expect(inputElement.indeterminate).toBe(false);
});

it('should change native element checked when check programmatically', () => {
expect(inputElement.checked).toBe(false);

checkboxInstance.checked = true;
fixture.detectChanges();

expect(inputElement.checked).toBe(true);
});

it('should toggle checked state on click', () => {
expect(checkboxInstance.checked).toBe(false);

Expand Down
6 changes: 5 additions & 1 deletion src/lib/checkbox/checkbox.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
ChangeDetectorRef,
ChangeDetectionStrategy,
Component,
ElementRef,
Expand Down Expand Up @@ -156,7 +157,9 @@ export class MdCheckbox implements ControlValueAccessor {

hasFocus: boolean = false;

constructor(private _renderer: Renderer, private _elementRef: ElementRef) {
constructor(private _renderer: Renderer,
private _elementRef: ElementRef,
private _changeDetectorRef: ChangeDetectorRef) {
this.color = 'accent';
}

Expand All @@ -174,6 +177,7 @@ export class MdCheckbox implements ControlValueAccessor {
this._checked = checked;
this._transitionCheckState(
this._checked ? TransitionCheckState.Checked : TransitionCheckState.Unchecked);
this._changeDetectorRef.markForCheck();
}
}

Expand Down

0 comments on commit 3fd3117

Please sign in to comment.