@tramvai/react 2.11.0 → 2.21.0

package/lib/di/context.d.ts

@@ -1,3 +1,3 @@
 import type { Context } from 'react';
-import type { DI_TOKEN } from '@tramvai/core';
+import type { DI_TOKEN } from '@tinkoff/dippy';
 export declare const DIContext: Context<typeof DI_TOKEN>;

package/lib/lazy/lazy.d.ts

@@ -1,4 +1,6 @@
 import type { LoadableComponent, DefaultComponent } from '@loadable/component';
+import type { TramvaiComponent, TramvaiComponentDecl } from '../typings/components';
+export declare const resolveLazyComponent: (componentOrLoader?: TramvaiComponentDecl | undefined) => Promise<TramvaiComponent | undefined>;
 interface Options {
     loading?: JSX.Element;
 }
@@ -7,5 +9,5 @@ interface Options {
  * The method is intended to make it possible to wait for retries to synchronously load unsuccessful CSS assets
  */
 export declare const __lazyErrorHandler: (error: any, load: () => Promise<any>) => Promise<any>;
-export declare const lazy: <Props, Component>(load: (props?: Props | undefined) => Promise<DefaultComponent<Props>>, options?: Options) => LoadableComponent<Props>;
+export declare const lazy: <Props>(load: (props?: Props | undefined) => Promise<DefaultComponent<Props>>, options?: Options) => LoadableComponent<Props>;
 export {};

package/lib/react.d.ts

@@ -6,4 +6,5 @@ export { ErrorBoundary } from './error/component';
 export { FallbackError } from './error/fallback';
 export { withError } from './error/hoc';
 export * from './error/tokens';
-export { lazy, __lazyErrorHandler } from './lazy/lazy';
+export { lazy, __lazyErrorHandler, resolveLazyComponent } from './lazy/lazy';
+export * from './typings/components';

package/lib/react.es.js

@@ -164,6 +164,26 @@ const withError = ({ fallbackComponent, } = {}) => (WrappedComponent) => {
     return hoistStatics(WrapperWithError, WrappedComponent);
 };
 
+const resolveLazyComponent = async (componentOrLoader) => {
+    if (!componentOrLoader) {
+        return;
+    }
+    if ('load' in componentOrLoader && typeof componentOrLoader.load === 'function') {
+        const mod = await componentOrLoader.load();
+        let component;
+        if (mod.__esModule) {
+            component = mod.default;
+        }
+        else {
+            component = mod.default || mod;
+        }
+        // manually hoist static properties from preloaded component to loadable wrapper,
+        // this open access to current page component static properties outside before rendering
+        hoistStatics(componentOrLoader, component);
+        return component;
+    }
+    return componentOrLoader;
+};
 /**
  * @private Only for internal usage!
  * The method is intended to make it possible to wait for retries to synchronously load unsuccessful CSS assets
@@ -204,4 +224,4 @@ the first argument should be transformed into a special object, but the current
     });
 };
 
-export { DIContext, ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN, ERROR_BOUNDARY_TOKEN, ErrorBoundary, FallbackError, ROOT_ERROR_BOUNDARY_COMPONENT_TOKEN, UniversalErrorBoundary, __lazyErrorHandler, lazy, useDi, useDiContainer, withDi, withError };
+export { DIContext, ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN, ERROR_BOUNDARY_TOKEN, ErrorBoundary, FallbackError, ROOT_ERROR_BOUNDARY_COMPONENT_TOKEN, UniversalErrorBoundary, __lazyErrorHandler, lazy, resolveLazyComponent, useDi, useDiContainer, withDi, withError };

package/lib/react.js

@@ -174,6 +174,26 @@ const withError = ({ fallbackComponent, } = {}) => (WrappedComponent) => {
     return hoistStatics__default["default"](WrapperWithError, WrappedComponent);
 };
 
+const resolveLazyComponent = async (componentOrLoader) => {
+    if (!componentOrLoader) {
+        return;
+    }
+    if ('load' in componentOrLoader && typeof componentOrLoader.load === 'function') {
+        const mod = await componentOrLoader.load();
+        let component;
+        if (mod.__esModule) {
+            component = mod.default;
+        }
+        else {
+            component = mod.default || mod;
+        }
+        // manually hoist static properties from preloaded component to loadable wrapper,
+        // this open access to current page component static properties outside before rendering
+        hoistStatics__default["default"](componentOrLoader, component);
+        return component;
+    }
+    return componentOrLoader;
+};
 /**
  * @private Only for internal usage!
  * The method is intended to make it possible to wait for retries to synchronously load unsuccessful CSS assets
@@ -222,6 +242,7 @@ exports.ROOT_ERROR_BOUNDARY_COMPONENT_TOKEN = ROOT_ERROR_BOUNDARY_COMPONENT_TOKE
 exports.UniversalErrorBoundary = UniversalErrorBoundary;
 exports.__lazyErrorHandler = __lazyErrorHandler;
 exports.lazy = lazy;
+exports.resolveLazyComponent = resolveLazyComponent;
 exports.useDi = useDi;
 exports.useDiContainer = useDiContainer;
 exports.withDi = withDi;

package/lib/typings/components.d.ts

@@ -0,0 +1,26 @@
+import type { ComponentType, ReactNode } from 'react';
+import type { PageAction, Reducer } from '@tramvai/types-actions-state-context';
+import type { LoadableComponent } from '@loadable/component';
+export declare type LazyComponentWrapper<Component extends ComponentType<any>> = {
+    load: (props?: Component extends ComponentType<infer Props> ? Props : {}) => Promise<{
+        default: Component;
+    }>;
+} & LoadableComponent<Component extends ComponentType<infer Props> ? Props : {}>;
+export interface PageComponentOptions {
+    actions?: PageAction[];
+    reducers?: Reducer<any, any>[];
+    components?: Record<string, TramvaiComponent>;
+}
+export interface PageComponentProps {
+}
+export declare type PageComponent = ComponentType<PageComponentProps> & Partial<PageComponentOptions>;
+export interface LayoutComponentOptions {
+}
+export interface LayoutComponentProps {
+    Header: ComponentType;
+    Footer: ComponentType;
+    children?: ReactNode;
+}
+export declare type LayoutComponent = ComponentType<LayoutComponentProps> & Partial<LayoutComponentOptions>;
+export declare type TramvaiComponent = PageComponent | LayoutComponent;
+export declare type TramvaiComponentDecl = TramvaiComponent | LazyComponentWrapper<TramvaiComponent>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/react",
-  "version": "2.11.0",
+  "version": "2.21.0",
   "description": "",
   "main": "lib/react.js",
   "typings": "lib/react.d.ts",
@@ -18,15 +18,15 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@loadable/component": "^5.15.0",
+    "@loadable/component": "^5.15.2",
     "@types/loadable__component": "^5.13.4",
+    "@tramvai/types-actions-state-context": "2.21.0",
     "hoist-non-react-statics": "^3.3.0"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.7.45",
+    "@tinkoff/dippy": "0.8.2",
     "@tinkoff/utils": "^2.1.2",
-    "@tinkoff/url": "0.7.39",
-    "@tramvai/core": "2.11.0",
+    "@tinkoff/url": "0.8.2",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "tslib": "^2.0.3"