fix(forms): incorrect value set with vaadin-combo-box when using item…

…ValuePath
hotforfeature · Aug 29, 2018 · 4f738a7 · 4f738a7
1 parent d126c46
commit 4f738a7
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/forms/src/value-accessor.ts b/forms/src/value-accessor.ts
@@ -359,7 +359,7 @@ export class OrigamiControlValueAccessor extends DefaultValueAccessor
       !!element &&
       element.multi === true &&
       (this.isPropertyDefined(element, 'selectedValues') ||
-        this.isPropertyDefined(element, 'selectedValues'))
+        this.isPropertyDefined(element, 'selectedItems'))
     );
   }
 
@@ -455,6 +455,13 @@ export class OrigamiControlValueAccessor extends DefaultValueAccessor
       }
     }
 
-    return this.useSelectableValueProp ? valueProp : indexProp;
+    if (element.itemValuePath) {
+      // <vaadin-combo-box> will want to use selectedItem for object values.
+      // However, if `itemValuePath` is set then the control value is not the
+      // item itself, but the `value` property.
+      return 'value';
+    } else {
+      return this.useSelectableValueProp ? valueProp : indexProp;
+    }
   }
 }