@ngx-formly/core 6.3.1 → 6.3.2

package/fesm2020/ngx-formly-core.mjs

@@ -2,7 +2,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, ViewChildren, NgModule } from '@angular/core';
 import * as i2 from '@angular/forms';
 import { AbstractControl, FormGroup, FormArray, FormControl, NgControl, Validators } from '@angular/forms';
-import { isObservable, merge, of, Observable, Subject } from 'rxjs';
+import { isObservable, of, merge, Observable, Subject } from 'rxjs';
 import { distinctUntilChanged, startWith, debounceTime, filter, switchMap, take, tap, map } from 'rxjs/operators';
 import * as i2$1 from '@angular/common';
 import { DOCUMENT, CommonModule } from '@angular/common';
@@ -298,6 +298,21 @@ function markFieldForCheck(field) {
         }
     });
 }
+function isNoopNgZone(ngZone) {
+    return ngZone.constructor.name === 'NoopNgZone';
+}
+function isHiddenField(field) {
+    const isHidden = (f) => f.hide || f.expressions?.hide || f.hideExpression;
+    let setDefaultValue = !field.resetOnHide || !isHidden(field);
+    if (!isHidden(field) && field.resetOnHide) {
+        let parent = field.parent;
+        while (parent && !isHidden(parent)) {
+            parent = parent.parent;
+        }
+        setDefaultValue = !parent || !isHidden(parent);
+    }
+    return !setDefaultValue;
+}
 
 /**
  * An InjectionToken for registering additional formly config options (types, wrappers ...).
@@ -548,6 +563,11 @@ class FormlyFormBuilder {
             if (!field.parent || field.fieldArray) {
                 // detect changes early to avoid reset value by hidden fields
                 const options = field.options;
+                if (field.parent && isHiddenField(field)) {
+                    // when hide is used in expression set defaul value will not be set until detect hide changes
+                    // which causes default value not set on new item is added
+                    options._hiddenFieldsForCheck?.push(field);
+                }
                 options.checkExpressions?.(field, true);
                 options._detectChanges?.(field);
             }
@@ -1071,7 +1091,7 @@ class FormlyForm {
     valueChanges() {
         this.valueChangesUnsubscribe();
         const sub = this.field.options.fieldChanges
-            .pipe(filter(({ field, type }) => hasKey(field) && type === 'valueChanges'), switchMap(() => this.ngZone.onStable.asObservable().pipe(take(1))))
+            .pipe(filter(({ field, type }) => hasKey(field) && type === 'valueChanges'), switchMap(() => (isNoopNgZone(this.ngZone) ? of(null) : this.ngZone.onStable.asObservable().pipe(take(1)))))
             .subscribe(() => this.ngZone.runGuarded(() => {
             // runGuarded is used to keep in sync the expression changes
             // https://github.com/ngx-formly/ngx-formly/issues/2095
@@ -1706,7 +1726,7 @@ class FieldExpressionExtension {
     changeHideState(field, hide, resetOnHide) {
         if (field.fieldGroup) {
             field.fieldGroup
-                .filter((f) => !f._expressions.hide)
+                .filter((f) => f && !f._expressions.hide)
                 .forEach((f) => this.changeHideState(f, hide, resetOnHide));
         }
         if (field.formControl && hasKey(field)) {
@@ -1993,6 +2013,12 @@ class FieldFormExtension {
                 control = new FormControl({ value, disabled: !!field.props.disabled }, { ...controlOptions, initialValueIsDefault: true });
             }
         }
+        else {
+            if (control instanceof FormControl) {
+                const value = hasKey(field) ? getFieldValue(field) : field.defaultValue;
+                control.defaultValue = value;
+            }
+        }
         registerControl(field, control);
     }
     setValidators(field, disabled = false) {
@@ -2188,19 +2214,11 @@ class CoreExtension {
         if (field.type) {
             this.config.getMergedField(field);
         }
-        if (hasKey(field) && !isUndefined(field.defaultValue) && isUndefined(getFieldValue(field))) {
-            const isHidden = (f) => f.hide || f.expressions?.hide || f.hideExpression;
-            let setDefaultValue = !field.resetOnHide || !isHidden(field);
-            if (!isHidden(field) && field.resetOnHide) {
-                let parent = field.parent;
-                while (parent && !isHidden(parent)) {
-                    parent = parent.parent;
-                }
-                setDefaultValue = !parent || !isHidden(parent);
-            }
-            if (setDefaultValue) {
-                assignFieldValue(field, field.defaultValue);
-            }
+        if (hasKey(field) &&
+            !isUndefined(field.defaultValue) &&
+            isUndefined(getFieldValue(field)) &&
+            !isHiddenField(field)) {
+            assignFieldValue(field, field.defaultValue);
         }
         field.wrappers = field.wrappers || [];
     }