Skip to content

fix(web): use Link for Go to Definition to allow opening in new tab (#793) #799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jruttan1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(web): use Link for Go to Definition to allow opening in new tab (#793) #799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 51 additions & 14 deletions packages/web/src/ee/features/codeNav/components/symbolHoverPopup/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useBrowseNavigation } from "@/app/[domain]/browse/hooks/useBrowseNavigation";
import { KeyboardShortcutHint } from "@/app/components/keyboardShortcutHint";
import { useToast } from "@/components/hooks/use-toast";
import { Button } from "@/components/ui/button";
import { Button, buttonVariants } from "@/components/ui/button";
import { LoadingButton } from "@/components/ui/loading-button";
import { Separator } from "@/components/ui/separator";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
Expand All @@ -15,6 +15,9 @@ import { createPortal } from "react-dom";
import { useHotkeys } from "react-hotkeys-hook";
import { SymbolDefinitionPreview } from "./symbolDefinitionPreview";
import { useHoveredOverSymbolInfo } from "./useHoveredOverSymbolInfo";
import { useDomain } from "@/hooks/useDomain";
import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
import Link from "next/link";

interface SymbolHoverPopupProps {
editorRef: ReactCodeMirrorRef;
Expand Down Expand Up @@ -106,6 +109,24 @@ export const SymbolHoverPopup: React.FC<SymbolHoverPopupProps> = ({
return symbolInfo.symbolDefinitions[0];
}, [fileName, repoName, symbolInfo?.symbolDefinitions]);

// Logic to generate the definition link
const domain = useDomain();

const definitionHref = useMemo(() => {
if (!previewedSymbolDefinition || (symbolInfo?.symbolDefinitions?.length ?? 0) > 1) {
return undefined;
}
const { fileName, repoName, revisionName, range } = previewedSymbolDefinition;
return getBrowsePath({
repoName,
revisionName,
path: fileName,
pathType: 'blob',
highlightRange: range,
domain,
});
}, [previewedSymbolDefinition, symbolInfo?.symbolDefinitions, domain]);

const onGotoDefinition = useCallback(() => {
if (
!symbolInfo ||
Expand Down Expand Up @@ -269,19 +290,35 @@ export const SymbolHoverPopup: React.FC<SymbolHoverPopupProps> = ({
<div className="flex flex-row gap-2 mt-2">
<Tooltip delayDuration={500}>
<TooltipTrigger asChild>
<LoadingButton
loading={symbolInfo.isSymbolDefinitionsLoading}
disabled={!previewedSymbolDefinition}
variant="outline"
size="sm"
onClick={onGotoDefinition}
>
{
!symbolInfo.isSymbolDefinitionsLoading && !previewedSymbolDefinition ?
"No definition found" :
`Go to ${symbolInfo.symbolDefinitions && symbolInfo.symbolDefinitions.length > 1 ? "definitions" : "definition"}`
}
</LoadingButton>
{definitionHref ? (
<Link
href={definitionHref}
className={buttonVariants({ variant: "outline", size: "sm" })}
onClick={() => {
captureEvent('wa_goto_definition_pressed', { source });
createAuditAction({
action: "user.performed_goto_definition",
metadata: { message: symbolInfo.symbolName },
});
}}
>
Go to definition
</Link>
) : (
<LoadingButton
loading={symbolInfo.isSymbolDefinitionsLoading}
disabled={!previewedSymbolDefinition}
variant="outline"
size="sm"
onClick={onGotoDefinition}
>
{
!symbolInfo.isSymbolDefinitionsLoading && !previewedSymbolDefinition ?
"No definition found" :
`Go to ${symbolInfo.symbolDefinitions && symbolInfo.symbolDefinitions.length > 1 ? "definitions" : "definition"}`
}
</LoadingButton>
)}
</TooltipTrigger>
<TooltipContent
side="bottom"
Expand Down