Update also material design input

eapframework · Jul 21, 2017 · 3d6bae7 · 3d6bae7
1 parent 9c93e67
commit 3d6bae7
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 5 deletions.
diff --git a/src/demo/app/example-schemas.model.ts b/src/demo/app/example-schemas.model.ts
diff --git a/src/demo/assets/example-schemas/ng2jsf-flex-layout.json b/src/demo/assets/example-schemas/ng2jsf-flex-layout.json
diff --git a/src/demo/assets/example-schemas/ng2jsf-json-schema-draft06.json b/src/demo/assets/example-schemas/ng2jsf-json-schema-draft06.json
diff --git a/src/demo/environments/environment.prod.ts b/src/demo/environments/environment.prod.ts
diff --git a/src/demo/environments/environment.ts b/src/demo/environments/environment.ts
diff --git a/src/demo/favicon.ico b/src/demo/favicon.ico
diff --git a/src/demo/index.html b/src/demo/index.html
diff --git a/src/demo/polyfills.ts b/src/demo/polyfills.ts
diff --git a/src/demo/styles.scss b/src/demo/styles.scss
diff --git a/src/demo/test.ts b/src/demo/test.ts
diff --git a/src/demo/tsconfig.app.json b/src/demo/tsconfig.app.json
diff --git a/src/lib/angular2-json-schema-form.ts b/src/lib/angular2-json-schema-form.ts
diff --git a/src/lib/index.ts b/src/lib/index.ts
diff --git a/src/lib/src/framework-library/material-design-framework/material-input.component.ts b/src/lib/src/framework-library/material-design-framework/material-input.component.ts
@@ -24,8 +24,8 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
         [required]="options?.required"
         [style.width]="'100%'"
         [type]="layoutNode?.type"
-        [value]="controlValue"
-        (input)="updateValue($event)">
+        [ngModel]="inputValue"
+        (ngModelChange)="updateInputValue($event)">
       <span *ngIf="options?.fieldAddonLeft"
         md-prefix>{{options?.fieldAddonLeft}}</span>
       <span *ngIf="options?.fieldAddonRight"
@@ -37,7 +37,8 @@ import { JsonSchemaFormService } from '../../json-schema-form.service';
 export class MaterialInputComponent implements OnInit {
   formControl: AbstractControl;
   controlName: string;
-  controlValue: any;
+  private userInput: boolean = true;
+  public  inputValue: string;
   controlDisabled: boolean = false;
   boundControl: boolean = false;
   options: any;
@@ -56,7 +57,21 @@ export class MaterialInputComponent implements OnInit {
     this.jsf.initializeControl(this);
   }
 
-  updateValue(event) {
-    this.jsf.updateValue(this, event.target.value);
+  get controlValue(){
+    console.log(this.inputValue);
+    return this.inputValue;
+  }
+
+  set controlValue(value: string){
+    this.userInput = false;
+    this.updateInputValue(value);
+    this.userInput = true;
+  }
+
+  public updateInputValue (value: string) {
+    this.inputValue = value;
+    if (this.userInput){
+      this.jsf.updateValue(this, value);
+    }
   }
 }
diff --git a/src/lib/tsconfig.es5.json b/src/lib/tsconfig.es5.json
diff --git a/src/lib/tsconfig.json b/src/lib/tsconfig.json
diff --git a/src/lib/tsconfig.spec.json b/src/lib/tsconfig.spec.json
diff --git a/src/lib/typings.d.ts b/src/lib/typings.d.ts