@tinkoff/router 0.2.3 → 0.2.5

package/README.md

@@ -273,29 +273,6 @@ export const Cmp = () => {
 };
 ```
 
-#### Link
-
-A wrapper for a react component that makes it clickable
-
-> If the react component is passed to the Link as children, then this passed component will be rendered and the `href`, `onClick` props will be passed as props to that component and they should be used to make the navigation. Otherwise, the `<a>` tag will be rendered with children as a child.
-
-```ts
-import { Link } from '@tinkoff/router';
-import CustomLink from '@custom-scope/link';
-
-export const Component = () => {
-  return (
-    <Link url="/test/">
-      <CustomLink />
-    </Link>
-  );
-};
-
-export const WrapLink = () => {
-  return <Link url="/test/">Click me</Link>;
-};
-```
-
 ## How to
 
 ### Load route config from external api

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

@@ -3,4 +3,3 @@ export { useRouter } from './useRouter';
 export { useRoute } from './useRoute';
 export { useUrl } from './useUrl';
 export { useNavigate } from './useNavigate';
-export { Link } from './link';

package/lib/history/base.d.ts

@@ -1,6 +1,6 @@
 import type { Navigation, HistoryOptions, NavigationType } from '../types';
 import type { RouteTree } from '../tree/tree';
-export declare type Listener = (arg: {
+export type Listener = (arg: {
     url: string;
     type?: NavigationType;
     navigateState?: any;

package/lib/index.browser.js

@@ -9,7 +9,7 @@ import find from '@tinkoff/utils/array/find';
 import findIndex from '@tinkoff/utils/array/findIndex';
 import { jsx } from 'react/jsx-runtime';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
-import { createContext, useContext, useCallback, isValidElement, cloneElement } from 'react';
+import { createContext, useContext, useCallback } from 'react';
 import { useShallowEqual } from '@tinkoff/react-hooks';
 
 const PARAMETER_DELIMITER = ':';
@@ -1166,32 +1166,4 @@ const useNavigate = (rootOptions) => {
     }, [rootOpts, router]);
 };
 
-function Link(props) {
-    const { children, onClick, url, query, replace, target, navigateOptions, ...otherProps } = props;
-    const navigate = useNavigate({ url, query, replace, ...navigateOptions });
-    const handleClick = 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 ||
-            event.ctrlKey ||
-            event.metaKey ||
-            event.altKey ||
-            event.shiftKey ||
-            event.button !== 0) {
-            return;
-        }
-        event.preventDefault();
-        navigate();
-        onClick && onClick(event);
-    }, [navigate, target, onClick]);
-    const extraProps = { href: url, onClick: handleClick, target };
-    if (isValidElement(children)) {
-        return cloneElement(children, extraProps);
-    }
-    return (
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    jsx("a", { ...otherProps, ...extraProps, children: children }));
-}
-Link.displayName = 'Link';
-
-export { AbstractRouter, History, Link, NoSpaRouter, Provider, RouteTree, Router, getParts, isHistoryFallback, isParameterized, isWildcard, logger, makePath, parse, setLogger, useNavigate, useRoute, useRouter, useUrl };
+export { AbstractRouter, History, NoSpaRouter, Provider, RouteTree, Router, getParts, isHistoryFallback, isParameterized, isWildcard, logger, makePath, parse, setLogger, useNavigate, useRoute, useRouter, useUrl };

package/lib/index.es.js

@@ -9,7 +9,7 @@ import find from '@tinkoff/utils/array/find';
 import findIndex from '@tinkoff/utils/array/findIndex';
 import { jsx } from 'react/jsx-runtime';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
-import { createContext, useContext, useCallback, isValidElement, cloneElement } from 'react';
+import { createContext, useContext, useCallback } from 'react';
 import { useShallowEqual } from '@tinkoff/react-hooks';
 
 const PARAMETER_DELIMITER = ':';
@@ -1094,32 +1094,4 @@ const useNavigate = (rootOptions) => {
     }, [rootOpts, router]);
 };
 
-function Link(props) {
-    const { children, onClick, url, query, replace, target, navigateOptions, ...otherProps } = props;
-    const navigate = useNavigate({ url, query, replace, ...navigateOptions });
-    const handleClick = 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 ||
-            event.ctrlKey ||
-            event.metaKey ||
-            event.altKey ||
-            event.shiftKey ||
-            event.button !== 0) {
-            return;
-        }
-        event.preventDefault();
-        navigate();
-        onClick && onClick(event);
-    }, [navigate, target, onClick]);
-    const extraProps = { href: url, onClick: handleClick, target };
-    if (isValidElement(children)) {
-        return cloneElement(children, extraProps);
-    }
-    return (
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    jsx("a", { ...otherProps, ...extraProps, children: children }));
-}
-Link.displayName = 'Link';
-
-export { AbstractRouter, History, Link, NoSpaRouter, Provider, RouteTree, Router, getParts, isHistoryFallback, isParameterized, isWildcard, logger, makePath, parse, setLogger, useNavigate, useRoute, useRouter, useUrl };
+export { AbstractRouter, History, NoSpaRouter, Provider, RouteTree, Router, getParts, isHistoryFallback, isParameterized, isWildcard, logger, makePath, parse, setLogger, useNavigate, useRoute, useRouter, useUrl };

package/lib/index.js

@@ -1109,37 +1109,8 @@ const useNavigate = (rootOptions) => {
     }, [rootOpts, router]);
 };
 
-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) => {
-        // ignores the navigation when clicked using right mouse button or
-        // by holding a special modifier key: ctrl, command, win, alt, shift
-        if (target ||
-            event.ctrlKey ||
-            event.metaKey ||
-            event.altKey ||
-            event.shiftKey ||
-            event.button !== 0) {
-            return;
-        }
-        event.preventDefault();
-        navigate();
-        onClick && onClick(event);
-    }, [navigate, target, onClick]);
-    const extraProps = { href: url, onClick: handleClick, target };
-    if (react.isValidElement(children)) {
-        return react.cloneElement(children, extraProps);
-    }
-    return (
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    jsxRuntime.jsx("a", { ...otherProps, ...extraProps, children: children }));
-}
-Link.displayName = 'Link';
-
 exports.AbstractRouter = AbstractRouter;
 exports.History = History;
-exports.Link = Link;
 exports.NoSpaRouter = NoSpaRouter;
 exports.Provider = Provider;
 exports.RouteTree = RouteTree;

package/lib/logger.d.ts

@@ -1,4 +1,4 @@
-export declare type LogFn = (data: {
+export type LogFn = (data: {
     event: string;
     [key: string]: any;
 }) => void;

package/lib/tree/types.d.ts

@@ -10,7 +10,7 @@ export interface Parameter {
     regexp?: RegExp;
     optional?: boolean;
 }
-export declare type ParsedPath = {
+export type ParsedPath = {
     type: PartType.literal;
     value: string;
 } | {

package/lib/types.d.ts

@@ -1,5 +1,5 @@
 import type { Url, Query } from '@tinkoff/url';
-export declare type Params = Record<string, string>;
+export type Params = Record<string, string>;
 export interface Route {
     name: string;
     path: string;
@@ -24,11 +24,11 @@ export interface BaseNavigateOptions {
 export interface NavigateOptions extends BaseNavigateOptions {
     url?: string;
 }
-export declare type UpdateCurrentRouteOptions = BaseNavigateOptions;
+export type UpdateCurrentRouteOptions = BaseNavigateOptions;
 export interface HistoryOptions {
     historyFallback: string;
 }
-export declare type NavigationType = 'navigate' | 'updateCurrentRoute';
+export type NavigationType = 'navigate' | 'updateCurrentRoute';
 export interface Navigation {
     type: NavigationType;
     from?: NavigationRoute;
@@ -43,8 +43,8 @@ export interface Navigation {
     redirect?: boolean;
     redirectFrom?: NavigationRoute;
 }
-export declare type NavigationGuard = (navigation: Navigation) => Promise<void | NavigateOptions | string | boolean>;
-export declare type NavigationHook = (navigation: Navigation) => Promise<void>;
-export declare type NavigationSyncHook = (navigation: Navigation) => void;
-export declare type HookName = 'beforeResolve' | 'beforeNavigate' | 'afterNavigate' | 'beforeUpdateCurrent' | 'afterUpdateCurrent';
-export declare type SyncHookName = 'change';
+export type NavigationGuard = (navigation: Navigation) => Promise<void | NavigateOptions | string | boolean>;
+export type NavigationHook = (navigation: Navigation) => Promise<void>;
+export type NavigationSyncHook = (navigation: Navigation) => void;
+export type HookName = 'beforeResolve' | 'beforeNavigate' | 'afterNavigate' | 'beforeUpdateCurrent' | 'afterUpdateCurrent';
+export type SyncHookName = 'change';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/router",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "router",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -22,8 +22,8 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/react-hooks": "0.1.3",
-    "@tinkoff/url": "0.8.3",
+    "@tinkoff/react-hooks": "0.1.4",
+    "@tinkoff/url": "0.8.4",
     "@tinkoff/utils": "^2.1.2",
     "use-sync-external-store": "^1.2.0"
   },

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

@@ -1,14 +0,0 @@
-interface Props {
-    children?: any;
-    url: string;
-    query?: Record<string, string>;
-    replace?: boolean;
-    target?: string;
-    onClick?: Function;
-    navigateOptions?: Record<string, any>;
-}
-declare function Link(props: Props): JSX.Element;
-declare namespace Link {
-    var displayName: string;
-}
-export { Link };