fix: other links

taskany-inc · Mar 28, 2024 · 01cf8ef · 01cf8ef
1 parent 7986282
commit 01cf8ef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/src/components/GoalBadge.tsx b/src/components/GoalBadge.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link, nullable } from '@taskany/bricks';
+import { nullable } from '@taskany/bricks';
 
 import { Badge } from './Badge';
 import { NextLink } from './NextLink';
@@ -29,10 +29,10 @@ export const GoalBadge: React.FC<GoalBadgeProps> = ({
             icon={<StateDot view="stroke" hue={color} size="s" />}
             text={nullable(
                 href,
-                () => (
-                    <Link as={NextLink} href={href} inline onClick={onClick}>
+                (h) => (
+                    <NextLink href={h} view="inline" onClick={onClick}>
                         {title}
-                    </Link>
+                    </NextLink>
                 ),
                 title,
             )}

diff --git a/src/components/GoalTableList/GoalTableList.tsx b/src/components/GoalTableList/GoalTableList.tsx
@@ -1,6 +1,6 @@
 import { Badge, State, Table, Tag, Text, User, UserGroup } from '@taskany/bricks/harmony';
 import { MouseEventHandler, useCallback, useEffect, useMemo } from 'react';
-import { Link, ListViewItem, nullable } from '@taskany/bricks';
+import { ListViewItem, nullable } from '@taskany/bricks';
 import { IconMessageTextOutline } from '@taskany/icons';
 
 import { TableListItem, TableListItemElement } from '../TableListItem/TableListItem';
@@ -161,12 +161,11 @@ export const GoalTableList = <T extends Partial<NonNullable<GoalByIdReturnType>>
     return (
         <Table {...attrs}>
             {data.map((row) => (
-                <Link
+                <NextLink
                     key={row.goal.id}
-                    as={NextLink}
                     href={routes.goal(row.goal?._shortId as string)}
                     onClick={onGoalPreviewShow(row.goal)}
-                    inline
+                    view="inline"
                 >
                     <ListViewItem
                         value={row.goal}
@@ -184,7 +183,7 @@ export const GoalTableList = <T extends Partial<NonNullable<GoalByIdReturnType>>
                             </TableListItem>
                         )}
                     />
-                </Link>
+                </NextLink>
             ))}
         </Table>
     );

diff --git a/src/components/ProjectBadge.tsx b/src/components/ProjectBadge.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { IconUsersOutline } from '@taskany/icons';
-import { Link } from '@taskany/bricks';
 
 import { routes } from '../hooks/router';
 
@@ -20,9 +19,9 @@ export const ProjectBadge: React.FC<ProjectBadgeProps> = ({ id, title, children,
             className={className}
             icon={<IconUsersOutline size="s" />}
             text={
-                <Link as={NextLink} href={routes.project(id)} inline>
+                <NextLink href={routes.project(id)} view="inline">
                     {title}
-                </Link>
+                </NextLink>
             }
             action={children}
         />