fix: add workaround for RouterLinks in EnhancedRouteTabs

Close #89
FlowingCode · Jun 12, 2024 · 342ae1c · 342ae1c
1 parent 2b3fe14
commit 342ae1c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/com/flowingcode/vaadin/addons/demo/EnhancedRouteTabs.java b/src/main/java/com/flowingcode/vaadin/addons/demo/EnhancedRouteTabs.java
@@ -42,7 +42,19 @@ public class EnhancedRouteTabs extends EnhancedTabs implements BeforeEnterObserv
 
   private final Map<RouterLink, Tab> routerLinkTabMap = new LinkedHashMap<>();
 
-  public void add(RouterLink routerLink) {
+  public void addRouterLink(String label, Class<? extends Component> target) {
+    RouterLink routerLink = new RouterLink(label, target);
+    routerLink.getElement().executeJs("""
+        this.addEventListener("click", e => {
+            e.preventDefault();
+            this.dispatchEvent(new CustomEvent('client-side-click'));
+        });
+        """);
+
+    routerLink.getElement().addEventListener("client-side-click", event -> {
+      UI.getCurrent().navigate(target);
+    });
+
     routerLink.setHighlightCondition(HighlightConditions.sameLocation());
     routerLink.setHighlightAction(
         (link, shouldHighlight) -> {

diff --git a/src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java b/src/main/java/com/flowingcode/vaadin/addons/demo/TabbedDemo.java
@@ -39,7 +39,6 @@
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.router.RouterLayout;
-import com.vaadin.flow.router.RouterLink;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -152,8 +151,7 @@ public void addDemo(Class<? extends Component> clazz, String label) {
     if (!clazz.isAnnotationPresent(Route.class)) {
       throw new IllegalArgumentException(clazz + " must be annotated as Route");
     }
-    RouterLink tab = new RouterLink(label, clazz);
-    tabs.add(tab);
+    tabs.addRouterLink(label, clazz);
   }
 
   /**