@ngx-formly/core 5.10.26 → 5.10.27

package/fesm5/ngx-formly-core.js

@@ -4,7 +4,7 @@ import { DomSanitizer } from '@angular/platform-browser';
 import { debounceTime, switchMap, distinctUntilChanged, take, startWith, map } from 'rxjs/operators';
 import { AbstractControl, FormArray, FormGroup, FormControl, FormGroupDirective, Validators } from '@angular/forms';
 import { isObservable, Subject, of, Observable } from 'rxjs';
-import { __extends, __spread, __assign, __rest, __values, __read } from 'tslib';
+import { __extends, __assign, __spread, __rest, __read, __values } from 'tslib';
 
 /**
  * @fileoverview added by tsickle
@@ -923,13 +923,18 @@ var FormlyFormBuilder = /** @class */ (function () {
 function unregisterControl(field, emitEvent) {
     if (emitEvent === void 0) { emitEvent = false; }
     /** @type {?} */
-    var form = (/** @type {?} */ (field.formControl.parent));
+    var control = field.formControl;
+    /** @type {?} */
+    var fieldIndex = control['_fields'] ? control['_fields'].indexOf(field) : -1;
+    if (fieldIndex !== -1) {
+        control['_fields'].splice(fieldIndex, 1);
+    }
+    /** @type {?} */
+    var form = (/** @type {?} */ (control.parent));
     if (!form) {
         return;
     }
     /** @type {?} */
-    var control = field.formControl;
-    /** @type {?} */
     var opts = { emitEvent: emitEvent };
     if (form instanceof FormArray) {
         /** @type {?} */
@@ -1116,6 +1121,8 @@ function updateControl(form, opts, action) {
  */
 function clearControl(form) {
     form['_fields'] && delete form['_fields'];
+    form.setValidators(null);
+    form.setAsyncValidators(null);
     if (form instanceof FormGroup || form instanceof FormArray) {
         Object.keys(form.controls)
             .forEach((/**
@@ -3061,6 +3068,19 @@ FieldExpressionExtension = /** @class */ (function () {
      */
     function (field, hide, resetOnHide) {
         var _this = this;
+        if (field.fieldGroup) {
+            field.fieldGroup
+                .filter((/**
+             * @param {?} f
+             * @return {?}
+             */
+            function (f) { return !f.hideExpression; }))
+                .forEach((/**
+             * @param {?} f
+             * @return {?}
+             */
+            function (f) { return _this.toggleFormControl(f, hide, resetOnHide); }));
+        }
         if (field.formControl && field.key) {
             defineHiddenProp(field, '_hide', !!(hide || field.hide));
             /** @type {?} */
@@ -3094,19 +3114,6 @@ FieldExpressionExtension = /** @class */ (function () {
                 }
             }
         }
-        if (field.fieldGroup) {
-            field.fieldGroup
-                .filter((/**
-             * @param {?} f
-             * @return {?}
-             */
-            function (f) { return !f.hideExpression; }))
-                .forEach((/**
-             * @param {?} f
-             * @return {?}
-             */
-            function (f) { return _this.toggleFormControl(f, hide, resetOnHide); }));
-        }
         if (field.options.fieldChanges) {
             field.options.fieldChanges.next((/** @type {?} */ ({ field: field, type: 'hidden', value: hide })));
         }