Skip to content

fix(slide-toggle) disabled state from a FormControl not updating #4797

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
5 changes: 5 additions & 0 deletions src/lib/slide-toggle/slide-toggle.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -618,27 +618,32 @@ describe('MdSlideToggle', () => {

let testComponent: SlideToggleWithFormControl;
let slideToggle: MdSlideToggle;
let inputElement: HTMLInputElement;

beforeEach(() => {
fixture = TestBed.createComponent(SlideToggleWithFormControl);
fixture.detectChanges();

testComponent = fixture.debugElement.componentInstance;
slideToggle = fixture.debugElement.query(By.directive(MdSlideToggle)).componentInstance;
inputElement = fixture.debugElement.query(By.css('input')).nativeElement;
});

it('should toggle the disabled state', () => {
expect(slideToggle.disabled).toBe(false);
expect(inputElement.disabled).toBe(false);

testComponent.formControl.disable();
fixture.detectChanges();

expect(slideToggle.disabled).toBe(true);
expect(inputElement.disabled).toBe(true);

testComponent.formControl.enable();
fixture.detectChanges();

expect(slideToggle.disabled).toBe(false);
expect(inputElement.disabled).toBe(false);
});
});
});
Expand Down
5 changes: 4 additions & 1 deletion src/lib/slide-toggle/slide-toggle.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
AfterContentInit,
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
ElementRef,
EventEmitter,
Expand Down Expand Up @@ -121,7 +122,8 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase

constructor(private _elementRef: ElementRef,
private _renderer: Renderer2,
private _focusOriginMonitor: FocusOriginMonitor) {
private _focusOriginMonitor: FocusOriginMonitor,
private _changeDetectorRef: ChangeDetectorRef) {
super();
}

Expand Down Expand Up @@ -190,6 +192,7 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase
/** Implemented as a part of ControlValueAccessor. */
setDisabledState(isDisabled: boolean): void {
this.disabled = isDisabled;
this._changeDetectorRef.markForCheck();
}

/** Focuses the slide-toggle. */
Expand Down