JavaScriptBootstrapUI.java (vaadin-flow-4.0.5) | : | JavaScriptBootstrapUI.java (vaadin-flow-4.0.6) | ||
---|---|---|---|---|
skipping to change at line 76 | skipping to change at line 76 | |||
super(new JavaScriptUIInternalUpdater()); | super(new JavaScriptUIInternalUpdater()); | |||
} | } | |||
@Override | @Override | |||
public Stream<Component> getChildren() { | public Stream<Component> getChildren() { | |||
// server-side routing | // server-side routing | |||
if (wrapperElement == null) { | if (wrapperElement == null) { | |||
return super.getChildren(); | return super.getChildren(); | |||
} | } | |||
// client-side routing, | // #9069 with client-side routing, since routing component is a virtual | |||
// since virtual child is used, it is necessary to change the original | // child, its children need to be included separately (there should only | |||
// UI element to the wrapperElement | // be one) | |||
Builder<Component> childComponents = Stream.builder(); | Builder<Component> childComponents = Stream.builder(); | |||
wrapperElement.getChildren().forEach(childElement -> ComponentUtil | wrapperElement.getChildren().forEach(childElement -> ComponentUtil | |||
.findComponents(childElement, childComponents::add)); | .findComponents(childElement, childComponents::add)); | |||
super.getChildren().forEach(childComponents::add); | ||||
return childComponents.build(); | return childComponents.build(); | |||
} | } | |||
/** | /** | |||
* Gets the new forward url. | * Gets the new forward url. | |||
* | * | |||
* @return the new forward url | * @return the new forward url | |||
*/ | */ | |||
public String getForwardToClientUrl() { | public String getForwardToClientUrl() { | |||
return forwardToClientUrl; | return forwardToClientUrl; | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 4 lines changed or added |