fix(core): use Link from react-router-dom (#3342)

This commit is contained in:
Alex Yang
2023-07-21 18:29:36 +08:00
committed by GitHub
parent 869d98d019
commit f05cd66368
5 changed files with 34 additions and 30 deletions

View File

@@ -52,7 +52,7 @@ export const ReferencePage = ({
data-type="favorite-list-item"
data-testid={`favorite-list-item-${pageId}`}
active={active}
href={`/workspace/${workspace.id}/${pageId}`}
to={`/workspace/${workspace.id}/${pageId}`}
icon={icon}
collapsed={collapsible ? collapsed : undefined}
onCollapsedChange={setCollapsed}

View File

@@ -53,7 +53,7 @@ const RouteMenuLinkItem = React.forwardRef<
HTMLDivElement,
{
currentPath: string; // todo: pass through useRouter?
path?: string | null;
path: string;
icon: ReactElement;
children?: ReactElement;
isDraggedOver?: boolean;
@@ -66,7 +66,7 @@ const RouteMenuLinkItem = React.forwardRef<
ref={ref}
{...props}
active={active}
href={path ?? ''}
to={path ?? ''}
icon={icon}
>
{children}
@@ -169,7 +169,7 @@ export const RootAppSidebar = ({
<RouteMenuLinkItem
icon={<FolderIcon />}
currentPath={currentPath}
path={currentWorkspaceId && paths.all(currentWorkspaceId)}
path={paths.all(currentWorkspaceId)}
onClick={backToAll}
>
<span data-testid="all-pages">{t['All pages']()}</span>
@@ -198,7 +198,7 @@ export const RootAppSidebar = ({
isDraggedOver={trashDroppable.isOver}
icon={<DeleteTemporarilyIcon />}
currentPath={currentPath}
path={currentWorkspaceId && paths.trash(currentWorkspaceId)}
path={paths.trash(currentWorkspaceId)}
>
<span data-testid="trash-page">{t['Trash']()}</span>
</RouteMenuLinkItem>