fix(core): add default wrappers when type is set (#630)

ngx-formly · Jan 5, 2018 · 2dd41ab · 2dd41ab
1 parent ff6a4dd
commit 2dd41ab
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/src/core/src/services/formly.config.ts b/src/core/src/services/formly.config.ts
@@ -36,7 +36,7 @@ export class FormlyConfig {
   } = {
     fieldTransform: undefined,
     showError: function(field: Field) {
-      return (field.formControl.touched || (field.options.parentForm && field.options.parentForm.submitted) || (field.field.validation && field.field.validation.show)) && field.formControl.invalid;
+      return field.formControl && field.formControl.invalid && (field.formControl.touched || (field.options.parentForm && field.options.parentForm.submitted) || (field.field.validation && field.field.validation.show));
     },
   };
 

diff --git a/src/core/src/services/formly.form.builder.spec.ts b/src/core/src/services/formly.form.builder.spec.ts
@@ -258,6 +258,13 @@ describe('FormlyFormBuilder service', () => {
       expect(field.key).toEqual('nested.title');
       expect(field.wrappers).toEqual([]);
     });
+
+    it('should add default wrappers if type is provided', () => {
+      field = { type: 'input' };
+      builder.buildForm(form, [field], {}, {});
+
+      expect(field.wrappers).toEqual(['label']);
+    });
   });
 
   describe('initialise field validators', () => {

diff --git a/src/core/src/services/formly.form.builder.ts b/src/core/src/services/formly.form.builder.ts
@@ -141,13 +141,15 @@ export class FormlyFormBuilder {
 
   private initFieldOptions(field: FormlyFieldConfig) {
     field.templateOptions = field.templateOptions || {};
-    if (field.key && field.type) {
+    if (field.type) {
       this.formlyConfig.getMergedField(field);
-      field.templateOptions = Object.assign({
-        label: '',
-        placeholder: '',
-        focus: false,
-      }, field.templateOptions);
+      if (field.key) {
+        field.templateOptions = Object.assign({
+          label: '',
+          placeholder: '',
+          focus: false,
+        }, field.templateOptions);
+      }
     }
   }