@tramvai/react 1.85.0 → 1.90.2

package/lib/di/hoc.d.ts

@@ -1,3 +1,5 @@
 import React from 'react';
 import type { ProviderDeps, ProvideDepsIterator } from '@tinkoff/dippy';
-export declare const withDi: <T extends ProviderDeps>(deps: T) => <C extends React.ComponentType<Partial<ProvideDepsIterator<T>>>>(WrappedComponent: C) => C;
+export declare const withDi: <T extends ProviderDeps>(deps: T) => <C extends React.ComponentType<Partial<ProvideDepsIterator<T>> & {
+    children?: React.ReactNode;
+}>>(WrappedComponent: C) => C;

package/lib/error/UniversalErrorBoundary.d.ts

@@ -17,6 +17,7 @@ export interface UniversalErrorBoundaryProps {
      * @deprecated
      */
     fallbackFromDi?: React.ReactElement | null;
+    children?: React.ReactNode;
 }
 interface State {
     error: AnyError | null;
@@ -34,6 +35,6 @@ export declare class UniversalErrorBoundary extends Component<Props, State> {
         error: AnyError;
     };
     componentDidCatch(error: AnyError, errorInfo: React.ErrorInfo): void;
-    render(): React.ReactNode;
+    render(): string | number | boolean | React.ReactFragment | JSX.Element | null | undefined;
 }
 export {};

package/lib/error/component.d.ts

@@ -4,6 +4,7 @@ interface Props {
     errorHandlers?: typeof ERROR_BOUNDARY_TOKEN | null;
     fallbackComponent?: React.ReactElement | null;
     fallbackComponentFromDi?: React.ReactElement | null;
+    children?: React.ReactNode;
 }
 interface State {
     hasError: boolean;
@@ -18,6 +19,6 @@ export declare class ErrorBoundary extends Component<Props, State> {
         hasError: boolean;
     };
     componentDidCatch(error: Error, errorInfo: React.ErrorInfo): void;
-    render(): React.ReactNode;
+    render(): string | number | boolean | React.ReactFragment | JSX.Element | null | undefined;
 }
 export {};

package/lib/error/hoc.d.ts

@@ -4,4 +4,6 @@ import React from 'react';
  */
 export declare const withError: ({ fallbackComponent, }?: {
     fallbackComponent?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
-}) => <T extends React.ComponentType<any>>(WrappedComponent: T) => T;
+}) => <T extends React.ComponentType<{
+    children?: React.ReactNode;
+}>>(WrappedComponent: T) => T;

package/lib/react.es.js

@@ -1,4 +1,5 @@
-import React, { createContext, useContext, useMemo, Component } from 'react';
+import { createContext, useContext, useMemo, Component } from 'react';
+import { jsx, jsxs } from 'react/jsx-runtime';
 import hoistStatics from 'hoist-non-react-statics';
 import mapObj from '@tinkoff/utils/object/map';
 import { __decorate } from 'tslib';
@@ -39,35 +40,29 @@ const withDi = (deps) => (WrappedComponent) => {
     function WrapperWithPropsFromDi(props) {
         const depsInstance = useDi(deps);
         // eslint-disable-next-line react/jsx-props-no-spreading
-        return React.createElement(WrappedComponent, Object.assign({}, props, depsInstance));
+        return jsx(WrappedComponent, Object.assign({}, props, depsInstance), void 0);
     }
     return hoistStatics(WrapperWithPropsFromDi, WrappedComponent);
 };
 
-/* eslint-disable jsx-a11y/anchor-is-valid */
 const FallbackError = () => {
-    return (React.createElement("div", null,
-        React.createElement("div", { style: {
-                textAlign: 'center',
-                marginBottom: 11,
-                paddingTop: 26,
-                fontSize: 30,
-                lineHeight: '36px',
-                fontWeight: 200,
-            } }, "\u0412\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 :("),
-        React.createElement("div", { style: {
-                textAlign: 'center',
-                marginBottom: 17,
-                color: '#9299a2',
-                fontSize: 20,
-                lineHeight: '24px',
-            } },
-            "\u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435",
-            ' ',
-            React.createElement("a", { href: "", onClick: () => window.location.reload() }, "\u043F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443"))));
+    return (jsxs("div", { children: [jsx("div", Object.assign({ style: {
+                    textAlign: 'center',
+                    marginBottom: 11,
+                    paddingTop: 26,
+                    fontSize: 30,
+                    lineHeight: '36px',
+                    fontWeight: 200,
+                } }, { children: "\u0412\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 :(" }), void 0),
+            jsxs("div", Object.assign({ style: {
+                    textAlign: 'center',
+                    marginBottom: 17,
+                    color: '#9299a2',
+                    fontSize: 20,
+                    lineHeight: '24px',
+                } }, { children: ["\u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435", ' ', jsx("a", Object.assign({ href: "", onClick: () => window.location.reload() }, { children: "\u043F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443" }), void 0)] }), void 0)] }, void 0));
 };
 FallbackError.displayName = 'FallbackError';
