Skip to content

Commit 51cf958

Browse files
authored
fix: allow replacing items with refreshItem (#6714)
1 parent 45ff63f commit 51cf958

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

‎vaadin-select-flow-parent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/Select.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,10 @@ private void onDataChange(DataChangeEvent<T> event) {
10531053
getItems()
10541054
.filter(vaadinItem -> updatedItemId.equals(
10551055
identifierProvider.apply(vaadinItem.getItem())))
1056-
.findAny().ifPresent(this::updateItem);
1056+
.findAny().ifPresent(item -> {
1057+
item.setItem(updatedItem);
1058+
updateItem(item);
1059+
});
10571060
} else {
10581061
reset();
10591062
}

‎vaadin-select-flow-parent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/VaadinItem.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ public T getItem() {
4949
return item;
5050
}
5151

52+
void setItem(T item) {
53+
this.item = item;
54+
}
55+
5256
@Override
5357
public void onEnabledStateChanged(boolean enabled) {
5458
// Not setting the disabled attribute because vaadin-item's that are

‎vaadin-select-flow-parent/vaadin-select-flow/src/test/java/com/vaadin/flow/component/select/data/SelectDataViewTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ public void setIdentifierProvider_customIdentity_itemRefreshed() {
6363

6464
dataView.setIdentifierProvider(Item::getId);
6565

66-
first.setValue("changed-1");
6766
second.setValue("changed-2");
6867

69-
dataProvider.refreshItem(new Item(1L));
68+
dataProvider.refreshItem(new Item(1L, "changed-1"));
7069

7170
Assert.assertTrue(containsItem(component, "changed-1"));
7271
Assert.assertFalse(containsItem(component, "changed-2"));
@@ -85,10 +84,9 @@ public void setIdentifierProvider_customDataProviderIdentity_itemRefreshed() {
8584
Select<Item> component = new Select<>();
8685
component.setItems(dataProvider);
8786

88-
first.setValue("changed-1");
8987
second.setValue("changed-2");
9088

91-
dataProvider.refreshItem(new Item(1L));
89+
dataProvider.refreshItem(new Item(1L, "changed-1"));
9290

9391
Assert.assertTrue(containsItem(component, "changed-1"));
9492
Assert.assertFalse(containsItem(component, "changed-2"));

0 commit comments

Comments
 (0)