Skip to content

Commit 2933304

Browse files
javier-godoypaodb
authored andcommitted
fix: use TabbedDemo route in legacy demos
1 parent b608d3e commit 2933304

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.vaadin.flow.router.BeforeEnterObserver;
99
import com.vaadin.flow.router.HighlightConditions;
1010
import com.vaadin.flow.router.Location;
11+
import com.vaadin.flow.router.Route;
1112
import com.vaadin.flow.router.RouterLink;
1213
import java.util.LinkedHashMap;
1314
import java.util.Map;
@@ -58,9 +59,11 @@ public void addLegacyTab(String label, Component content) {
5859
add(tab);
5960
addSelectedChangeListener(ev -> {
6061
if (ev.getSelectedTab() == tab) {
61-
UI.getCurrent().getPage().getHistory().pushState(null, new Location(""));
62-
((TabbedDemo) getParent().get()).removeRouterLayoutContent(null);
63-
((TabbedDemo) getParent().get()).showRouterLayoutContent(content);
62+
TabbedDemo tabbedDemo = (TabbedDemo) getParent().get();
63+
String route = tabbedDemo.getClass().getAnnotation(Route.class).value();
64+
UI.getCurrent().getPage().getHistory().pushState(null, new Location(route));
65+
tabbedDemo.removeRouterLayoutContent(null);
66+
tabbedDemo.showRouterLayoutContent(content);
6467
}
6568
});
6669
}

src/test/java/com/flowingcode/vaadin/addons/demo/Demo.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
import com.vaadin.flow.router.Route;
2424
import com.vaadin.flow.router.RouteAlias;
2525

26-
/** Hello world! */
27-
@Route("")
28-
@RouteAlias("demo")
26+
@Route("demo")
27+
@RouteAlias("")
2928
@GithubLink("https://github.com/FlowingCode/CommonsDemo")
3029
public class Demo extends TabbedDemo {
3130

0 commit comments

Comments
 (0)