fix(core): emit statusChanges on updateValueAndValidity (#2107)

fix #2106
ngx-formly · Feb 20, 2020 · 7deac1a · 7deac1a
1 parent 80ee85b
commit 7deac1a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/core/src/lib/extensions/field-expression/field-expression.ts b/src/core/src/lib/extensions/field-expression/field-expression.ts
@@ -3,7 +3,7 @@ import { isObject, isNullOrUndefined, isFunction, defineHiddenProp, wrapProperty
 import { evalExpression, evalStringExpression, evalExpressionValueSetter } from './utils';
 import { Observable } from 'rxjs';
 import { FormlyExtension } from '../../services/formly.config';
-import { unregisterControl, registerControl } from '../field-form/utils';
+import { unregisterControl, registerControl, updateValidity } from '../field-form/utils';
 
 /** @experimental */
 export class FieldExpressionExtension implements FormlyExtension {
@@ -203,7 +203,7 @@ export class FieldExpressionExtension implements FormlyExtension {
       defineHiddenProp(field, '_hide', !!(hide || field.hide));
       const c = field.formControl;
       if (c['_fields'].length > 1) {
-        c.updateValueAndValidity({ emitEvent: false });
+        updateValidity(c);
       }
 
       hide === true && c['_fields'].every(f => !!f._hide)

diff --git a/src/core/src/lib/extensions/field-form/field-form.ts b/src/core/src/lib/extensions/field-form/field-form.ts
@@ -2,7 +2,7 @@ import { FormlyExtension, FormlyConfig } from '../../services/formly.config';
 import { FormlyFieldConfigCache } from '../../components/formly.field.config';
 import { FormGroup, FormControl, AbstractControlOptions, Validators } from '@angular/forms';
 import { getFieldValue, defineHiddenProp } from '../../utils';
-import { registerControl, findControl } from './utils';
+import { registerControl, findControl, updateValidity as updateControlValidity } from './utils';
 import { of } from 'rxjs';
 
 /** @experimental */
@@ -84,7 +84,7 @@ export class FieldFormExtension implements FormlyExtension {
         });
 
         if (!c.parent) {
-          c.updateValueAndValidity({ emitEvent: false });
+          updateControlValidity(c);
         } else {
           updateValidity = true;
         }

diff --git a/src/core/src/lib/extensions/field-form/utils.ts b/src/core/src/lib/extensions/field-form/utils.ts
@@ -2,6 +2,7 @@ import { FormArray, FormGroup, FormControl, AbstractControl } from '@angular/for
 import { FormlyFieldConfig } from '../../core';
 import { getKeyPath, getFieldValue, isNullOrUndefined, defineHiddenProp, wrapProperty, assignModelValue, isUndefined } from '../../utils';
 import { FormlyFieldConfigCache } from '../../components/formly.field.config';
+import { EventEmitter } from '@angular/core';
 
 export function unregisterControl(field: FormlyFieldConfig, emitEvent = false) {
   const form = field.formControl.parent as FormArray | FormGroup;
@@ -117,6 +118,14 @@ export function registerControl(field: FormlyFieldConfigCache, control?: any, em
   }
 }
 
+export function updateValidity(c: AbstractControl) {
+  const status = c.status;
+  c.updateValueAndValidity({ emitEvent: false });
+  if (status !== c.status) {
+    (c.statusChanges as EventEmitter<string>).emit(c.status);
+  }
+}
+
 function updateControl(form: FormGroup|FormArray, opts: { emitEvent: boolean }, action: Function) {
   /**
    *  workaround for https://github.com/angular/angular/issues/27679

diff --git a/src/core/src/lib/extensions/field-validation/field-validation.ts b/src/core/src/lib/extensions/field-validation/field-validation.ts
@@ -2,6 +2,7 @@ import { FormlyExtension, FieldValidatorFn, FormlyConfig } from '../../services/
 import { FormlyFieldConfigCache } from '../../components/formly.field.config';
 import { AbstractControl, Validators, ValidatorFn } from '@angular/forms';
 import { isObject, FORMLY_VALIDATORS, defineHiddenProp, isPromise, wrapProperty } from '../../utils';
+import { updateValidity } from '../field-form/utils';
 
 /** @experimental */
 export class FieldValidationExtension implements FormlyExtension {
@@ -47,7 +48,7 @@ export class FieldValidationExtension implements FormlyExtension {
         VALIDATORS.push(opt);
       }
       if (!firstChange && field.formControl) {
-        field.formControl.updateValueAndValidity({ emitEvent: false });
+        updateValidity(field.formControl);
       }
     }));