@steroidsjs/core 3.0.94 → 3.0.96
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/ui/nav/Router/Router.js +5 -2
package/package.json
CHANGED
package/ui/nav/Router/Router.js
CHANGED
|
@@ -166,16 +166,19 @@ function Router(props) {
|
|
|
166
166
|
});
|
|
167
167
|
var renderItem = function (routeItem, routeProps) {
|
|
168
168
|
var children = null;
|
|
169
|
+
var hasExact = false;
|
|
169
170
|
activeRouteIds.find(function (activeRouteId) {
|
|
170
171
|
if (activeRouteId === routeItem.id) {
|
|
171
172
|
// Stop
|
|
172
173
|
return true;
|
|
173
174
|
}
|
|
174
175
|
var activeRoute = routes.find(function (r) { return r.id === activeRouteId; });
|
|
175
|
-
|
|
176
|
+
if (!hasExact && activeRoute.component && !activeRoute.redirectTo) {
|
|
177
|
+
children = renderComponent(activeRoute, activePath, __assign(__assign({}, routeProps), { children: children }), props.alwaysAppendParentRoutePath) || children;
|
|
178
|
+
}
|
|
176
179
|
// Stop, if route is exact
|
|
177
180
|
if (activeRoute.exact) {
|
|
178
|
-
|
|
181
|
+
hasExact = true;
|
|
179
182
|
}
|
|
180
183
|
return false;
|
|
181
184
|
});
|