fix(select): fix initial values with reactive forms (#2038)

Closes #1973
This commit is contained in:
Kara
2016-11-30 17:08:56 -08:00
committed by tinayuangao
parent 46ae3a2c4b
commit 26eb7ceb1e
3 changed files with 33 additions and 3 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ export class SelectDemo {
isRequired = false;
isDisabled = false;
currentDrink: string;
foodControl = new FormControl('');
foodControl = new FormControl('pizza-1');
foods = [
{value: 'steak-0', viewValue: 'Steak'},
+21
View File
@@ -244,8 +244,29 @@ describe('MdSelect', () => {
beforeEach(() => {
fixture = TestBed.createComponent(BasicSelect);
});
it('should take an initial view value with reactive forms', () => {
fixture.componentInstance.control = new FormControl('pizza-1');
fixture.detectChanges();
const value = fixture.debugElement.query(By.css('.md-select-value'));
expect(value.nativeElement.textContent)
.toContain('Pizza', `Expected trigger to be populated by the control's initial value.`);
trigger = fixture.debugElement.query(By.css('.md-select-trigger')).nativeElement;
trigger.click();
fixture.detectChanges();
const options =
overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
expect(options[1].classList)
.toContain('md-selected',
`Expected option with the control's initial value to be selected.`);
});
beforeEach(() => {
fixture.detectChanges();
trigger = fixture.debugElement.query(By.css('.md-select-trigger')).nativeElement;
});
+11 -2
View File
@@ -5,6 +5,7 @@ import {
ElementRef,
EventEmitter,
Input,
NgZone,
OnDestroy,
Optional,
Output,
@@ -133,7 +134,8 @@ export class MdSelect implements AfterContentInit, ControlValueAccessor, OnDestr
@Output() onClose = new EventEmitter();
constructor(private _element: ElementRef, private _renderer: Renderer,
@Optional() private _dir: Dir, @Optional() public _control: NgControl) {
@Optional() private _dir: Dir, @Optional() public _control: NgControl,
private _ngZone: NgZone) {
if (this._control) {
this._control.valueAccessor = this;
}
@@ -175,7 +177,14 @@ export class MdSelect implements AfterContentInit, ControlValueAccessor, OnDestr
* required to integrate with Angular's core forms API.
*/
writeValue(value: any): void {
if (!this.options) { return; }
if (!this.options) {
// In reactive forms, writeValue() will be called synchronously before
// the select's child options have been created. It's necessary to call
// writeValue() again after the options have been created to ensure any
// initial view value is set.
this._ngZone.onStable.first().subscribe(() => this.writeValue(value));
return;
}
this.options.forEach((option: MdOption) => {
if (option.value === value) {