fix(editors): fix serialization/deserilization in editors

Merge pull request #58 from ghiscoding/fix/editor_serialization
ghiscoding · May 18, 2018 · f3610d7 · f3610d7
2 parents 2112768 + 7bc8baf
commit f3610d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/editors/dateEditor.ts b/aurelia-slickgrid/src/aurelia-slickgrid/editors/dateEditor.ts
@@ -88,17 +88,26 @@ export class DateEditor implements Editor {
 
   loadValue(item: any) {
     this.defaultDate = item[this.args.column.field];
+    this.flatInstance.setDate(item[this.args.column.field]);
   }
 
   serializeValue() {
+    const domValue: string = this.$input.val();
+
+    if (!domValue) return '';
+
     const outputFormat = mapMomentDateFormatWithFieldType(this.args.column.type || FieldType.dateIso);
-    const value = moment(this.defaultDate).format(outputFormat);
+    const value = moment(domValue).format(outputFormat);
 
     return value;
   }
 
   applyValue(item: any, state: any) {
-    item[this.args.column.field] = state;
+    if (!state) return;
+
+    const outputFormat = mapMomentDateFormatWithFieldType(this.args.column.type || FieldType.dateIso);
+
+    item[this.args.column.field] = moment(state, outputFormat).toDate();
   }
 
   isValueChanged() {

diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/editors/singleSelectEditor.ts b/aurelia-slickgrid/src/aurelia-slickgrid/editors/singleSelectEditor.ts
@@ -119,7 +119,8 @@ export class SingleSelectEditor implements Editor {
 
   loadValue(item: any): void {
     // convert to string because that is how the DOM will return these values
-    this.defaultValue = item[this.columnDef.field].toString();
+    // make sure the prop exists first
+    this.defaultValue = item[this.columnDef.field] && item[this.columnDef.field].toString();
 
     this.$editorElm.find('option').each((i: number, $e: any) => {
       if (this.defaultValue === $e.value) {