fix(dynamic-form-group): Change return object type for nested object …

…if it type is DynamicFormGroup
EndyKaufman · Mar 1, 2018 · 8bb303e · 8bb303e
1 parent 0d26bdf
commit 8bb303e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/libs/ngx-dynamic-form-builder/src/shared/utils/dynamic-form-builder.ts b/libs/ngx-dynamic-form-builder/src/shared/utils/dynamic-form-builder.ts
@@ -8,7 +8,8 @@ export class DynamicFormBuilder extends FormBuilder {
         factoryModel: ClassType<TModel>,
         controlsConfig?: {
             [key: string]: any;
-        }, extra?: {
+        },
+        extra?: {
             [key: string]: any;
         } | null
     ): DynamicFormGroup<TModel> {
@@ -18,13 +19,12 @@ export class DynamicFormBuilder extends FormBuilder {
         }
         // experimental
         if (controlsConfig === undefined) {
-            newControlsConfig = new factoryModel({});
+            newControlsConfig = new factoryModel();
             Object.keys(newControlsConfig).forEach(key => {
                 if (
                     newControlsConfig[key] &&
                     newControlsConfig[key].constructor &&
                     typeof newControlsConfig[key] === 'object' &&
-                    newControlsConfig[key].__not_group !== true &&
                     (
                         newControlsConfig[key].length === undefined ||
                         (
@@ -33,10 +33,10 @@ export class DynamicFormBuilder extends FormBuilder {
                         )
                     )
                 ) {
-                    newControlsConfig[key].__not_group = true;
                     newControlsConfig[key] = this.group(
                         newControlsConfig[key].constructor,
-                        controlsConfig !== undefined ? newControlsConfig[key] : undefined
+                        undefined,
+                        extra
                     );
                 }
             });

diff --git a/libs/ngx-dynamic-form-builder/src/shared/utils/dynamic-form-group.ts b/libs/ngx-dynamic-form-builder/src/shared/utils/dynamic-form-group.ts
@@ -174,7 +174,7 @@ export class DynamicFormGroup<TModel> extends FormGroup {
         if (object !== undefined) {
             Object.keys(this.controls).forEach(key => {
                 if (this.controls[key] instanceof DynamicFormGroup) {
-                    object[key] = (this.controls[key] as DynamicFormGroup<any>).value;
+                    object[key] = (this.controls[key] as DynamicFormGroup<any>).object;
                 } else {
                     object[key] = this.controls[key].value;
                 }