Skip to content
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

fix(button-toggle): add the setDisabledState from ControlValueAccessor #2430

Merged
merged 1 commit into from
Jan 10, 2017
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
64 changes: 62 additions & 2 deletions src/lib/button-toggle/button-toggle.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
ComponentFixture,
TestBed,
} from '@angular/core/testing';
import {NgControl, FormsModule} from '@angular/forms';
import {NgControl, FormsModule, ReactiveFormsModule, FormControl} from '@angular/forms';
import {Component, DebugElement} from '@angular/core';
import {By} from '@angular/platform-browser';
import {
Expand All @@ -20,12 +20,13 @@ describe('MdButtonToggle', () => {

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [MdButtonToggleModule.forRoot(), FormsModule],
imports: [MdButtonToggleModule.forRoot(), FormsModule, ReactiveFormsModule],
declarations: [
ButtonTogglesInsideButtonToggleGroup,
ButtonToggleGroupWithNgModel,
ButtonTogglesInsideButtonToggleGroupMultiple,
ButtonToggleGroupWithInitialValue,
ButtonToggleGroupWithFormControl,
StandaloneButtonToggle,
],
});
Expand Down Expand Up @@ -464,6 +465,52 @@ describe('MdButtonToggle', () => {

});

describe('using FormControl', () => {
let fixture: ComponentFixture<ButtonToggleGroupWithFormControl>;
let groupDebugElement: DebugElement;
let groupInstance: MdButtonToggleGroup;
let testComponent: ButtonToggleGroupWithFormControl;

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

testComponent = fixture.debugElement.componentInstance;

groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
groupInstance = groupDebugElement.injector.get(MdButtonToggleGroup);
}));

it('should toggle the disabled state', () => {
testComponent.control.disable();

expect(groupInstance.disabled).toBe(true);

testComponent.control.enable();

expect(groupInstance.disabled).toBe(false);
});

it('should set the value', () => {
testComponent.control.setValue('green');

expect(groupInstance.value).toBe('green');

testComponent.control.setValue('red');

expect(groupInstance.value).toBe('red');
});

it('should register the on change callback', () => {
let spy = jasmine.createSpy('onChange callback');

testComponent.control.registerOnChange(spy);
testComponent.control.setValue('blue');

expect(spy).toHaveBeenCalled();
});
});

describe('as standalone', () => {
let fixture: ComponentFixture<StandaloneButtonToggle>;
let buttonToggleDebugElement: DebugElement;
Expand Down Expand Up @@ -598,3 +645,16 @@ class StandaloneButtonToggle { }
class ButtonToggleGroupWithInitialValue {
lastEvent: MdButtonToggleChange;
}

@Component({
template: `
<md-button-toggle-group [formControl]="control">
<md-button-toggle value="red">Value Red</md-button-toggle>
<md-button-toggle value="green">Value Green</md-button-toggle>
<md-button-toggle value="blue">Value Blue</md-button-toggle>
</md-button-toggle-group>
`
})
class ButtonToggleGroupWithFormControl {
control = new FormControl();
}
8 changes: 8 additions & 0 deletions src/lib/button-toggle/button-toggle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,14 @@ export class MdButtonToggleGroup implements AfterViewInit, ControlValueAccessor
registerOnTouched(fn: any) {
this.onTouched = fn;
}

/**
* Toggles the disabled state of the component. Implemented as part of ControlValueAccessor.
* @param isDisabled Whether the component should be disabled.
*/
setDisabledState(isDisabled: boolean): void {
this.disabled = isDisabled;
}
}

/** Multiple selection button-toggle group. `ngModel` is not supported in this mode. */
Expand Down