Skip to content

Commit

Permalink
fix: accept boolean and numeric item values (#4064)
Browse files Browse the repository at this point in the history
  • Loading branch information
cromoteca authored and vaadin-bot committed Jun 19, 2022
1 parent 8096fbb commit 8ce0f83
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
3 changes: 2 additions & 1 deletion packages/select/src/vaadin-select.js
Original file line number Diff line number Diff line change
Expand Up @@ -673,8 +673,9 @@ class Select extends DelegateFocusMixin(FieldMixin(SlotMixin(ElementMixin(Themab
/** @private */
_updateSelectedItem(value, items) {
if (items) {
const valueAsString = value == null ? value : value.toString();
this._menuElement.selected = items.reduce((prev, item, idx) => {
return prev === undefined && item.value === value ? idx : prev;
return prev === undefined && item.value === valueAsString ? idx : prev;
}, undefined);
if (!this._selectedChanging) {
this._valueChanging = true;
Expand Down
12 changes: 12 additions & 0 deletions packages/select/test/select.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ describe('vaadin-select', () => {
<vaadin-item></vaadin-item>
<vaadin-item label="">Empty</vaadin-item>
<vaadin-item value="v4" disabled>Disabled</vaadin-item>
<vaadin-item value="5">A number</vaadin-item>
<vaadin-item value="false">A boolean</vaadin-item>
</vaadin-list-box>
`,
root,
Expand Down Expand Up @@ -193,6 +195,16 @@ describe('vaadin-select', () => {
select.value = 'foo';
expect(menu.selected).to.be.undefined;
});

it('should select a numeric value if a matching item is found', () => {
select.value = 5;
expect(menu.selected).to.be.equal(6);
});

it('should select a boolean value if a matching item is found', () => {
select.value = false;
expect(menu.selected).to.be.equal(7);
});
});

describe('keyboard selection', () => {
Expand Down

0 comments on commit 8ce0f83

Please sign in to comment.