@ngx-formly/core 6.1.6 → 6.1.8

package/fesm2020/ngx-formly-core.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
-import { Type, TemplateRef, ComponentRef, ChangeDetectorRef, InjectionToken, Injectable, Optional, Directive, Input, ViewContainerRef, Component, ViewChild, EventEmitter, ChangeDetectionStrategy, Output, ContentChildren, Inject, NgModule } from '@angular/core';
+import { Type, TemplateRef, ComponentRef, ChangeDetectorRef, InjectionToken, Injectable, Optional, Directive, Input, ViewContainerRef, Component, ViewChild, EventEmitter, ChangeDetectionStrategy, Output, ContentChildren, Inject, ViewChildren, NgModule } from '@angular/core';
 import * as i2 from '@angular/forms';
-import { AbstractControl, FormGroup, FormArray, FormControl, Validators } from '@angular/forms';
+import { AbstractControl, FormGroup, FormArray, FormControl, NgControl, Validators } from '@angular/forms';
 import { isObservable, merge, of, Observable, Subject } from 'rxjs';
 import { distinctUntilChanged, startWith, debounceTime, filter, switchMap, take, tap, map } from 'rxjs/operators';
 import * as i2$1 from '@angular/common';
@@ -237,8 +237,17 @@ function observe(o, paths, setFn) {
         }
     }
     return {
-        setValue(value) {
-            state.value = value;
+        setValue(currentValue) {
+            if (currentValue === state.value) {
+                return;
+            }
+            const previousValue = state.value;
+            state.value = currentValue;
+            state.onChange.forEach((changeFn) => {
+                if (changeFn !== setFn) {
+                    changeFn({ previousValue, currentValue, firstChange: false });
+                }
+            });
         },
         unsubscribe() {
             state.onChange = state.onChange.filter((changeFn) => changeFn !== setFn);
@@ -876,6 +885,12 @@ class FormlyField {
     }
     resetRefs(field) {
         if (field) {
+            if (field._localFields) {
+                field._localFields = [];
+            }
+            else {
+                defineHiddenProp(this.field, '_localFields', []);
+            }
             if (field._componentRefs) {
                 field._componentRefs = field._componentRefs.filter((ref) => this.componentRefs.indexOf(ref) === -1);
             }
@@ -911,7 +926,7 @@ class FormlyField {
                 expressionObserver.unsubscribe();
             });
         }
-        for (const path of [['template'], ['fieldGroupClassName'], ['validation', 'show']]) {
+        for (const path of [['focus'], ['template'], ['fieldGroupClassName'], ['validation', 'show']]) {
             const fieldObserver = observe(field, path, ({ firstChange }) => !firstChange && field.options.detectChanges(field));
             subscribes.push(() => fieldObserver.unsubscribe());
         }
@@ -947,7 +962,15 @@ class FormlyField {
             });
             subscribes.push(() => sub.unsubscribe());
         }
-        return () => subscribes.forEach((subscribe) => subscribe());
+        let templateFieldsSubs = [];
+        observe(field, ['_localFields'], ({ currentValue }) => {
+            templateFieldsSubs.forEach((unsubscribe) => unsubscribe());
+            templateFieldsSubs = (currentValue || []).map((f) => this.fieldChanges(f));
+        });
+        return () => {
+            subscribes.forEach((unsubscribe) => unsubscribe());
+            templateFieldsSubs.forEach((unsubscribe) => unsubscribe());
+        };
     }
 }
 FormlyField.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: FormlyField, deps: [{ token: FormlyConfig }, { token: i0.Renderer2 }, { token: i0.ElementRef }, { token: i0.ViewContainerRef }, { token: FormlyFieldTemplates, optional: true }], target: i0.ɵɵFactoryTarget.Component });
@@ -1265,6 +1288,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
             }] } });
 
 class FieldType {
+    constructor() {
+        this.field = {};
+    }
+    set controls(controls) {
+        const f = this.field;
+        f._localFields = controls
+            .map((c) => c.control._fields || [])
+            .flat()
+            .filter((f) => f.formControl !== this.field.formControl);
+    }
     get model() {
         return this.field.model;
     }
@@ -1294,14 +1327,17 @@ class FieldType {
         return this.field.id;
     }
     get formState() {
-        return this.options.formState || {};
+        return this.options?.formState || {};
     }
 }
 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" }, ngImport: i0 });
+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 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: FieldType, decorators: [{
             type: Directive
-        }], propDecorators: { field: [{
+        }], propDecorators: { controls: [{
+                type: ViewChildren,
+                args: [NgControl]
+            }], field: [{
                 type: Input
             }] } });
 
@@ -1391,7 +1427,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
 
 class FieldArrayType extends FieldType {
     onPopulate(field) {
-        if (!field.formControl && hasKey(field)) {
+        if (hasKey(field)) {
             const control = findControl(field);
             registerControl(field, control ? control : new FormArray([], { updateOn: field.modelOptions.updateOn }));
         }