mirror of
https://gitee.com/wanwujie/deer-flow
synced 2026-04-13 02:24:44 +08:00
feat: support Github Flavored Markdown
This commit is contained in:
@@ -10,6 +10,7 @@ import {
|
||||
import * as React from "react";
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import rehypeKatex from "rehype-katex";
|
||||
import remarkGfm from "remark-gfm";
|
||||
import remarkMath from "remark-math";
|
||||
import { toast } from "sonner";
|
||||
import { Streamdown } from "streamdown";
|
||||
@@ -29,12 +30,6 @@ import {
|
||||
} from "@/components/ai-elements/inline-citation";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { HoverCardTrigger } from "@/components/ui/hover-card";
|
||||
import {
|
||||
buildCitationMap,
|
||||
extractDomainFromUrl,
|
||||
parseCitations,
|
||||
type Citation,
|
||||
} from "@/core/citations";
|
||||
import { Select, SelectItem } from "@/components/ui/select";
|
||||
import {
|
||||
SelectContent,
|
||||
@@ -46,7 +41,14 @@ import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
|
||||
import { CodeEditor } from "@/components/workspace/code-editor";
|
||||
import { useArtifactContent } from "@/core/artifacts/hooks";
|
||||
import { urlOfArtifact } from "@/core/artifacts/utils";
|
||||
import {
|
||||
buildCitationMap,
|
||||
extractDomainFromUrl,
|
||||
parseCitations,
|
||||
type Citation,
|
||||
} from "@/core/citations";
|
||||
import { useI18n } from "@/core/i18n/hooks";
|
||||
import { streamdownPlugins } from "@/core/streamdown";
|
||||
import { checkCodeFile, getFileName } from "@/core/utils/files";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
@@ -89,7 +91,7 @@ export function ArtifactFileDetail({
|
||||
filepath: filepathFromProps,
|
||||
enabled: isCodeFile && !isWriteFile,
|
||||
});
|
||||
|
||||
|
||||
// Parse citations and get clean content for code editor
|
||||
const cleanContent = useMemo(() => {
|
||||
if (language === "markdown" && content) {
|
||||
@@ -97,7 +99,7 @@ export function ArtifactFileDetail({
|
||||
}
|
||||
return content;
|
||||
}, [content, language]);
|
||||
|
||||
|
||||
const [viewMode, setViewMode] = useState<"code" | "preview">("code");
|
||||
useEffect(() => {
|
||||
if (previewable) {
|
||||
@@ -254,8 +256,7 @@ export function ArtifactFilePreview({
|
||||
<div className="size-full px-4">
|
||||
<Streamdown
|
||||
className="size-full"
|
||||
remarkPlugins={[[remarkMath, { singleDollarTextMath: true }]]}
|
||||
rehypePlugins={[[rehypeKatex, { output: "html" }]]}
|
||||
{...streamdownPlugins}
|
||||
components={{
|
||||
a: ({
|
||||
href,
|
||||
@@ -336,7 +337,7 @@ function ArtifactCitationLink({
|
||||
>
|
||||
<Badge
|
||||
variant="secondary"
|
||||
className="mx-0.5 cursor-pointer gap-1 rounded-full px-2 py-0.5 text-xs font-normal hover:bg-secondary/80"
|
||||
className="hover:bg-secondary/80 mx-0.5 cursor-pointer gap-1 rounded-full px-2 py-0.5 text-xs font-normal"
|
||||
>
|
||||
{children ?? domain}
|
||||
<ExternalLinkIcon className="size-3" />
|
||||
@@ -388,7 +389,7 @@ function ExternalLinkBadge({
|
||||
>
|
||||
<Badge
|
||||
variant="secondary"
|
||||
className="mx-0.5 cursor-pointer gap-1 rounded-full px-2 py-0.5 text-xs font-normal hover:bg-secondary/80"
|
||||
className="hover:bg-secondary/80 mx-0.5 cursor-pointer gap-1 rounded-full px-2 py-0.5 text-xs font-normal"
|
||||
>
|
||||
{children ?? domain}
|
||||
<ExternalLinkIcon className="size-3" />
|
||||
|
||||
@@ -32,6 +32,7 @@ import {
|
||||
type UploadedFile,
|
||||
} from "@/core/messages/utils";
|
||||
import { useRehypeSplitWordsIntoSpans } from "@/core/rehype";
|
||||
import { streamdownPlugins } from "@/core/streamdown";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
import { CopyButton } from "../copy-button";
|
||||
@@ -93,13 +94,19 @@ function MessageContent_({
|
||||
const reasoningContent = extractReasoningContentFromMessage(message);
|
||||
const rawContent = extractContentFromMessage(message);
|
||||
if (!isLoading && reasoningContent && !rawContent) {
|
||||
return { citations: [], cleanContent: reasoningContent, uploadedFiles: [] };
|
||||
return {
|
||||
citations: [],
|
||||
cleanContent: reasoningContent,
|
||||
uploadedFiles: [],
|
||||
};
|
||||
}
|
||||
|
||||
// For human messages, first parse uploaded files
|
||||
if (isHuman && rawContent) {
|
||||
const { files, cleanContent: contentWithoutFiles } = parseUploadedFiles(rawContent);
|
||||
const { citations, cleanContent: finalContent } = parseCitations(contentWithoutFiles);
|
||||
const { files, cleanContent: contentWithoutFiles } =
|
||||
parseUploadedFiles(rawContent);
|
||||
const { citations, cleanContent: finalContent } =
|
||||
parseCitations(contentWithoutFiles);
|
||||
return { citations, cleanContent: finalContent, uploadedFiles: files };
|
||||
}
|
||||
|
||||
@@ -108,10 +115,7 @@ function MessageContent_({
|
||||
}, [isLoading, message, isHuman]);
|
||||
|
||||
// Build citation map for quick URL lookup
|
||||
const citationMap = useMemo(
|
||||
() => buildCitationMap(citations),
|
||||
[citations],
|
||||
);
|
||||
const citationMap = useMemo(() => buildCitationMap(citations), [citations]);
|
||||
|
||||
const { thread_id } = useParams<{ thread_id: string }>();
|
||||
|
||||
@@ -121,13 +125,12 @@ function MessageContent_({
|
||||
<div className={cn("ml-auto flex flex-col gap-2", className)}>
|
||||
{/* Uploaded files outside the message bubble */}
|
||||
<UploadedFilesList files={uploadedFiles} threadId={thread_id} />
|
||||
|
||||
|
||||
{/* Message content inside the bubble (only if there's text) */}
|
||||
{cleanContent && (
|
||||
<AIElementMessageContent className="w-fit">
|
||||
<AIElementMessageResponse
|
||||
remarkPlugins={[[remarkMath, { singleDollarTextMath: true }]]}
|
||||
rehypePlugins={[...rehypePlugins, [rehypeKatex, { output: "html" }]]}
|
||||
{...streamdownPlugins}
|
||||
components={{
|
||||
a: ({
|
||||
href,
|
||||
@@ -159,7 +162,10 @@ function MessageContent_({
|
||||
</a>
|
||||
);
|
||||
},
|
||||
img: ({ src, alt }: React.ImgHTMLAttributes<HTMLImageElement>) => {
|
||||
img: ({
|
||||
src,
|
||||
alt,
|
||||
}: React.ImgHTMLAttributes<HTMLImageElement>) => {
|
||||
if (!src) return null;
|
||||
if (typeof src !== "string") {
|
||||
return (
|
||||
@@ -302,7 +308,7 @@ function getFileTypeLabel(filename: string): string {
|
||||
tar: "TAR",
|
||||
gz: "GZ",
|
||||
};
|
||||
return typeMap[ext] || ext.toUpperCase() || "FILE";
|
||||
return (typeMap[ext] ?? ext.toUpperCase()) || "FILE";
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -367,7 +373,7 @@ function UploadedFileCard({
|
||||
href={imageUrl}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="group relative block overflow-hidden rounded-lg border border-border/40"
|
||||
className="group border-border/40 relative block overflow-hidden rounded-lg border"
|
||||
>
|
||||
<img
|
||||
src={imageUrl}
|
||||
@@ -380,7 +386,7 @@ function UploadedFileCard({
|
||||
|
||||
// For non-image files, show file card
|
||||
return (
|
||||
<div className="bg-background flex min-w-[120px] max-w-[200px] flex-col gap-1 rounded-lg border border-border/40 p-3 shadow-sm">
|
||||
<div className="bg-background border-border/40 flex max-w-[200px] min-w-[120px] flex-col gap-1 rounded-lg border p-3 shadow-sm">
|
||||
<div className="flex items-start gap-2">
|
||||
<FileIcon className="text-muted-foreground mt-0.5 size-4 shrink-0" />
|
||||
<span
|
||||
@@ -410,8 +416,8 @@ function CitationsList({ citations }: { citations: Citation[] }) {
|
||||
if (citations.length === 0) return null;
|
||||
|
||||
return (
|
||||
<div className="mb-4 rounded-lg border bg-muted/30 p-3">
|
||||
<div className="mb-2 flex items-center gap-2 text-sm font-medium text-muted-foreground">
|
||||
<div className="bg-muted/30 mb-4 rounded-lg border p-3">
|
||||
<div className="text-muted-foreground mb-2 flex items-center gap-2 text-sm font-medium">
|
||||
<LinkIcon className="size-4" />
|
||||
<span>Sources ({citations.length})</span>
|
||||
</div>
|
||||
@@ -441,7 +447,7 @@ function CitationBadge({ citation }: { citation: Citation }) {
|
||||
>
|
||||
<Badge
|
||||
variant="secondary"
|
||||
className="cursor-pointer gap-1 rounded-full px-2.5 py-1 text-xs font-normal hover:bg-secondary/80"
|
||||
className="hover:bg-secondary/80 cursor-pointer gap-1 rounded-full px-2.5 py-1 text-xs font-normal"
|
||||
>
|
||||
{domain}
|
||||
<ExternalLinkIcon className="size-3" />
|
||||
@@ -496,7 +502,7 @@ function CitationLink({
|
||||
>
|
||||
<Badge
|
||||
variant="secondary"
|
||||
className="mx-0.5 cursor-pointer gap-1 rounded-full px-2 py-0.5 text-xs font-normal hover:bg-secondary/80"
|
||||
className="hover:bg-secondary/80 mx-0.5 cursor-pointer gap-1 rounded-full px-2 py-0.5 text-xs font-normal"
|
||||
>
|
||||
{children ?? domain}
|
||||
<ExternalLinkIcon className="size-3" />
|
||||
|
||||
1
frontend/src/core/streamdown/index.ts
Normal file
1
frontend/src/core/streamdown/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export * from "./plugins";
|
||||
13
frontend/src/core/streamdown/plugins.ts
Normal file
13
frontend/src/core/streamdown/plugins.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
import rehypeKatex from "rehype-katex";
|
||||
import remarkGfm from "remark-gfm";
|
||||
import remarkMath from "remark-math";
|
||||
import type { StreamdownProps } from "streamdown";
|
||||
|
||||
export const streamdownPlugins = {
|
||||
remarkPlugins: [
|
||||
[remarkGfm, [remarkMath, { singleDollarTextMath: true }]],
|
||||
] as StreamdownProps["remarkPlugins"],
|
||||
rehypePlugins: [
|
||||
[rehypeKatex, { output: "html" }],
|
||||
] as StreamdownProps["rehypePlugins"],
|
||||
};
|
||||
Reference in New Issue
Block a user