@umijs/renderer-react
Advanced tools
Comparing version 3.0.8 to 3.0.9
@@ -260,8 +260,2 @@ import * as ReactDOM from 'react-dom'; | ||
}; | ||
} | ||
function wrapWrapper(Component, Wrapper) { | ||
return function (props) { | ||
return React.createElement(Wrapper, props, React.createElement(Component, props)); | ||
}; | ||
} // TODO: custom Switch | ||
@@ -284,5 +278,11 @@ // 1. keep alive | ||
Component = wrapInitialPropsFetch(Component); | ||
} // route.wrappers | ||
} | ||
var newProps = _objectSpread2({}, props, {}, opts.extraProps, { | ||
route: route | ||
}); // @ts-ignore | ||
var ret = React.createElement(Component, newProps, routes); // route.wrappers | ||
if (wrappers) { | ||
@@ -292,3 +292,3 @@ var len = wrappers.length - 1; | ||
while (len >= 0) { | ||
Component = wrapWrapper(Component, wrappers[len]); | ||
ret = React.createElement(wrappers[len], newProps, ret); | ||
len -= 1; | ||
@@ -298,7 +298,3 @@ } | ||
var newProps = _objectSpread2({}, props, {}, opts.extraProps, { | ||
route: route | ||
}); | ||
return React.createElement(Component, newProps, routes); | ||
return ret; | ||
} else { | ||
@@ -305,0 +301,0 @@ return routes; |
@@ -267,8 +267,2 @@ 'use strict'; | ||
}; | ||
} | ||
function wrapWrapper(Component, Wrapper) { | ||
return function (props) { | ||
return React__default.createElement(Wrapper, props, React__default.createElement(Component, props)); | ||
}; | ||
} // TODO: custom Switch | ||
@@ -291,5 +285,11 @@ // 1. keep alive | ||
Component = wrapInitialPropsFetch(Component); | ||
} // route.wrappers | ||
} | ||
var newProps = _objectSpread2({}, props, {}, opts.extraProps, { | ||
route: route | ||
}); // @ts-ignore | ||
var ret = React__default.createElement(Component, newProps, routes); // route.wrappers | ||
if (wrappers) { | ||
@@ -299,3 +299,3 @@ var len = wrappers.length - 1; | ||
while (len >= 0) { | ||
Component = wrapWrapper(Component, wrappers[len]); | ||
ret = React__default.createElement(wrappers[len], newProps, ret); | ||
len -= 1; | ||
@@ -305,7 +305,3 @@ } | ||
var newProps = _objectSpread2({}, props, {}, opts.extraProps, { | ||
route: route | ||
}); | ||
return React__default.createElement(Component, newProps, routes); | ||
return ret; | ||
} else { | ||
@@ -312,0 +308,0 @@ return routes; |
{ | ||
"name": "@umijs/renderer-react", | ||
"version": "3.0.8", | ||
"version": "3.0.9", | ||
"description": "@umijs/renderer-react", | ||
@@ -31,3 +31,3 @@ "main": "dist/index.js", | ||
"@types/react-router-config": "^5.0.1", | ||
"@umijs/runtime": "3.0.8", | ||
"@umijs/runtime": "3.0.9", | ||
"react": "^16.13.0", | ||
@@ -34,0 +34,0 @@ "react-dom": "^16.13.0", |
22768
699
+ Added@umijs/runtime@3.0.9(transitive)
- Removed@umijs/runtime@3.0.8(transitive)
Updated@umijs/runtime@3.0.9