fix(core): avoid checking parent field on eval hide expression (#1749)

re #1700
ngx-formly · Aug 28, 2019 · 087523b · 087523b
1 parent b8f1834
commit 087523b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 6 deletions.
diff --git a/src/core/src/lib/extensions/field-expression/field-expression.spec.ts b/src/core/src/lib/extensions/field-expression/field-expression.spec.ts
@@ -1,5 +1,5 @@
 import { TestBed, inject } from '@angular/core/testing';
-import { FormGroup, Validators } from '@angular/forms';
+import { FormGroup, Validators, FormControl } from '@angular/forms';
 import { Component } from '@angular/core';
 import { Subject, of } from 'rxjs';
 import { FormlyFieldConfig, FormlyFormBuilder, FieldArrayType, FormlyModule } from '@ngx-formly/core';
@@ -133,6 +133,38 @@ describe('FieldExpressionExtension', () => {
       expect(cityField.templateOptions.hidden).toBeFalsy();
       expect(cityField.hide).toBeFalsy();
     });
+
+    it('should support multiple field with the same key', () => {
+      const fields: FormlyFieldConfig[] = [
+        {
+          key: 'key1',
+          type: 'input',
+          formControl: new FormControl(),
+          hideExpression: model => model.type,
+        },
+        {
+          key: 'key1',
+          type: 'input',
+          formControl: new FormControl(),
+          hideExpression: model => !model.type,
+        },
+      ];
+      const model = { type: false };
+      builder.buildForm(form, fields, model, options);
+
+      options._checkField({ formControl: form, fieldGroup: fields, model, options });
+      expect(fields[0].hide).toBeFalsy();
+      expect(fields[0].formControl).toEqual(form.get('key1'));
+      expect(fields[1].hide).toBeTruthy();
+      expect(fields[1].formControl).not.toEqual(form.get('key1'));
+
+      model.type = true;
+      options._checkField({ formControl: form, fieldGroup: fields, model, options });
+      expect(fields[0].hide).toBeTruthy();
+      expect(fields[0].formControl).not.toEqual(form.get('key1'));
+      expect(fields[1].hide).toBeFalsy();
+      expect(fields[1].formControl).toEqual(form.get('key1'));
+    });
   });
 
   describe('expressionProperties', () => {

diff --git a/src/core/src/lib/extensions/field-expression/field-expression.ts b/src/core/src/lib/extensions/field-expression/field-expression.ts
@@ -194,11 +194,9 @@ export class FieldExpressionExtension implements FormlyExtension {
     }
 
     if (field.formControl && field.key) {
-      if (hide === true && field.formControl.parent) {
-        unregisterControl(field);
-      } else if (hide === false && !field.formControl.parent) {
-        registerControl(field);
-      }
+      hide === true
+        ? unregisterControl(field)
+        : registerControl(field);
     }
 
     if (field.options.fieldChanges) {