@ngx-formly/core 6.2.0 → 6.2.1

package/fesm2020/ngx-formly-core.mjs

@@ -532,16 +532,15 @@ class FormlyFormBuilder {
         }
         if (!field.parent) {
             this._setOptions(field);
-            disableTreeValidityCall(field.form, () => {
-                this._build(field);
+        }
+        disableTreeValidityCall(field.form, () => {
+            this._build(field);
+            if (!field.parent) {
                 const options = field.options;
                 options.checkExpressions?.(field, true);
                 options.detectChanges?.(field);
-            });
-        }
-        else {
-            this._build(field);
-        }
+            }
+        });
     }
     _build(field) {
         if (!field) {
@@ -814,6 +813,7 @@ class FormlyField {
     }
     triggerHook(name, changes) {
         if (name === 'onInit' || (name === 'onChanges' && changes.field && !changes.field.firstChange)) {
+            this.valueChangesUnsubscribe();
             this.valueChangesUnsubscribe = this.fieldChanges(this.field);
         }
         if (this.field?.hooks?.[name]) {
@@ -901,7 +901,6 @@ class FormlyField {
         this.componentRefs = [];
     }
     fieldChanges(field) {
-        this.valueChangesUnsubscribe();
         if (!field) {
             return () => { };
         }
@@ -1291,7 +1290,7 @@ class FieldType {
     constructor() {
         this.field = {};
     }
-    set controls(controls) {
+    set _formlyControls(controls) {
         const f = this.field;
         f._localFields = controls
             .map((c) => c.control._fields || [])
@@ -1331,10 +1330,10 @@ class FieldType {
     }
 }
 FieldType.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: FieldType, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-FieldType.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.3.12", type: FieldType, inputs: { field: "field" }, viewQueries: [{ propertyName: "controls", predicate: NgControl, descendants: true }], ngImport: i0 });
+FieldType.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.3.12", type: FieldType, inputs: { field: "field" }, viewQueries: [{ propertyName: "_formlyControls", predicate: NgControl, descendants: true }], ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: FieldType, decorators: [{
             type: Directive
-        }], propDecorators: { controls: [{
+        }], propDecorators: { _formlyControls: [{
                 type: ViewChildren,
                 args: [NgControl]
             }], field: [{
@@ -1483,6 +1482,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
         }] });
 
 class FieldWrapper extends FieldType {
+    set _formlyControls(_) { }
     set _staticContent(content) {
         this.fieldComponent = content;
     }
@@ -1890,19 +1890,14 @@ class FieldValidationExtension {
         return (control) => {
             const errors = validatorOption.validation(control, field, validatorOption.options);
             if (isPromise(errors)) {
-                return errors.then((v) => this.handleAsyncResult(field, validatorName ? !!v : v, validatorOption));
+                return errors.then((v) => this.handleResult(field, validatorName ? !!v : v, validatorOption));
             }
             if (isObservable(errors)) {
-                return errors.pipe(map((v) => this.handleAsyncResult(field, validatorName ? !!v : v, validatorOption)));
+                return errors.pipe(map((v) => this.handleResult(field, validatorName ? !!v : v, validatorOption)));
             }
             return this.handleResult(field, validatorName ? !!errors : errors, validatorOption);
         };
     }
-    handleAsyncResult(field, errors, options) {
-        // workaround for https://github.com/angular/angular/issues/13200
-        field.options.detectChanges(field);
-        return this.handleResult(field, errors, options);
-    }
     handleResult(field, errors, { name, options }) {
         if (typeof errors === 'boolean') {
             errors = errors ? null : { [name]: options ? options : true };
@@ -2000,11 +1995,14 @@ class FieldFormExtension {
                         markForCheck = true;
                     }
                 }
-                if (null === c.validator || null === c.asyncValidator) {
+                if (null === c.validator && this.hasValidators(field, '_validators')) {
                     c.setValidators(() => {
                         const v = Validators.compose(this.mergeValidators(field, '_validators'));
                         return v ? v(c) : null;
                     });
+                    markForCheck = true;
+                }
+                if (null === c.asyncValidator && this.hasValidators(field, '_asyncValidators')) {
                     c.setAsyncValidators(() => {
                         const v = Validators.composeAsync(this.mergeValidators(field, '_asyncValidators'));
                         return v ? v(c) : of(null);
@@ -2026,6 +2024,16 @@ class FieldFormExtension {
         }
         return markForCheck;
     }
+    hasValidators(field, type) {
+        const c = field.formControl;
+        if (c?._fields?.length > 1 && c._fields.some((f) => f[type].length > 0)) {
+            return true;
+        }
+        else if (field[type].length > 0) {
+            return true;
+        }
+        return field.fieldGroup?.some((f) => f?.fieldGroup && !hasKey(f) && this.hasValidators(f, type));
+    }
     mergeValidators(field, type) {
         const validators = [];
         const c = field.formControl;