@tinkoff/router 0.2.15 → 0.2.17

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 (5) hide show
  1. package/lib/components/react/provider.browser.js +6 -2
  2. package/lib/components/react/provider.es.js +6 -2
  3. package/lib/components/react/provider.js +6 -2
  4. package/lib/router/server.d.ts +0 -1
  5. package/package.json +1 -1
package/lib/components/react/provider.browser.js CHANGED
@@ -1,10 +1,14 @@
1
1
  import { jsx } from 'react/jsx-runtime';
2
+ import { useMemo } from 'react';
2
3
  import { useSyncExternalStore } from 'use-sync-external-store/shim';
3
4
  import { RouterContext, RouteContext, UrlContext } from './context.browser.js';
4
5
 
5
6
  const Provider = ({ router, serverState, children }) => {
6
- const route = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastRoute(), serverState ? () => serverState.currentRoute : () => router.getLastRoute());
7
- const url = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastUrl(), serverState ? () => serverState.currentUrl : () => router.getLastUrl());
7
+ // fallback to outdate router implementation
8
+ const lastRoute = useMemo(() => router.getCurrentRoute(), [router]);
9
+ const lastUrl = useMemo(() => router.getCurrentUrl(), [router]);
10
+ const route = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; }, serverState ? () => serverState.currentRoute : () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; });
11
+ const url = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; }, serverState ? () => serverState.currentUrl : () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; });
8
12
  return (jsx(RouterContext.Provider, { value: router, children: jsx(RouteContext.Provider, { value: route, children: jsx(UrlContext.Provider, { value: url, children: children }) }) }));
9
13
  };
10
14
  Provider.displayName = 'TinkoffRouterProvider';
package/lib/components/react/provider.es.js CHANGED
@@ -1,10 +1,14 @@
1
1
  import { jsx } from 'react/jsx-runtime';
2
+ import { useMemo } from 'react';
2
3
  import { useSyncExternalStore } from 'use-sync-external-store/shim';
3
4
  import { RouterContext, RouteContext, UrlContext } from './context.es.js';
4
5
 
5
6
  const Provider = ({ router, serverState, children }) => {
6
- const route = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastRoute(), serverState ? () => serverState.currentRoute : () => router.getLastRoute());
7
- const url = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastUrl(), serverState ? () => serverState.currentUrl : () => router.getLastUrl());
7
+ // fallback to outdate router implementation
8
+ const lastRoute = useMemo(() => router.getCurrentRoute(), [router]);
9
+ const lastUrl = useMemo(() => router.getCurrentUrl(), [router]);
10
+ const route = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; }, serverState ? () => serverState.currentRoute : () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; });
11
+ const url = useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; }, serverState ? () => serverState.currentUrl : () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; });
8
12
  return (jsx(RouterContext.Provider, { value: router, children: jsx(RouteContext.Provider, { value: route, children: jsx(UrlContext.Provider, { value: url, children: children }) }) }));
9
13
  };
10
14
  Provider.displayName = 'TinkoffRouterProvider';
package/lib/components/react/provider.js CHANGED
@@ -3,12 +3,16 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var jsxRuntime = require('react/jsx-runtime');
6
+ var react = require('react');
6
7
  var shim = require('use-sync-external-store/shim');
7
8
  var context = require('./context.js');
8
9
 
9
10
  const Provider = ({ router, serverState, children }) => {
10
- const route = shim.useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastRoute(), serverState ? () => serverState.currentRoute : () => router.getLastRoute());
11
- const url = shim.useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => router.getLastUrl(), serverState ? () => serverState.currentUrl : () => router.getLastUrl());
11
+ // fallback to outdate router implementation
12
+ const lastRoute = react.useMemo(() => router.getCurrentRoute(), [router]);
13
+ const lastUrl = react.useMemo(() => router.getCurrentUrl(), [router]);
14
+ const route = shim.useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; }, serverState ? () => serverState.currentRoute : () => { var _a, _b; return (_b = (_a = router.getLastRoute) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastRoute; });
15
+ const url = shim.useSyncExternalStore((cb) => router.registerSyncHook('change', cb), () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; }, serverState ? () => serverState.currentUrl : () => { var _a, _b; return (_b = (_a = router.getLastUrl) === null || _a === void 0 ? void 0 : _a.call(router)) !== null && _b !== void 0 ? _b : lastUrl; });
12
16
  return (jsxRuntime.jsx(context.RouterContext.Provider, { value: router, children: jsxRuntime.jsx(context.RouteContext.Provider, { value: route, children: jsxRuntime.jsx(context.UrlContext.Provider, { value: url, children: children }) }) }));
13
17
  };
14
18
  Provider.displayName = 'TinkoffRouterProvider';
package/lib/router/server.d.ts CHANGED
@@ -6,7 +6,6 @@ export declare class Router extends AbstractRouter {
6
6
  protected blocked: boolean;
7
7
  protected redirectCode?: number;
8
8
  constructor(options: Options);
9
- protected onRedirect: (navigation: Navigation) => Promise<void>;
10
9
  dehydrate(): Promise<Navigation>;
11
10
  protected internalNavigate(navigateOptions: NavigateOptions, internalOptions: any): Promise<void>;
12
11
  protected run(navigation: Navigation): Promise<void>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tinkoff/router",
3
- "version": "0.2.15",
3
+ "version": "0.2.17",
4
4
  "description": "router",
5
5
  "main": "lib/index.js",
6
6
  "typings": "lib/index.d.ts",