revert: disable control when parent is disabled (#1539)

ngx-formly · Apr 17, 2019 · 9f033d4 · 9f033d4
1 parent 5916765
commit 9f033d4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 28 deletions.
diff --git a/src/core/src/lib/extensions/field-form/utils.spec.ts b/src/core/src/lib/extensions/field-form/utils.spec.ts
@@ -49,7 +49,7 @@ describe('registerControl', () => {
     expect(field.formControl.parent).not.toBeNull();
   });
 
-  it('should take account of model changes', () => {
+  it('should take account of  model changes', () => {
     const field = {
       key: '0',
       formControl: new FormControl(),
@@ -62,23 +62,6 @@ describe('registerControl', () => {
     registerControl(field);
     expect(field.formControl.value).toEqual('test');
   });
-
-  it('should disable control if parent is disabled', () => {
-    const field = {
-      key: '0',
-      formControl: new FormControl(),
-      parent: {
-        model: { '0': 'test' },
-        formControl: new FormGroup({}),
-      },
-    };
-
-    field.parent.formControl.disable();
-
-    registerControl(field);
-    expect(field.formControl.parent).not.toBeNull();
-    expect(field.formControl.disabled).toBeTruthy();
-  });
 });
 
 describe('unregisterControl', () => {

diff --git a/src/core/src/lib/extensions/field-form/utils.ts b/src/core/src/lib/extensions/field-form/utils.ts
@@ -25,12 +25,14 @@ export function registerControl(field: FormlyFieldConfig, control?: any) {
       control.disable();
     }
 
-    Object.defineProperty(field.templateOptions, 'disabled', {
-      get: () => !field.formControl.enabled,
-      set: (value: boolean) => value ? field.formControl.disable() : field.formControl.enable(),
-      enumerable: true,
-      configurable: true,
-    });
+    if (delete field.templateOptions.disabled) {
+      Object.defineProperty(field.templateOptions, 'disabled', {
+        get: () => !field.formControl.enabled,
+        set: (value: boolean) => value ? field.formControl.disable() : field.formControl.enable(),
+        enumerable: true,
+        configurable: true,
+      });
+    }
   }
 
   let parent = field.parent.formControl as FormGroup;
@@ -62,10 +64,6 @@ export function registerControl(field: FormlyFieldConfig, control?: any) {
   }
   const key = paths[paths.length - 1];
   if (parent.get([key]) !== control) {
-    if (parent.disabled && control.enabled) {
-      control.disable();
-    }
-
     parent.setControl(key, control);
   }
 }