Skip to content

fix: reuse tooltip instance for composite components (#9639) (CP: 25.2) #9640

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
web-padawan merged 1 commit into from
Jun 30, 2026
Merged

fix: reuse tooltip instance for composite components (#9639) (CP: 25.2) #9640

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
5 changes: 4 additions & 1 deletion ...t/vaadin-flow-components-base/src/main/java/com/vaadin/flow/component/shared/Tooltip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,10 @@ public static Tooltip forComponent(Component component) {
var tooltip = getForElement(component.getElement());
if (tooltip == null) {
tooltip = forElement(component.getElement());
ComponentUtil.setData(component, TOOLTIP_DATA_KEY, tooltip);
var innermostComponent = ComponentUtil
.getInnermostComponent(component.getElement());
ComponentUtil.setData(innermostComponent, TOOLTIP_DATA_KEY,
tooltip);
}
return tooltip;
}
Expand Down
16 changes: 16 additions & 0 deletions ...adin-flow-components-base/src/test/java/com/vaadin/flow/component/shared/TooltipTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.junit.jupiter.api.extension.RegisterExtension;

import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.Composite;
import com.vaadin.flow.component.Tag;
import com.vaadin.flow.component.shared.Tooltip.AriaLinkMode;
import com.vaadin.flow.component.shared.Tooltip.TooltipPosition;
Expand Down Expand Up @@ -228,6 +229,14 @@ void tooltipForCompopnentTwice_sameReference() {
Assertions.assertSame(tooltip, tooltip2);
}

@Test
void tooltipForCompositeTwice_sameReference() {
var composite = new CompositeComponent();
var tooltip = Tooltip.forComponent(composite);
var tooltip2 = Tooltip.forComponent(composite);
Assertions.assertSame(tooltip, tooltip2);
}

@Test
void createTooltip_fluentAPI() {
ui.add(component);
Expand Down Expand Up @@ -281,4 +290,11 @@ private Optional<Element> getTooltipElement() {
@Tag("test")
private static class TestComponent extends Component {
}

private static class CompositeComponent extends Composite<TestComponent> {
@Override
protected TestComponent initContent() {
return new TestComponent();
}
}
}
Loading