Skip to content

Commit 342ae1c

Browse files
committed
fix: add workaround for RouterLinks in EnhancedRouteTabs
Close #89
1 parent 2b3fe14 commit 342ae1c

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/main/java/com/flowingcode/vaadin/addons/demo/EnhancedRouteTabs.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,19 @@ public class EnhancedRouteTabs extends EnhancedTabs implements BeforeEnterObserv
4242

4343
private final Map<RouterLink, Tab> routerLinkTabMap = new LinkedHashMap<>();
4444

45-
public void add(RouterLink routerLink) {
45+
public void addRouterLink(String label, Class<? extends Component> target) {
46+
RouterLink routerLink = new RouterLink(label, target);
47+
routerLink.getElement().executeJs("""
48+
this.addEventListener("click", e => {
49+
e.preventDefault();
50+
this.dispatchEvent(new CustomEvent('client-side-click'));
51+
});
52+
""");
53+
54+
routerLink.getElement().addEventListener("client-side-click", event -> {
55+
UI.getCurrent().navigate(target);
56+
});
57+
4658
routerLink.setHighlightCondition(HighlightConditions.sameLocation());
4759
routerLink.setHighlightAction(
4860
(link, shouldHighlight) -> {

src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import com.vaadin.flow.router.PageTitle;
4040
import com.vaadin.flow.router.Route;
4141
import com.vaadin.flow.router.RouterLayout;
42-
import com.vaadin.flow.router.RouterLink;
4342
import java.util.ArrayList;
4443
import java.util.List;
4544
import java.util.Objects;
@@ -152,8 +151,7 @@ public void addDemo(Class<? extends Component> clazz, String label) {
152151
if (!clazz.isAnnotationPresent(Route.class)) {
153152
throw new IllegalArgumentException(clazz + " must be annotated as Route");
154153
}
155-
RouterLink tab = new RouterLink(label, clazz);
156-
tabs.add(tab);
154+
tabs.addRouterLink(label, clazz);
157155
}
158156

159157
/**

0 commit comments

Comments
 (0)