File tree Expand file tree Collapse file tree 2 files changed +9
-14
lines changed
src/main/java/com/flowingcode/vaadin/addons/demo Expand file tree Collapse file tree 2 files changed +9
-14
lines changed Original file line number Diff line number Diff line change @@ -36,8 +36,15 @@ public void add(RouterLink routerLink) {
3636
3737 @ Override
3838 public void beforeEnter (BeforeEnterEvent event ) {
39- // In case no tabs will match
4039 setSelectedTab (null );
40+ if (TabbedDemo .class .isAssignableFrom (event .getNavigationTarget ())) {
41+ RouterLink first = getFirstRoute ();
42+ if (first != null ) {
43+ event .forwardTo (first .getHref ());
44+ } else {
45+ getChildren ().findFirst ().ifPresent (tab -> setSelectedTab ((Tab ) tab ));
46+ }
47+ }
4148 }
4249
4350 public Map <RouterLink , Tab > getRouterLinkTabMap () {
Original file line number Diff line number Diff line change 2929import com .vaadin .flow .component .orderedlayout .HorizontalLayout ;
3030import com .vaadin .flow .component .orderedlayout .VerticalLayout ;
3131import com .vaadin .flow .component .splitlayout .SplitLayout .Orientation ;
32- import com .vaadin .flow .router .BeforeEnterEvent ;
33- import com .vaadin .flow .router .BeforeEnterObserver ;
3432import com .vaadin .flow .router .PageTitle ;
3533import com .vaadin .flow .router .Route ;
3634import com .vaadin .flow .router .RouterLayout ;
3735import com .vaadin .flow .router .RouterLink ;
3836
3937@ StyleSheet ("context://frontend/styles/commons-demo/shared-styles.css" )
4038@ SuppressWarnings ("serial" )
41- public class TabbedDemo extends VerticalLayout implements RouterLayout , BeforeEnterObserver {
39+ public class TabbedDemo extends VerticalLayout implements RouterLayout {
4240
4341 private RouteTabs tabs ;
4442 private HorizontalLayout footer ;
@@ -192,14 +190,4 @@ private void updateSplitterOrientation() {
192190 }
193191 }
194192
195- @ Override
196- public void beforeEnter (BeforeEnterEvent event ) {
197- if (TabbedDemo .class .isAssignableFrom (event .getNavigationTarget ())) {
198- RouterLink first = tabs .getFirstRoute ();
199- if (first != null ) {
200- event .forwardTo (first .getHref ());
201- }
202- }
203- }
204-
205193}
You can’t perform that action at this time.
0 commit comments