fix: allow null items in RadioButtonGroup (#514) (#517)

vaadin · Dec 10, 2020 · e32fc7b · e32fc7b
1 parent b1c05ac
commit e32fc7b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...dio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java b/...dio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java
@@ -238,7 +238,7 @@ private void setupDataProviderListener(DataProvider<T, ?> dataProvider) {
     @Override
     public void setValue(T value) {
         super.setValue(value);
-        getRadioButtons().forEach(rb -> rb.setChecked(rb.getItem().equals(value)));
+        getRadioButtons().forEach(rb -> rb.setChecked(Objects.equals(rb.getItem(), value)));
     }
 
     @Override

diff --git a/...button-flow/src/test/java/com/vaadin/flow/component/radiobutton/RadioButtonGroupTest.java b/...button-flow/src/test/java/com/vaadin/flow/component/radiobutton/RadioButtonGroupTest.java
@@ -381,4 +381,12 @@ public void setIdentifierProviderOnId_setItemWithNullId_shouldFailToSelectExisti
         radioButtonGroup.setValue(new CustomItem(null, "First"));
         Assert.assertNull(radioButtonGroup.getValue().getId());
     }
+
+    @Test
+    public void addNullOption_setValue() {
+        RadioButtonGroup<String> group = new RadioButtonGroup<>();
+        group.setItems("enabled", "disabled", null);
+        group.setValue(null);
+        Assert.assertEquals(group.getValue(), null);
+    }
 }