fix: allow replacing items with refreshItem (#6714) (#6718)

Co-authored-by: Sascha Ißbrücker <[email protected]>
vaadin · Oct 11, 2024 · 5b05385 · 5b05385
1 parent 89ba5fb
commit 5b05385
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/...flow-parent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/Select.java b/...flow-parent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/Select.java
@@ -1053,7 +1053,10 @@ private void onDataChange(DataChangeEvent<T> event) {
             getItems()
                     .filter(vaadinItem -> updatedItemId.equals(
                             identifierProvider.apply(vaadinItem.getItem())))
-                    .findAny().ifPresent(this::updateItem);
+                    .findAny().ifPresent(item -> {
+                        item.setItem(updatedItem);
+                        updateItem(item);
+                    });
         } else {
             reset();
         }

diff --git a/...-parent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/VaadinItem.java b/...-parent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/VaadinItem.java
@@ -49,6 +49,10 @@ public T getItem() {
         return item;
     }
 
+    void setItem(T item) {
+        this.item = item;
+    }
+
     @Override
     public void onEnabledStateChanged(boolean enabled) {
         // Not setting the disabled attribute because vaadin-item's that are

diff --git a/...n-select-flow/src/test/java/com/vaadin/flow/component/select/data/SelectDataViewTest.java b/...n-select-flow/src/test/java/com/vaadin/flow/component/select/data/SelectDataViewTest.java
@@ -63,10 +63,9 @@ public void setIdentifierProvider_customIdentity_itemRefreshed() {
 
         dataView.setIdentifierProvider(Item::getId);
 
-        first.setValue("changed-1");
         second.setValue("changed-2");
 
-        dataProvider.refreshItem(new Item(1L));
+        dataProvider.refreshItem(new Item(1L, "changed-1"));
 
         Assert.assertTrue(containsItem(component, "changed-1"));
         Assert.assertFalse(containsItem(component, "changed-2"));
@@ -85,10 +84,9 @@ public void setIdentifierProvider_customDataProviderIdentity_itemRefreshed() {
         Select<Item> component = new Select<>();
         component.setItems(dataProvider);
 
-        first.setValue("changed-1");
         second.setValue("changed-2");
 
-        dataProvider.refreshItem(new Item(1L));
+        dataProvider.refreshItem(new Item(1L, "changed-1"));
 
         Assert.assertTrue(containsItem(component, "changed-1"));
         Assert.assertFalse(containsItem(component, "changed-2"));