@tramvai/react 2.24.3 → 2.26.0

package/lib/error/hoc.d.ts

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

package/lib/lazy/lazy.d.ts

@@ -1,6 +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>;
+export declare const resolveLazyComponent: (componentOrLoader?: TramvaiComponentDecl) => Promise<TramvaiComponent | undefined>;
 interface Options {
     loading?: JSX.Element;
 }

package/lib/react.es.js

@@ -40,27 +40,26 @@ const withDi = (deps) => (WrappedComponent) => {
     function WrapperWithPropsFromDi(props) {
         const depsInstance = useDi(deps);
         // eslint-disable-next-line react/jsx-props-no-spreading
-        return jsx(WrappedComponent, Object.assign({}, props, depsInstance), void 0);
+        return jsx(WrappedComponent, { ...props, ...depsInstance });
     }
     return hoistStatics(WrapperWithPropsFromDi, WrappedComponent);
 };
 
 const FallbackError = () => {
-    return (jsxs("div", { children: [jsx("div", Object.assign({ style: {
+    return (jsxs("div", { children: [jsx("div", { style: {
                     textAlign: 'center',
                     marginBottom: 11,
                     paddingTop: 26,
                     fontSize: 30,
                     lineHeight: '36px',
                     fontWeight: 200,
-                } }, { children: "An error occurred :(" }), void 0),
-            jsxs("div", Object.assign({ style: {
+                }, children: "An error occurred :(" }), jsxs("div", { style: {
                     textAlign: 'center',
                     marginBottom: 17,
                     color: '#9299a2',
                     fontSize: 20,
                     lineHeight: '24px',
-                } }, { children: ["Try", ' ', jsx("a", Object.assign({ href: "", onClick: () => window.location.reload() }, { children: "reloading the page" }), void 0)] }), void 0)] }, void 0));
+                }, children: ["Try", ' ', jsx("a", { href: "", onClick: () => window.location.reload(), children: "reloading the page" })] })] }));
 };
 FallbackError.displayName = 'FallbackError';
 
@@ -97,12 +96,12 @@ class UniversalErrorBoundary extends Component {
             return children;
         }
         if (Fallback) {
-            return jsx(Fallback, { url: url, error: error }, void 0);
+            return jsx(Fallback, { url: url, error: error });
         }
         if (fallbackFromDi) {
             return fallbackFromDi;
         }
-        return jsx(FallbackError, {}, void 0);
+        return jsx(FallbackError, {});
     }
 }
 UniversalErrorBoundary.displayName = 'UniversalErrorBoundary';
@@ -143,7 +142,7 @@ let ErrorBoundary = class ErrorBoundary extends Component {
         if (!hasError) {
             return children;
         }
-        return fallbackComponent || fallbackComponentFromDi || jsx(FallbackError, {}, void 0);
+        return fallbackComponent || fallbackComponentFromDi || jsx(FallbackError, {});
     }
 };
 ErrorBoundary.displayName = 'ErrorBoundary';
