@ngx-formly/core 6.1.4 → 6.1.6

package/fesm2020/ngx-formly-core.mjs

@@ -890,10 +890,10 @@ class FormlyField {
         if (!field) {
             return () => { };
         }
-        const subscribes = [
-            observeDeep(field, ['props'], () => field.options.detectChanges(field)),
-            observeDeep(field.options, ['formState'], () => field.options.detectChanges(field)),
-        ];
+        const subscribes = [observeDeep(field, ['props'], () => field.options.detectChanges(field))];
+        if (field.options) {
+            subscribes.push(observeDeep(field.options, ['formState'], () => field.options.detectChanges(field)));
+        }
         for (const key of Object.keys(field._expressions || {})) {
             const expressionObserver = observe(field, ['_expressions', key], ({ currentValue, previousValue }) => {
                 if (previousValue?.subscription) {
@@ -1685,28 +1685,35 @@ class FieldExpressionExtension {
         }
     }
     evalExpr(field, prop, value) {
-        try {
-            let target = field;
-            const paths = this._evalExpressionPath(field, prop);
-            const lastIndex = paths.length - 1;
-            for (let i = 0; i < lastIndex; i++) {
-                target = target[paths[i]];
-            }
-            target[paths[lastIndex]] = value;
-        }
-        catch (error) {
-            error.message = `[Formly Error] [Expression "${prop}"] ${error.message}`;
-            throw error;
-        }
-        if (['templateOptions.disabled', 'props.disabled'].includes(prop) && hasKey(field)) {
-            this.changeDisabledState(field, value);
-        }
         if (prop.indexOf('model.') === 0) {
-            const key = prop.replace(/^model\./, ''), control = field?.key === key ? field.formControl : field.form.get(key);
+            const key = prop.replace(/^model\./, ''), parent = field.fieldGroup ? field : field.parent;
+            let control = field?.key === key ? field.formControl : field.form.get(key);
+            if (!control && field.get(key)) {
+                control = field.get(key).formControl;
+            }
+            assignFieldValue({ key, parent, model: field.model }, value);
             if (control && !(isNil(control.value) && isNil(value)) && control.value !== value) {
                 control.patchValue(value);
             }
         }
+        else {
+            try {
+                let target = field;
+                const paths = this._evalExpressionPath(field, prop);
+                const lastIndex = paths.length - 1;
+                for (let i = 0; i < lastIndex; i++) {
+                    target = target[paths[i]];
+                }
+                target[paths[lastIndex]] = value;
+            }
+            catch (error) {
+                error.message = `[Formly Error] [Expression "${prop}"] ${error.message}`;
+                throw error;
+            }
+            if (['templateOptions.disabled', 'props.disabled'].includes(prop) && hasKey(field)) {
+                this.changeDisabledState(field, value);
+            }
+        }
         this.emitExpressionChanges(field, prop, value);
     }
     emitExpressionChanges(field, property, value) {
@@ -1919,6 +1926,9 @@ class FieldFormExtension {
     }
     addFormControl(field) {
         let control = findControl(field);
+        if (field.fieldArray) {
+            return;
+        }
         if (!control) {
             const controlOptions = { updateOn: field.modelOptions.updateOn };
             if (field.fieldGroup) {