@tramvai/module-render 1.48.2 → 1.50.0

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.
Files changed (4) hide show
  1. package/lib/browser.js +5 -5
  2. package/lib/server.es.js +5 -5
  3. package/lib/server.js +5 -5
  4. package/package.json +14 -14
package/lib/browser.js CHANGED
@@ -25,15 +25,15 @@ const layoutWrapper = memoOne(withError(), strictEqual);
25
25
  const pageWrapper = memoOne(withError(), strictEqual);
26
26
  const Root = withError()(({ pageService }) => {
27
27
  const { config } = useRoute();
28
- const { pageComponent, layoutComponent = 'layoutDefault', headerComponent = 'headerDefault', footerComponent = 'footerDefault', } = config;
28
+ const { pageComponent } = config;
29
29
  const PageComponent = pageService.getComponent(pageComponent);
30
- // Достаем компоненты для текущей страницы, либо берем default реализации
31
- const LayoutComponent = pageService.getComponent(layoutComponent) || pageService.getComponent('layoutDefault');
32
- const HeaderComponent = pageService.getComponent(headerComponent) || pageService.getComponent('headerDefault');
33
- const FooterComponent = pageService.getComponent(footerComponent) || pageService.getComponent('footerDefault');
34
30
  if (!PageComponent) {
35
31
  throw new Error(`Page component '${pageComponent}' not found`);
36
32
  }
33
+ // Достаем компоненты для текущей страницы, либо берем default реализации
34
+ const LayoutComponent = pageService.resolveComponentFromConfig('layout');
35
+ const HeaderComponent = pageService.resolveComponentFromConfig('header');
36
+ const FooterComponent = pageService.resolveComponentFromConfig('footer');
37
37
  return (React.createElement(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: layoutWrapper(LayoutComponent), PageComponent: pageWrapper(PageComponent) }));
38
38
  });
39
39
 
package/lib/server.es.js CHANGED
@@ -612,15 +612,15 @@ const layoutWrapper = memoOne(withError(), strictEqual);
612
612
  const pageWrapper = memoOne(withError(), strictEqual);
613
613
  const Root = withError()(({ pageService }) => {
614
614
  const { config } = useRoute();
615
- const { pageComponent, layoutComponent = 'layoutDefault', headerComponent = 'headerDefault', footerComponent = 'footerDefault', } = config;
615
+ const { pageComponent } = config;
616
616
  const PageComponent = pageService.getComponent(pageComponent);
617
- // Достаем компоненты для текущей страницы, либо берем default реализации
618
- const LayoutComponent = pageService.getComponent(layoutComponent) || pageService.getComponent('layoutDefault');
619
- const HeaderComponent = pageService.getComponent(headerComponent) || pageService.getComponent('headerDefault');
620
- const FooterComponent = pageService.getComponent(footerComponent) || pageService.getComponent('footerDefault');
621
617
  if (!PageComponent) {
622
618
  throw new Error(`Page component '${pageComponent}' not found`);
623
619
  }
620
+ // Достаем компоненты для текущей страницы, либо берем default реализации
621
+ const LayoutComponent = pageService.resolveComponentFromConfig('layout');
622
+ const HeaderComponent = pageService.resolveComponentFromConfig('header');
623
+ const FooterComponent = pageService.resolveComponentFromConfig('footer');
624
624
  return (React.createElement(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: layoutWrapper(LayoutComponent), PageComponent: pageWrapper(PageComponent) }));
625
625
  });
626
626
 
package/lib/server.js CHANGED
@@ -651,15 +651,15 @@ const layoutWrapper = memoOne__default["default"](react.withError(), strictEqual
651
651
  const pageWrapper = memoOne__default["default"](react.withError(), strictEqual__default["default"]);
652
652
  const Root = react.withError()(({ pageService }) => {
653
653
  const { config } = moduleRouter.useRoute();
654
- const { pageComponent, layoutComponent = 'layoutDefault', headerComponent = 'headerDefault', footerComponent = 'footerDefault', } = config;
654
+ const { pageComponent } = config;
655
655
  const PageComponent = pageService.getComponent(pageComponent);
656
- // Достаем компоненты для текущей страницы, либо берем default реализации
657
- const LayoutComponent = pageService.getComponent(layoutComponent) || pageService.getComponent('layoutDefault');
658
- const HeaderComponent = pageService.getComponent(headerComponent) || pageService.getComponent('headerDefault');
659
- const FooterComponent = pageService.getComponent(footerComponent) || pageService.getComponent('footerDefault');
660
656
  if (!PageComponent) {
661
657
  throw new Error(`Page component '${pageComponent}' not found`);
662
658
  }
659
+ // Достаем компоненты для текущей страницы, либо берем default реализации
660
+ const LayoutComponent = pageService.resolveComponentFromConfig('layout');
661
+ const HeaderComponent = pageService.resolveComponentFromConfig('header');
662
+ const FooterComponent = pageService.resolveComponentFromConfig('footer');
663
663
  return (React__default["default"].createElement(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: layoutWrapper(LayoutComponent), PageComponent: pageWrapper(PageComponent) }));
664
664
  });
665
665
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/module-render",
3
- "version": "1.48.2",
3
+ "version": "1.50.0",
4
4
  "description": "",
5
5
  "browser": "lib/browser.js",
6
6
  "main": "lib/server.js",
@@ -24,26 +24,26 @@
24
24
  "@tinkoff/htmlpagebuilder": "0.4.22",
25
25
  "@tinkoff/layout-factory": "0.2.28",
26
26
  "@tinkoff/url": "0.7.37",
27
- "@tinkoff/user-agent": "0.3.207",
28
- "@tramvai/module-client-hints": "1.48.2",
29
- "@tramvai/module-router": "1.48.2",
30
- "@tramvai/react": "1.48.2",
27
+ "@tinkoff/user-agent": "0.3.212",
28
+ "@tramvai/module-client-hints": "1.50.0",
29
+ "@tramvai/module-router": "1.50.0",
30
+ "@tramvai/react": "1.50.0",
31
31
  "@tramvai/safe-strings": "0.4.3",
32
- "@tramvai/tokens-render": "1.48.2",
33
- "@tramvai/experiments": "1.48.2",
32
+ "@tramvai/tokens-render": "1.50.0",
33
+ "@tramvai/experiments": "1.50.0",
34
34
  "@types/loadable__server": "^5.12.6",
35
35
  "node-fetch": "^2.6.1"
36
36
  },
37
37
  "peerDependencies": {
38
38
  "@tinkoff/dippy": "0.7.36",
39
39
  "@tinkoff/utils": "^2.1.2",
40
- "@tramvai/cli": "1.48.2",
41
- "@tramvai/core": "1.48.2",
42
- "@tramvai/module-common": "1.48.2",
43
- "@tramvai/state": "1.48.2",
44
- "@tramvai/test-helpers": "1.48.2",
45
- "@tramvai/tokens-common": "1.48.2",
46
- "@tramvai/tokens-router": "1.48.2",
40
+ "@tramvai/cli": "1.50.0",
41
+ "@tramvai/core": "1.50.0",
42
+ "@tramvai/module-common": "1.50.0",
43
+ "@tramvai/state": "1.50.0",
44
+ "@tramvai/test-helpers": "1.50.0",
45
+ "@tramvai/tokens-common": "1.50.0",
46
+ "@tramvai/tokens-router": "1.50.0",
47
47
  "prop-types": "^15.6.2",
48
48
  "react": ">=16.8.0",
49
49
  "react-dom": ">=16.8.0",