Skip to content

fix(forms): not picking up disabled state if group is swapped out and disabled #43499

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
crisbeto wants to merge 2 commits into from
Closed

fix(forms): not picking up disabled state if group is swapped out and disabled #43499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97df03c
fix(forms): not picking up disabled state if group is swapped out and…
crisbeto Sep 18, 2021
9bf293e
fixup! fix(forms): not picking up disabled state if group is swapped …
crisbeto Sep 22, 2021
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: 0 additions & 3 deletions packages/forms/src/directives/reactive_directives/form_control_directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ export class FormControlDirective extends NgControl implements OnChanges, OnDest
cleanUpControl(previousForm, this, /* validateControlPresenceOnChange */ false);
}
setUpControl(this.form, this);
if (this.control.disabled && this.valueAccessor!.setDisabledState) {
Comment thread
crisbeto marked this conversation as resolved.
Resolved
this.valueAccessor!.setDisabledState!(true);
}
this.form.updateValueAndValidity({emitEvent: false});
}
if (isPropertyUpdated(changes, this.viewModel)) {
Expand Down
3 changes: 0 additions & 3 deletions packages/forms/src/directives/reactive_directives/form_control_name.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,6 @@ export class FormControlName extends NgControl implements OnChanges, OnDestroy {
private _setUpControl() {
this._checkParentType();
(this as {control: FormControl}).control = this.formDirective.addControl(this);
if (this.control.disabled && this.valueAccessor!.setDisabledState) {
this.valueAccessor!.setDisabledState!(true);
}
this._added = true;
}
}
4 changes: 4 additions & 0 deletions packages/forms/src/directives/shared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ export function setUpControl(control: FormControl, dir: NgControl): void {

dir.valueAccessor!.writeValue(control.value);

if (control.disabled) {
dir.valueAccessor!.setDisabledState?.(true);
Comment thread
dylhunn marked this conversation as resolved.
Resolved
}

setUpViewChangePipeline(control, dir);
setUpModelChangePipeline(control, dir);

Expand Down
38 changes: 37 additions & 1 deletion packages/forms/test/reactive_integration_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import {ɵgetDOM as getDOM} from '@angular/common';
import {Component, Directive, forwardRef, Input, NgModule, OnDestroy, Type} from '@angular/core';
import {ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
import {AbstractControl, AsyncValidator, AsyncValidatorFn, COMPOSITION_BUFFER_MODE, ControlValueAccessor, DefaultValueAccessor, FormArray, FormControl, FormControlDirective, FormControlName, FormGroup, FormGroupDirective, FormsModule, MaxValidator, MinLengthValidator, MinValidator, NG_ASYNC_VALIDATORS, NG_VALIDATORS, NG_VALUE_ACCESSOR, ReactiveFormsModule, Validator, Validators} from '@angular/forms';
import {AbstractControl, AsyncValidator, AsyncValidatorFn, COMPOSITION_BUFFER_MODE, ControlValueAccessor, DefaultValueAccessor, FormArray, FormBuilder, FormControl, FormControlDirective, FormControlName, FormGroup, FormGroupDirective, FormsModule, MaxValidator, MinLengthValidator, MinValidator, NG_ASYNC_VALIDATORS, NG_VALIDATORS, NG_VALUE_ACCESSOR, ReactiveFormsModule, Validator, Validators} from '@angular/forms';
import {By} from '@angular/platform-browser/src/dom/debug/by';
import {dispatchEvent, sortedClassList} from '@angular/platform-browser/testing/src/browser_util';
import {merge, NEVER, of, Subscription, timer} from 'rxjs';
Expand Down Expand Up @@ -309,6 +309,42 @@ const ValueAccessorB = createControlValueAccessor('[cva-b]');
expect(inputs[2]).not.toBeDefined();
});

it('should sync the disabled state if it changes right after a group is re-bound', () => {
@Component({
template: `
<form [formGroup]="form">
<input formControlName="input">
</form>
`
})
class App {
form: FormGroup;

constructor(private _fb: FormBuilder) {
this.form = this._getForm();
}

private _getForm() {
return this._fb.group({'input': 'value'});
}

recreateAndDisable() {
this.form = this._getForm();
this.form.disable();
}
}

const fixture = initTest(App);
fixture.detectChanges();

const input = fixture.nativeElement.querySelector('input');
expect(input.disabled).toBe(false);

fixture.componentInstance.recreateAndDisable();
fixture.detectChanges();
expect(input.disabled).toBe(true);
});

describe('nested control rebinding', () => {
it('should attach dir to control when leaf control changes', () => {
const form = new FormGroup({'login': new FormControl('oldValue')});
Expand Down