@tinkoff/router 0.1.70 → 0.1.73

package/lib/components/react/provider.d.ts

@@ -2,4 +2,5 @@ import React from 'react';
 import type { AbstractRouter } from '../../router/abstract';
 export declare const Provider: React.FunctionComponent<{
     router: AbstractRouter;
+    children?: React.ReactNode;
 }>;

package/lib/index.browser.js

@@ -7,8 +7,9 @@ import noop from '@tinkoff/utils/function/noop';
 import each from '@tinkoff/utils/array/each';
 import find from '@tinkoff/utils/array/find';
 import findIndex from '@tinkoff/utils/array/findIndex';
-import React, { createContext, useState, useEffect, useContext, useCallback, isValidElement, cloneElement } from 'react';
-import { useShallowEqual } from '@tinkoff/react-hooks';
+import { jsx } from 'react/jsx-runtime';
+import { createContext, useState, useContext, useCallback, isValidElement, cloneElement } from 'react';
+import { useIsomorphicLayoutEffect, useShallowEqual } from '@tinkoff/react-hooks';
 
 const PARAMETER_DELIMITER = ':';
 const WILDCARD_REGEXP = /\*/;
@@ -764,13 +765,19 @@ class ClientRouter extends AbstractRouter {
         return super.resolveRoute(...options);
     }
     async notfound(navigation) {
+        var _a, _b;
         await super.notfound(navigation);
         // in case we didn't find any matched route just force hard page navigation
-        if (navigation.replace) {
-            window.location.replace(navigation.url.href);
-        }
-        else {
-            window.location.assign(navigation.url.href);
+        const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
+        const nextUrl = navigation.url.href;
+        // prevent redirect cycle on the same page
+        if (prevUrl !== nextUrl) {
+            if (navigation.replace) {
+                window.location.replace(nextUrl);
+            }
+            else {
+                window.location.assign(nextUrl);
+            }
         }
         // prevent routing from any continues navigation returning promise which will be not resolved
         return new Promise(() => { });
@@ -1104,19 +1111,17 @@ const RouterContext = createContext(null);
 const RouteContext = createContext(null);
 const UrlContext = createContext(null);
 
-const Provider = ({ router, children, }) => {
+const Provider = ({ router, children }) => {
     const [state, setState] = useState({
         route: router.getCurrentRoute(),
         url: router.getCurrentUrl(),
     });
-    useEffect(() => {
+    useIsomorphicLayoutEffect(() => {
         return router.registerSyncHook('change', ({ to, url }) => {
             setState({ route: to, url });
         });
     }, [router]);
-    return (React.createElement(RouterContext.Provider, { value: router },
-        React.createElement(RouteContext.Provider, { value: state.route },
-            React.createElement(UrlContext.Provider, { value: state.url }, children))));
+    return (jsx(RouterContext.Provider, Object.assign({ value: router }, { children: jsx(RouteContext.Provider, Object.assign({ value: state.route }, { children: jsx(UrlContext.Provider, Object.assign({ value: state.url }, { children: children }), void 0) }), void 0) }), void 0));
 };
 Provider.displayName = 'Provider';
 
@@ -1168,7 +1173,7 @@ function Link(props) {
     }
     return (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    React.createElement("a", Object.assign({}, otherProps, extraProps), children));
+    jsx("a", Object.assign({}, otherProps, extraProps, { children: children }), void 0));
 }
 Link.displayName = 'Link';
 

package/lib/index.es.js

@@ -7,8 +7,9 @@ import noop from '@tinkoff/utils/function/noop';
 import each from '@tinkoff/utils/array/each';
 import find from '@tinkoff/utils/array/find';
 import findIndex from '@tinkoff/utils/array/findIndex';
-import React, { createContext, useState, useEffect, useContext, useCallback, isValidElement, cloneElement } from 'react';
-import { useShallowEqual } from '@tinkoff/react-hooks';
+import { jsx } from 'react/jsx-runtime';
+import { createContext, useState, useContext, useCallback, isValidElement, cloneElement } from 'react';
+import { useIsomorphicLayoutEffect, useShallowEqual } from '@tinkoff/react-hooks';
 
 const PARAMETER_DELIMITER = ':';
 const WILDCARD_REGEXP = /\*/;
@@ -994,13 +995,19 @@ class ClientRouter extends AbstractRouter {
         return super.resolveRoute(...options);
     }
     async notfound(navigation) {
+        var _a, _b;
         await super.notfound(navigation);
         // in case we didn't find any matched route just force hard page navigation
-        if (navigation.replace) {
-            window.location.replace(navigation.url.href);
-        }
-        else {
-            window.location.assign(navigation.url.href);
+        const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
+        const nextUrl = navigation.url.href;
+        // prevent redirect cycle on the same page
+        if (prevUrl !== nextUrl) {
+            if (navigation.replace) {
+                window.location.replace(nextUrl);
+            }
+            else {
+                window.location.assign(nextUrl);
+            }
         }
         // prevent routing from any continues navigation returning promise which will be not resolved
         return new Promise(() => { });
@@ -1032,19 +1039,17 @@ const RouterContext = createContext(null);
 const RouteContext = createContext(null);
 const UrlContext = createContext(null);
 
-const Provider = ({ router, children, }) => {
+const Provider = ({ router, children }) => {
     const [state, setState] = useState({
         route: router.getCurrentRoute(),
         url: router.getCurrentUrl(),
     });
-    useEffect(() => {
+    useIsomorphicLayoutEffect(() => {
         return router.registerSyncHook('change', ({ to, url }) => {
             setState({ route: to, url });
         });
     }, [router]);
-    return (React.createElement(RouterContext.Provider, { value: router },
-        React.createElement(RouteContext.Provider, { value: state.route },
-            React.createElement(UrlContext.Provider, { value: state.url }, children))));
+    return (jsx(RouterContext.Provider, Object.assign({ value: router }, { children: jsx(RouteContext.Provider, Object.assign({ value: state.route }, { children: jsx(UrlContext.Provider, Object.assign({ value: state.url }, { children: children }), void 0) }), void 0) }), void 0));
 };
 Provider.displayName = 'Provider';
 
@@ -1096,7 +1101,7 @@ function Link(props) {
     }
     return (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    React.createElement("a", Object.assign({}, otherProps, extraProps), children));
+    jsx("a", Object.assign({}, otherProps, extraProps, { children: children }), void 0));
 }
 Link.displayName = 'Link';
 

package/lib/index.js

@@ -11,7 +11,8 @@ var noop = require('@tinkoff/utils/function/noop');
 var each = require('@tinkoff/utils/array/each');
 var find = require('@tinkoff/utils/array/find');
 var findIndex = require('@tinkoff/utils/array/findIndex');
-var React = require('react');
+var jsxRuntime = require('react/jsx-runtime');
+var react = require('react');
 var reactHooks = require('@tinkoff/react-hooks');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -24,7 +25,6 @@ var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
 var each__default = /*#__PURE__*/_interopDefaultLegacy(each);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 var findIndex__default = /*#__PURE__*/_interopDefaultLegacy(findIndex);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 const PARAMETER_DELIMITER = ':';
 const WILDCARD_REGEXP = /\*/;
@@ -1010,13 +1010,19 @@ class ClientRouter extends AbstractRouter {
         return super.resolveRoute(...options);
     }
     async notfound(navigation) {
+        var _a, _b;
         await super.notfound(navigation);
         // in case we didn't find any matched route just force hard page navigation
-        if (navigation.replace) {
-            window.location.replace(navigation.url.href);
-        }
-        else {
-            window.location.assign(navigation.url.href);
+        const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
+        const nextUrl = navigation.url.href;
+        // prevent redirect cycle on the same page
+        if (prevUrl !== nextUrl) {
+            if (navigation.replace) {
+                window.location.replace(nextUrl);
+            }
+            else {
+                window.location.assign(nextUrl);
+            }
         }
         // prevent routing from any continues navigation returning promise which will be not resolved
         return new Promise(() => { });
@@ -1044,36 +1050,34 @@ class NoSpaRouter extends ClientRouter {
     async runHooks() { }
 }
 
-const RouterContext = React.createContext(null);
-const RouteContext = React.createContext(null);
-const UrlContext = React.createContext(null);
+const RouterContext = react.createContext(null);
+const RouteContext = react.createContext(null);
+const UrlContext = react.createContext(null);
 
-const Provider = ({ router, children, }) => {
-    const [state, setState] = React.useState({
+const Provider = ({ router, children }) => {
+    const [state, setState] = react.useState({
         route: router.getCurrentRoute(),
         url: router.getCurrentUrl(),
     });
-    React.useEffect(() => {
+    reactHooks.useIsomorphicLayoutEffect(() => {
         return router.registerSyncHook('change', ({ to, url }) => {
             setState({ route: to, url });
         });
     }, [router]);
-    return (React__default["default"].createElement(RouterContext.Provider, { value: router },
-        React__default["default"].createElement(RouteContext.Provider, { value: state.route },
-            React__default["default"].createElement(UrlContext.Provider, { value: state.url }, children))));
+    return (jsxRuntime.jsx(RouterContext.Provider, Object.assign({ value: router }, { children: jsxRuntime.jsx(RouteContext.Provider, Object.assign({ value: state.route }, { children: jsxRuntime.jsx(UrlContext.Provider, Object.assign({ value: state.url }, { children: children }), void 0) }), void 0) }), void 0));
 };
 Provider.displayName = 'Provider';
 
 const useRouter = () => {
-    return React.useContext(RouterContext);
+    return react.useContext(RouterContext);
 };
 
 const useRoute = () => {
-    return React.useContext(RouteContext);
+    return react.useContext(RouteContext);
 };
 
 const useUrl = () => {
-    return React.useContext(UrlContext);
+    return react.useContext(UrlContext);
 };
 
 const convertToNavigateOptions = (options) => {
@@ -1082,7 +1086,7 @@ const convertToNavigateOptions = (options) => {
 const useNavigate = (rootOptions) => {
     const router = useRouter();
     const rootOpts = reactHooks.useShallowEqual(convertToNavigateOptions(rootOptions));
-    return React.useCallback((specificOptions) => {
+    return react.useCallback((specificOptions) => {
         const opts = rootOpts !== null && rootOpts !== void 0 ? rootOpts : convertToNavigateOptions(specificOptions);
         return router.navigate(opts);
     }, [rootOpts, router]);
@@ -1091,7 +1095,7 @@ const useNavigate = (rootOptions) => {
 function Link(props) {
     const { children, onClick, url, query, replace, target, navigateOptions, ...otherProps } = props;
     const navigate = useNavigate({ url, query, replace, ...navigateOptions });
-    const handleClick = React.useCallback((event) => {
+    const handleClick = react.useCallback((event) => {
         // ignores the navigation when clicked using right mouse button or
         // by holding a special modifier key: ctrl, command, win, alt, shift
         if (target ||
@@ -1107,12 +1111,12 @@ function Link(props) {
         onClick && onClick(event);
     }, [navigate, target, onClick]);
     const extraProps = { href: url, onClick: handleClick, target };
-    if (React.isValidElement(children)) {
-        return React.cloneElement(children, extraProps);
+    if (react.isValidElement(children)) {
+        return react.cloneElement(children, extraProps);
     }
     return (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    React__default["default"].createElement("a", Object.assign({}, otherProps, extraProps), children));
+    jsxRuntime.jsx("a", Object.assign({}, otherProps, extraProps, { children: children }), void 0));
 }
 Link.displayName = 'Link';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/router",
-  "version": "0.1.70",
+  "version": "0.1.73",
   "description": "router",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -22,7 +22,7 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/react-hooks": "0.0.23",
+    "@tinkoff/react-hooks": "0.0.24",
     "@tinkoff/url": "0.7.37",
     "@tinkoff/utils": "^2.1.2"
   },