@evlop/native-components 1.0.70 → 1.0.71
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/RenderPage/index.tsx"],"names":[],"mappings":";AAEA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAOrC,eAAO,MAAM,UAAU;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/RenderPage/index.tsx"],"names":[],"mappings":";AAEA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAOrC,eAAO,MAAM,UAAU;;iBAwEtB,CAAC;AAEF,eAAO,MAAM,oBAAoB;;oDAAyD,CAAC;AAE3F,eAAe,UAAU,CAAC"}
|
|
@@ -33,13 +33,14 @@ const DynamicLayout_1 = __importDefault(require("./DynamicLayout"));
|
|
|
33
33
|
const PageHeaderUpdater_1 = __importDefault(require("./PageHeaderUpdater"));
|
|
34
34
|
const RenderPage = ({ id }) => {
|
|
35
35
|
const context = react_redux_1.useSelector(s => s.context);
|
|
36
|
+
const parentScope = commons_1.useScope();
|
|
36
37
|
const pages = react_redux_1.useSelector(s => s.pages.records.data);
|
|
37
38
|
const user = commons_1.useUser();
|
|
38
39
|
const params = commons_1.useParams();
|
|
39
40
|
const config = commons_1.useConfig(null);
|
|
40
41
|
const page = pages.find(p => p.id === id);
|
|
41
|
-
const scope = react_1.useMemo(() => (Object.assign(Object.assign({}, context), { page: lodash_1.omit(page, ['blocks']), user,
|
|
42
|
-
config, params: params })), [page, params, user, config, context]);
|
|
42
|
+
const scope = react_1.useMemo(() => (Object.assign(Object.assign(Object.assign({}, context), parentScope), { page: lodash_1.omit(page, ['blocks']), user,
|
|
43
|
+
config, params: params })), [page, params, user, config, context, parentScope]);
|
|
43
44
|
const pageTypes = react_redux_1.useSelector(s => s.routes.pageTypes);
|
|
44
45
|
const pageTypeComponents = react_1.useMemo(() => {
|
|
45
46
|
return pageTypes.filter(p => p instanceof Function && p.routeName === page.routeName);
|
|
@@ -49,7 +50,7 @@ const RenderPage = ({ id }) => {
|
|
|
49
50
|
react_1.default.createElement(PageHeaderUpdater_1.default, { page: page }),
|
|
50
51
|
react_1.default.createElement(RenderBlocks_1.default, { key: "page-blocks", blocks: blocks }))), [page, blocks]);
|
|
51
52
|
// // wrap inside page type provider
|
|
52
|
-
pageContent = react_1.useMemo(() => lodash_1.reduce(pageTypeComponents, (children, PageTypeComponent, i) => (react_1.default.createElement(PageTypeComponent, { key: i }, children)), pageContent), [pageContent, pageTypeComponents]);
|
|
53
|
+
pageContent = react_1.useMemo(() => lodash_1.reduce(pageTypeComponents, (children, PageTypeComponent, i) => (react_1.default.createElement(PageTypeComponent, { key: `page-type-component-${i}` }, children)), pageContent), [pageContent, pageTypeComponents]);
|
|
53
54
|
// wrap inside data sources provider
|
|
54
55
|
pageContent = react_1.useMemo(() => lodash_1.reduce(dataSources, (prev, { name, dataSource }) => (react_1.default.createElement(commons_1.DataSource, { key: name, name: name, dataSource: dataSource, children: prev })), pageContent), [pageContent, dataSources]);
|
|
55
56
|
// wrap using page layout provider
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/RenderPage/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/RenderPage/index.tsx"],"names":[],"mappings":"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"}
|