Skip to content

Commit 6f4bc1e

Browse files
authored
fix: do not reset selected items when disabled set to false (#6822)
1 parent 8732fac commit 6f4bc1e

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

‎packages/list-box/src/vaadin-multi-select-list-mixin.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const MultiSelectListMixin = (superClass) =>
3939
}
4040

4141
static get observers() {
42-
return [`_enhanceMultipleItems(items, multiple, selected, selectedValues, selectedValues.*)`];
42+
return ['_enhanceMultipleItems(items, multiple, selected, disabled, selectedValues, selectedValues.*)'];
4343
}
4444

4545
/** @protected */
@@ -51,7 +51,7 @@ export const MultiSelectListMixin = (superClass) =>
5151
}
5252

5353
/** @private */
54-
_enhanceMultipleItems(items, multiple, selected, selectedValues) {
54+
_enhanceMultipleItems(items, multiple, selected, disabled, selectedValues) {
5555
if (!items || !multiple) {
5656
return;
5757
}

‎packages/list-box/test/multi-select-list-mixin.test.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,14 @@ describe('MultiSelectListMixin', () => {
172172
list.multiple = false;
173173
expect(list.hasAttribute('aria-multiselectable')).to.be.false;
174174
});
175+
176+
it('should not reset selected state when setting disabled to false', () => {
177+
list.multiple = true;
178+
list.disabled = true;
179+
180+
list.selectedValues = [2];
181+
list.disabled = false;
182+
183+
expect(list.items[2].selected).to.be.true;
184+
});
175185
});

0 commit comments

Comments
 (0)