@@ -157,9 +156,9 @@ ErrorBoundary = __decorate([
 /**
  * @deprecated Use UniversalErrorBoundary component
  */
-const withError = ({ fallbackComponent, } = {}) => (WrappedComponent) => {
+const withError = ({ fallbackComponent } = {}) => (WrappedComponent) => {
     function WrapperWithError(props) {
-        return (jsx(ErrorBoundary, Object.assign({ fallbackComponent: fallbackComponent }, { children: jsx(WrappedComponent, Object.assign({}, props), void 0) }), void 0));
+        return (jsx(ErrorBoundary, { fallbackComponent: fallbackComponent, children: jsx(WrappedComponent, { ...props }) }));
     }
     return hoistStatics(WrapperWithError, WrappedComponent);
 };

package/lib/react.js

@@ -50,27 +50,26 @@ const withDi = (deps) => (WrappedComponent) => {
     function WrapperWithPropsFromDi(props) {
         const depsInstance = useDi(deps);
         // eslint-disable-next-line react/jsx-props-no-spreading
-        return jsxRuntime.jsx(WrappedComponent, Object.assign({}, props, depsInstance), void 0);
+        return jsxRuntime.jsx(WrappedComponent, { ...props, ...depsInstance });
     }
     return hoistStatics__default["default"](WrapperWithPropsFromDi, WrappedComponent);
 };
 
 const FallbackError = () => {
-    return (jsxRuntime.jsxs("div", { children: [jsxRuntime.jsx("div", Object.assign({ style: {
+    return (jsxRuntime.jsxs("div", { children: [jsxRuntime.jsx("div", { style: {
                     textAlign: 'center',
                     marginBottom: 11,
                     paddingTop: 26,
                     fontSize: 30,
                     lineHeight: '36px',
                     fontWeight: 200,
-                } }, { children: "An error occurred :(" }), void 0),
-            jsxRuntime.jsxs("div", Object.assign({ style: {
+                }, children: "An error occurred :(" }), jsxRuntime.jsxs("div", { style: {
                     textAlign: 'center',
                     marginBottom: 17,
                     color: '#9299a2',
                     fontSize: 20,
                     lineHeight: '24px',
-                } }, { children: ["Try", ' ', jsxRuntime.jsx("a", Object.assign({ href: "", onClick: () => window.location.reload() }, { children: "reloading the page" }), void 0)] }), void 0)] }, void 0));
+                }, children: ["Try", ' ', jsxRuntime.jsx("a", { href: "", onClick: () => window.location.reload(), children: "reloading the page" })] })] }));
 };
 FallbackError.displayName = 'FallbackError';
 
@@ -107,12 +106,12 @@ class UniversalErrorBoundary extends react.Component {
             return children;
         }
         if (Fallback) {
-            return jsxRuntime.jsx(Fallback, { url: url, error: error }, void 0);
+            return jsxRuntime.jsx(Fallback, { url: url, error: error });
         }
         if (fallbackFromDi) {
             return fallbackFromDi;
         }
-        return jsxRuntime.jsx(FallbackError, {}, void 0);
+        return jsxRuntime.jsx(FallbackError, {});
     }
 }
 UniversalErrorBoundary.displayName = 'UniversalErrorBoundary';
@@ -153,7 +152,7 @@ exports.ErrorBoundary = class ErrorBoundary extends react.Component {
         if (!hasError) {
             return children;
         }
-        return fallbackComponent || fallbackComponentFromDi || jsxRuntime.jsx(FallbackError, {}, void 0);
+        return fallbackComponent || fallbackComponentFromDi || jsxRuntime.jsx(FallbackError, {});
     }
 };
 exports.ErrorBoundary.displayName = 'ErrorBoundary';
@@ -167,9 +166,9 @@ exports.ErrorBoundary = tslib.__decorate([
 /**
  * @deprecated Use UniversalErrorBoundary component
  */
-const withError = ({ fallbackComponent, } = {}) => (WrappedComponent) => {
+const withError = ({ fallbackComponent } = {}) => (WrappedComponent) => {
     function WrapperWithError(props) {
-        return (jsxRuntime.jsx(exports.ErrorBoundary, Object.assign({ fallbackComponent: fallbackComponent }, { children: jsxRuntime.jsx(WrappedComponent, Object.assign({}, props), void 0) }), void 0));
+        return (jsxRuntime.jsx(exports.ErrorBoundary, { fallbackComponent: fallbackComponent, children: jsxRuntime.jsx(WrappedComponent, { ...props }) }));
     }
     return hoistStatics__default["default"](WrapperWithError, WrappedComponent);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/react",
-  "version": "2.24.3",
+  "version": "2.26.0",
   "description": "",
   "main": "lib/react.js",
   "typings": "lib/react.d.ts",
@@ -20,16 +20,16 @@
   "dependencies": {
     "@loadable/component": "^5.15.2",
     "@types/loadable__component": "^5.13.4",
-    "@tramvai/types-actions-state-context": "2.24.3",
+    "@tramvai/types-actions-state-context": "2.26.0",
     "hoist-non-react-statics": "^3.3.0"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.8.3",
+    "@tinkoff/dippy": "0.8.5",
     "@tinkoff/utils": "^2.1.2",
-    "@tinkoff/url": "0.8.2",
+    "@tinkoff/url": "0.8.3",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
-    "tslib": "^2.0.3"
+    "tslib": "^2.4.0"
   },
   "module": "lib/react.es.js",
   "license": "Apache-2.0"