Skip to content

fix: return empty Text component if renderer is updated with null (#8168) (CP: 24.8) #8173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2025
Merged

fix: return empty Text component if renderer is updated with null (#8168) (CP: 24.8) #8173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...messages-flow/src/test/java/com/vaadin/flow/component/messages/tests/MessageListTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,21 @@ public class MessageListTest {
private MessageList messageList;
private MessageListItem item1;
private MessageListItem item2;
private UI ui;

@Before
public void setup() {
messageList = new MessageList();
item1 = new MessageListItem();
ui = new UI();
UI.setCurrent(ui);
item2 = new MessageListItem();
}

@After
public void tearDown() {
UI.setCurrent(null);
ui = null;
}

@Test(expected = UnsupportedOperationException.class)
Expand Down Expand Up @@ -96,7 +100,6 @@ public void setItems_containsNullItem_throws() {

@Test
public void setImageAsStreamResource_overridesImageUrl() {
UI.setCurrent(new UI());
item1.setUserImage("foo/bar");
item1.setUserImageResource(new StreamResource("message-list-img",
() -> getClass().getResourceAsStream("baz/qux")));
Expand All @@ -106,7 +109,6 @@ public void setImageAsStreamResource_overridesImageUrl() {

@Test
public void setImageAsUrl_streamResourceBecomesNull() {
UI.setCurrent(new UI());
item1.setUserImageResource(new StreamResource("message-list-img",
() -> getClass().getResourceAsStream("baz/qux")));
item1.setUserImage("foo/bar");
Expand All @@ -115,7 +117,6 @@ public void setImageAsUrl_streamResourceBecomesNull() {

@Test
public void setImageHandler_overridesImageUrl() {
UI.setCurrent(new UI());
item1.setUserImage("foo/bar");
item1.setUserImageHandler(
DownloadHandler.fromInputStream(data -> new DownloadResponse(
Expand All @@ -127,7 +128,6 @@ public void setImageHandler_overridesImageUrl() {

@Test
public void setImageHandler_streamResourceBecomesNull() {
UI.setCurrent(new UI());
item1.setUserImageHandler(
DownloadHandler.fromInputStream(data -> new DownloadResponse(
getClass().getResourceAsStream("baz/qux"),
Expand Down
16 changes: 10 additions & 6 deletions ...din-renderer-flow/src/main/java/com/vaadin/flow/data/renderer/ComponentDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,20 @@ public void generateData(T item, JsonObject jsonObject) {

@Override
protected Component createComponent(T item) {
Component c = componentRenderer.createComponent(item);
if (c == null) {
c = new Text("");
}
return c;
return ensureNonNullComponent(componentRenderer.createComponent(item));
}

@Override
protected Component updateComponent(Component currentComponent, T item) {
return componentRenderer.updateComponent(currentComponent, item);
return ensureNonNullComponent(
componentRenderer.updateComponent(currentComponent, item));
}

private Component ensureNonNullComponent(Component component) {
if (component == null) {
return new Text("");
}
return component;
}

@Override
Expand Down
5 changes: 5 additions & 0 deletions ...adin-renderer-flow/src/test/java/com/vaadin/flow/data/renderer/ComponentRendererTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ public void nullValues() {
Assert.assertNotNull(
"Placeholder component should be generated for null values", c);
Assert.assertEquals(0, c.getElement().getChildCount());

c = cdg.updateComponent(c, "foo");
Assert.assertNotNull(
"Placeholder component should be generated for null values", c);
Assert.assertEquals(0, c.getElement().getChildCount());
}

private void attachElement(UI ui, Element contentTemplate) {
Expand Down