@ngx-formly/core 6.3.3 → 6.3.5

package/fesm2015/ngx-formly-core.mjs

@@ -3,9 +3,9 @@ import { Type, TemplateRef, ComponentRef, ChangeDetectorRef, ɵNoopNgZone, Injec
 import * as i2 from '@angular/forms';
 import { AbstractControl, FormGroup, FormArray, FormControl, NgControl, Validators } from '@angular/forms';
 import { isObservable, of, merge, Observable, Subject } from 'rxjs';
-import { distinctUntilChanged, startWith, debounceTime, filter, switchMap, take, tap, map } from 'rxjs/operators';
+import { distinctUntilChanged, map, startWith, debounceTime, filter, switchMap, take, tap } from 'rxjs/operators';
 import * as i2$1 from '@angular/common';
-import { DOCUMENT, CommonModule } from '@angular/common';
+import { VERSION, DOCUMENT, CommonModule } from '@angular/common';
 import * as i1 from '@angular/platform-browser';
 import { __rest } from 'tslib';
 
@@ -915,8 +915,17 @@ class FormlyField {
                     this.elementRef && this.renderer.setAttribute(this.elementRef.nativeElement, 'class', currentValue);
                 }
             }),
-            ...['touched', 'pristine', 'status'].map((prop) => observe(this.field, ['formControl', prop], ({ firstChange }) => !firstChange && markFieldForCheck(this.field))),
         ];
+        const isSignalRequired = +VERSION.major >= 18 && +VERSION.minor >= 1;
+        if (!isSignalRequired) {
+            ['touched', 'pristine', 'status'].forEach((prop) => this.hostObservers.push(observe(this.field, ['formControl', prop], ({ firstChange }) => !firstChange && markFieldForCheck(this.field))));
+        }
+        else if (this.field.formControl) {
+            const statusChanges = this.field.formControl.statusChanges
+                .pipe(distinctUntilChanged())
+                .subscribe(() => markFieldForCheck(this.field));
+            this.hostObservers.push(statusChanges);
+        }
     }
     resetRefs(field) {
         if (field) {
@@ -967,7 +976,14 @@ class FormlyField {
         }
         if (field.formControl && !field.fieldGroup) {
             const control = field.formControl;
-            let valueChanges = control.valueChanges.pipe(distinctUntilChanged((x, y) => {
+            let valueChanges = control.valueChanges.pipe(map((value) => {
+                var _a;
+                (_a = field.parsers) === null || _a === void 0 ? void 0 : _a.map((parserFn) => (value = parserFn(value, field)));
+                if (!Object.is(value, field.formControl.value)) {
+                    field.formControl.setValue(value);
+                }
+                return value;
+            }), distinctUntilChanged((x, y) => {
                 if (x !== y || Array.isArray(x) || isObject(x)) {
                     return false;
                 }
@@ -981,16 +997,11 @@ class FormlyField {
                 valueChanges = control.valueChanges.pipe(debounceTime(debounce.default));
             }
             const sub = valueChanges.subscribe((value) => {
-                var _a, _b;
+                var _a;
                 // workaround for https://github.com/angular/angular/issues/13792
                 if (((_a = control._fields) === null || _a === void 0 ? void 0 : _a.length) > 1 && control instanceof FormControl) {
                     control.patchValue(value, { emitEvent: false, onlySelf: true });
                 }
-                (_b = field.parsers) === null || _b === void 0 ? void 0 : _b.forEach((parserFn) => (value = parserFn(value)));
-                if (value !== field.formControl.value) {
-                    field.formControl.setValue(value);
-                    return;
-                }
                 if (hasKey(field)) {
                     assignFieldValue(field, value);
                 }