-/* eslint-enable jsx-a11y/anchor-is-valid */
 
 class UniversalErrorBoundary extends Component {
     constructor(props) {
@@ -102,12 +97,12 @@ class UniversalErrorBoundary extends Component {
             return children;
         }
         if (Fallback) {
-            return React.createElement(Fallback, { url: url, error: error });
+            return jsx(Fallback, { url: url, error: error }, void 0);
         }
         if (fallbackFromDi) {
             return fallbackFromDi;
         }
-        return React.createElement(FallbackError, null);
+        return jsx(FallbackError, {}, void 0);
     }
 }
 UniversalErrorBoundary.displayName = 'UniversalErrorBoundary';
@@ -148,7 +143,7 @@ let ErrorBoundary = class ErrorBoundary extends Component {
         if (!hasError) {
             return children;
         }
-        return fallbackComponent || fallbackComponentFromDi || React.createElement(FallbackError, null);
+        return fallbackComponent || fallbackComponentFromDi || jsx(FallbackError, {}, void 0);
     }
 };
 ErrorBoundary.displayName = 'ErrorBoundary';
@@ -164,8 +159,7 @@ ErrorBoundary = __decorate([
  */
 const withError = ({ fallbackComponent, } = {}) => (WrappedComponent) => {
     function WrapperWithError(props) {
-        return (React.createElement(ErrorBoundary, { fallbackComponent: fallbackComponent },
-            React.createElement(WrappedComponent, Object.assign({}, props))));
+        return (jsx(ErrorBoundary, Object.assign({ fallbackComponent: fallbackComponent }, { children: jsx(WrappedComponent, Object.assign({}, props), void 0) }), void 0));
     }
     return hoistStatics(WrapperWithError, WrappedComponent);
 };

package/lib/react.js

@@ -2,7 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
+var react = require('react');
+var jsxRuntime = require('react/jsx-runtime');
 var hoistStatics = require('hoist-non-react-statics');
 var mapObj = require('@tinkoff/utils/object/map');
 var tslib = require('tslib');
@@ -11,15 +12,14 @@ var loadable = require('@loadable/component');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var hoistStatics__default = /*#__PURE__*/_interopDefaultLegacy(hoistStatics);
 var mapObj__default = /*#__PURE__*/_interopDefaultLegacy(mapObj);
 var loadable__default = /*#__PURE__*/_interopDefaultLegacy(loadable);
 
-const DIContext = React.createContext(null);
+const DIContext = react.createContext(null);
 
 const useDiContainer = () => {
-    const di = React.useContext(DIContext);
+    const di = react.useContext(DIContext);
     if (!di) {
         if (process.env.NODE_ENV !== 'production') {
             throw new Error(`DI-контейнер не найден, убедитесь что в приложении используется 'DIContext.Provider' из '@tramvai/react'
@@ -38,7 +38,7 @@ const isTokenObject = (token) => {
 };
 function useDi(deps) {
     const di = useDiContainer();
-    return React.useMemo(() => {
+    return react.useMemo(() => {
         if (deps.toString() !== '[object Object]' || isTokenObject(deps)) {
             return di.get(deps);
         }
@@ -50,37 +50,31 @@ const withDi = (deps) => (WrappedComponent) => {
     function WrapperWithPropsFromDi(props) {
         const depsInstance = useDi(deps);
         // eslint-disable-next-line react/jsx-props-no-spreading
-        return React__default["default"].createElement(WrappedComponent, Object.assign({}, props, depsInstance));
+        return jsxRuntime.jsx(WrappedComponent, Object.assign({}, props, depsInstance), void 0);
     }
     return hoistStatics__default["default"](WrapperWithPropsFromDi, WrappedComponent);
 };
 
-/* eslint-disable jsx-a11y/anchor-is-valid */
 const FallbackError = () => {
-    return (React__default["default"].createElement("div", null,
-        React__default["default"].createElement("div", { style: {
-                textAlign: 'center',
-                marginBottom: 11,
-                paddingTop: 26,
-                fontSize: 30,
-                lineHeight: '36px',
-                fontWeight: 200,
-            } }, "\u0412\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 :("),
-        React__default["default"].createElement("div", { style: {
-                textAlign: 'center',
-                marginBottom: 17,
-                color: '#9299a2',
-                fontSize: 20,
-                lineHeight: '24px',
-            } },
-            "\u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435",
-            ' ',
-            React__default["default"].createElement("a", { href: "", onClick: () => window.location.reload() }, "\u043F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443"))));
+    return (jsxRuntime.jsxs("div", { children: [jsxRuntime.jsx("div", Object.assign({ style: {
+                    textAlign: 'center',
+                    marginBottom: 11,
+                    paddingTop: 26,
+                    fontSize: 30,
+                    lineHeight: '36px',
+                    fontWeight: 200,
+                } }, { children: "\u0412\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 :(" }), void 0),
+            jsxRuntime.jsxs("div", Object.assign({ style: {
+                    textAlign: 'center',
+                    marginBottom: 17,
+                    color: '#9299a2',
+                    fontSize: 20,
+                    lineHeight: '24px',
+                } }, { children: ["\u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435", ' ', jsxRuntime.jsx("a", Object.assign({ href: "", onClick: () => window.location.reload() }, { children: "\u043F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443" }), void 0)] }), void 0)] }, void 0));
 };
 FallbackError.displayName = 'FallbackError';
-/* eslint-enable jsx-a11y/anchor-is-valid */
 
-class UniversalErrorBoundary extends React.Component {
+class UniversalErrorBoundary extends react.Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -113,12 +107,12 @@ class UniversalErrorBoundary extends React.Component {
             return children;
         }
         if (Fallback) {
-            return React__default["default"].createElement(Fallback, { url: url, error: error });
+            return jsxRuntime.jsx(Fallback, { url: url, error: error }, void 0);
         }
         if (fallbackFromDi) {
             return fallbackFromDi;
         }
-        return React__default["default"].createElement(FallbackError, null);
+        return jsxRuntime.jsx(FallbackError, {}, void 0);
     }
 }
 UniversalErrorBoundary.displayName = 'UniversalErrorBoundary';
@@ -135,7 +129,7 @@ const ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN = dippy.createToken('errorBoundary
 /**
  * @deprecated Use UniversalErrorBoundary component
  */
-exports.ErrorBoundary = class ErrorBoundary extends React.Component {
+exports.ErrorBoundary = class ErrorBoundary extends react.Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -159,7 +153,7 @@ exports.ErrorBoundary = class ErrorBoundary extends React.Component {
         if (!hasError) {
             return children;
         }
-        return fallbackComponent || fallbackComponentFromDi || React__default["default"].createElement(FallbackError, null);
+        return fallbackComponent || fallbackComponentFromDi || jsxRuntime.jsx(FallbackError, {}, void 0);
     }
 };
 exports.ErrorBoundary.displayName = 'ErrorBoundary';
@@ -175,8 +169,7 @@ exports.ErrorBoundary = tslib.__decorate([
  */
 const withError = ({ fallbackComponent, } = {}) => (WrappedComponent) => {
     function WrapperWithError(props) {
-        return (React__default["default"].createElement(exports.ErrorBoundary, { fallbackComponent: fallbackComponent },
-            React__default["default"].createElement(WrappedComponent, Object.assign({}, props))));
+        return (jsxRuntime.jsx(exports.ErrorBoundary, Object.assign({ fallbackComponent: fallbackComponent }, { children: jsxRuntime.jsx(WrappedComponent, Object.assign({}, props), void 0) }), void 0));
     }
     return hoistStatics__default["default"](WrapperWithError, WrappedComponent);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/react",
-  "version": "1.85.0",
+  "version": "1.90.2",
   "description": "",
   "main": "lib/react.js",
   "typings": "lib/react.d.ts",
@@ -26,7 +26,7 @@
     "@tinkoff/dippy": "0.7.39",
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/url": "0.7.37",
-    "@tramvai/core": "1.85.0",
+    "@tramvai/core": "1.90.2",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
     "tslib": "^2.0.3"