Skip to content

fix(forms): fix enabling form control after it was disabled #36227

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
sonukapoor wants to merge 1 commit into from
Closed

fix(forms): fix enabling form control after it was disabled #36227

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
4 changes: 2 additions & 2 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 @@ -185,8 +185,8 @@ export class FormControlDirective extends NgControl implements OnChanges {
ngOnChanges(changes: SimpleChanges): void {
if (this._isControlChanged(changes)) {
setUpControl(this.form, this);
if (this.control.disabled && this.valueAccessor !.setDisabledState) {
this.valueAccessor !.setDisabledState !(true);
if (this.valueAccessor !.setDisabledState) {
this.valueAccessor !.setDisabledState !(this.control.disabled);
}
this.form.updateValueAndValidity({emitEvent: false});
}
Expand Down
34 changes: 34 additions & 0 deletions packages/forms/test/directives_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ import {SpyNgControl, SpyValueAccessor} from './spies';

class DummyControlValueAccessor implements ControlValueAccessor {
writtenValue: any;
disabled: boolean = false;

registerOnChange(fn: any) {}
registerOnTouched(fn: any) {}

writeValue(obj: any): void { this.writtenValue = obj; }
setDisabledState?(isDisabled: boolean): void { this.disabled = isDisabled; }
}

class CustomValidatorDirective implements Validator {
Expand Down Expand Up @@ -605,6 +607,38 @@ function asyncValidator(expected: any, timeout = 0) {
expect(ngModel.control.errors).toEqual({'async': true});
}));

it('should toggle enable/disable status on control', () => {
const controlDir =
new FormControlDirective([Validators.required], [], [defaultAccessor], null);
controlDir.valueAccessor = new DummyControlValueAccessor();
const spyOnDisabledState = spyOn(controlDir.valueAccessor, 'setDisabledState');

let enabledControl = new FormControl(1);
controlDir.form = enabledControl;
controlDir.ngOnChanges({'form': new SimpleChange(undefined, enabledControl, true)});

expect(enabledControl.status).toEqual('VALID');
expect(spyOnDisabledState).toHaveBeenCalledWith(false);
spyOnDisabledState.calls.reset();

const disabledControl = new FormControl(2);
controlDir.form = disabledControl;
disabledControl.disable();
controlDir.ngOnChanges({'form': new SimpleChange(enabledControl, disabledControl, false)});

expect(disabledControl.status).toEqual('DISABLED');
expect(spyOnDisabledState).toHaveBeenCalledWith(true);
spyOnDisabledState.calls.reset();

enabledControl = new FormControl(3);
controlDir.form = enabledControl;
enabledControl.enable();
controlDir.ngOnChanges({'form': new SimpleChange(disabledControl, enabledControl, false)});

expect(enabledControl.status).toEqual('VALID');
expect(spyOnDisabledState).toHaveBeenCalledWith(false);
});

it('should mark as disabled properly', fakeAsync(() => {
ngModel.ngOnChanges({isDisabled: new SimpleChange('', undefined, false)});
tick();
Expand Down