X Tutup
Skip to content

fix(forms): correct radio input functionality #5506

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.

Sign up for GitHub

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

Closed
robwormald wants to merge 1 commit into from
Closed

fix(forms): correct radio input functionality #5506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions modules/angular2/src/common/forms/directives.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {NgForm} from './directives/ng_form';
import {DefaultValueAccessor} from './directives/default_value_accessor';
import {CheckboxControlValueAccessor} from './directives/checkbox_value_accessor';
import {NumberValueAccessor} from './directives/number_value_accessor';
import {RadioControlValueAccessor} from './directives/radio_control_value_accessor';
import {NgControlStatus} from './directives/ng_control_status';
import {
SelectControlValueAccessor,
Expand All @@ -23,6 +24,7 @@ export {NgFormModel} from './directives/ng_form_model';
export {NgForm} from './directives/ng_form';
export {DefaultValueAccessor} from './directives/default_value_accessor';
export {CheckboxControlValueAccessor} from './directives/checkbox_value_accessor';
export {RadioControlValueAccessor} from './directives/radio_control_value_accessor';
export {NumberValueAccessor} from './directives/number_value_accessor';
export {NgControlStatus} from './directives/ng_control_status';
export {
Expand Down Expand Up @@ -63,6 +65,7 @@ export const FORM_DIRECTIVES: Type[] = CONST_EXPR([
NumberValueAccessor,
CheckboxControlValueAccessor,
SelectControlValueAccessor,
RadioControlValueAccessor,
NgControlStatus,

RequiredValidator,
Expand Down
63 changes: 63 additions & 0 deletions modules/angular2/src/common/forms/directives/radio_control_value_accessor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import {
Directive,
ElementRef,
Renderer,
Self,
forwardRef,
Provider,
Attribute,
Input
} from 'angular2/core';
import {
NG_VALUE_ACCESSOR,
ControlValueAccessor
} from 'angular2/src/common/forms/directives/control_value_accessor';
import {CONST_EXPR} from 'angular2/src/facade/lang';

const RADIO_VALUE_ACCESSOR = CONST_EXPR(new Provider(
NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => RadioControlValueAccessor), multi: true}));

/**
* The accessor for writing a radio control value and listening to changes that is used by the
* {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
*
* ### Example
* ```
* <input type="radio" name="food" [(ng-model)]="food" value="chicken">
* <input type="radio" name="food" [(ng-model)]="food" value="fish">
* ```
*/
@Directive({
selector:
'input[type=radio][ng-control],input[type=radio][ng-form-control],input[type=radio][ng-model]',
host: {
'(click)': 'onChange($event.target.value)',
'(input)': 'onChange($event.target.value)',
'(blur)': 'onTouched()'
},
bindings: [RADIO_VALUE_ACCESSOR]
Copy link
Copy Markdown
Contributor

@IgorMinar IgorMinar Dec 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use providers

})
export class RadioControlValueAccessor implements ControlValueAccessor {
@Input('value') optionValue: any;
value: any;
onChange = (_) => {};
onTouched = () => {};

constructor(private _renderer: Renderer, private _elementRef: ElementRef) {}

private _updateCheckedState() {
if (this.value == this.optionValue) {
Copy link
Copy Markdown
Contributor

@vsavkin vsavkin Dec 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use looseIdentical from lang.ts

this._renderer.setElementProperty(this._elementRef, 'checked', true);
}
}

writeValue(value: any): void {
this.value = value;
this._updateCheckedState();
}

registerOnChange(fn: (_: any) => void): void {
this.onChange = (value) => { fn(this.optionValue); };
}
registerOnTouched(fn: () => void): void { this.onTouched = fn; }
}
47 changes: 47 additions & 0 deletions modules/angular2/test/common/forms/integration_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,53 @@ export function main() {
async.done();
});
}));

it("should support <type=radio>",
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var t = `<div [ng-form-model]="form">
<input type="radio" ng-control="food" name="food" value="chicken">
Copy link
Copy Markdown
Contributor

@vsavkin vsavkin Dec 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does using the same name/ng-control with multiple elements work when using template-driven forms?

<input type="radio" ng-control="food" name="food" value="fish">
</div>`;

tcb.overrideTemplate(MyComp, t).createAsync(MyComp).then((fixture) => {
fixture.debugElement.componentInstance.form =
new ControlGroup({"food": new Control("fish")});
fixture.detectChanges();

var input = fixture.debugElement.query(By.css("input"));
expect(input.nativeElement.checked).toEqual(false);

dispatchEvent(input.nativeElement, "click");
fixture.detectChanges();

expect(fixture.debugElement.componentInstance.form.value).toEqual({"food": "chicken"});
expect(input.nativeElement.checked).toEqual(true);
async.done();
});
}));
it("should support <type=radio> with dynamic values",
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var t = `<div [ng-form-model]="form">
<input *ng-for="#c of data" type="radio" ng-control="food" name="food" [value]="c">
</div>`;

tcb.overrideTemplate(MyComp, t).createAsync(MyComp).then((fixture) => {
fixture.debugElement.componentInstance.data = ["chicken", "fish"];
fixture.debugElement.componentInstance.form =
new ControlGroup({"food": new Control("fish")});
fixture.detectChanges();

var input = fixture.debugElement.query(By.css("input"));
expect(input.nativeElement.checked).toEqual(false);

dispatchEvent(input.nativeElement, "click");
fixture.detectChanges();

expect(fixture.debugElement.componentInstance.form.value).toEqual({"food": "chicken"});
expect(input.nativeElement.checked).toEqual(true);
async.done();
});
}));

it("should support <select>",
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
Expand Down
X Tutup