ti.sil/sourcebot
1
0
Fork 0
mirror of https://github.com/sourcebot-dev/sourcebot.git synced 2025-12-11 20:05:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

convert file match container to link

Browse source
This commit is contained in:
bkellam 2025-09-21 12:19:38 -07:00
parent ef46c0181d
commit 073954937e
2 changed files with 20 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
View file

@ -1,27 +1,22 @@
'use client';
import { useCallback } from "react";
import { SearchResultFile, SearchResultChunk } from "@/features/search/types";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import Link from "next/link";
import { getBrowsePath } from "@/app/[domain]/browse/hooks/useBrowseNavigation";
import { useDomain } from "@/hooks/useDomain";
interface FileMatchProps {
match: SearchResultChunk;
file: SearchResultFile;
onOpen: (startLineNumber: number, endLineNumber: number, isCtrlKeyPressed: boolean) => void;
}
export const FileMatch = ({
match,
file,
onOpen: _onOpen,
}: FileMatchProps) => {
const onOpen = useCallback((isCtrlKeyPressed: boolean) => {
const startLineNumber = match.contentStart.lineNumber;
const endLineNumber = match.content.trimEnd().split('\n').length + startLineNumber - 1;
_onOpen(startLineNumber, endLineNumber, isCtrlKeyPressed);
}, [match.content, match.contentStart.lineNumber, _onOpen]);
const domain = useDomain();
// If it's just the title, don't show a code preview
if (match.matchRanges.length === 0) {
@ -29,19 +24,24 @@ export const FileMatch = ({
}
return (
<div
<Link
tabIndex={0}
className="cursor-pointer focus:ring-inset focus:ring-4 bg-background hover:bg-editor-lineHighlight"
onKeyDown={(e) => {
if (e.key !== "Enter") {
return;
href={getBrowsePath({
repoName: file.repository,
revisionName: file.branches?.[0] ?? 'HEAD',
path: file.fileName.text,
pathType: 'blob',
domain,
highlightRange: {
start: {
lineNumber: match.contentStart.lineNumber,
},
end: {
lineNumber: match.content.trimEnd().split('\n').length + match.contentStart.lineNumber - 1,
}
}
onOpen(e.metaKey || e.ctrlKey);
}}
onClick={(e) => {
onOpen(e.metaKey || e.ctrlKey);
}}
})}
title="open file: click, open file preview: cmd/ctrl + click"
>
<LightweightCodeHighlighter
@ -53,6 +53,6 @@ export const FileMatch = ({
>
{match.content}
</LightweightCodeHighlighter>
</div>
</Link>
);
}

25
packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatchContainer.tsx
View file

@ -7,7 +7,6 @@ import { useMemo } from "react";
import { FileMatch } from "./fileMatch";
import { RepositoryInfo, SearchResultFile } from "@/features/search/types";
import { Button } from "@/components/ui/button";
import { useBrowseNavigation } from "@/app/[domain]/browse/hooks/useBrowseNavigation";
export const MAX_MATCHES_TO_PREVIEW = 3;
@ -33,7 +32,6 @@ export const FileMatchContainer = ({
const matchCount = useMemo(() => {
return file.chunks.length;
}, [file]);
const { navigateToPath } = useBrowseNavigation();
const matches = useMemo(() => {
const sortedMatches = file.chunks.sort((a, b) => {
@ -123,29 +121,6 @@ export const FileMatchContainer = ({
<FileMatch
match={match}
file={file}
onOpen={(startLineNumber, endLineNumber, isCtrlKeyPressed) => {
if (isCtrlKeyPressed) {
const matchIndex = matches.slice(0, index).reduce((acc, match) => {
return acc + match.matchRanges.length;
}, 0);
onOpenFilePreview(matchIndex);
} else {
navigateToPath({
repoName: file.repository,
revisionName: file.branches?.[0] ?? 'HEAD',
path: file.fileName.text,
pathType: 'blob',
highlightRange: {
start: {
lineNumber: startLineNumber,
},
end: {
lineNumber: endLineNumber,
}
}
});
}
}}
/>
{(index !== matches.length - 1 || isMoreContentButtonVisible) && (
<Separator className="bg-accent" />