An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
feat: Add ReasoningAnswerSection component and enhance CollapsibleMessage with showIcon prop
Yoshiki Miurad869f128132b
diff --git a/components/collapsible-message.tsx b/components/collapsible-message.tsxindex ba94d1ba..e8109a71 100644--- a/components/collapsible-message.tsx+++ b/components/collapsible-message.tsx@@ -1,12 +1,12 @@-import { UserCircle2, Bot, ChevronDown } from 'lucide-react'+import { cn } from '@/lib/utils'+import { ChevronDown, UserCircle2 } from 'lucide-react'import {Collapsible,CollapsibleContent,CollapsibleTrigger} from './ui/collapsible'-import { Separator } from './ui/separator'-import { cn } from '@/lib/utils'import { IconLogo } from './ui/icons'+import { Separator } from './ui/separator'interface CollapsibleMessageProps {children: React.ReactNode@@ -16,6 +16,7 @@ interface CollapsibleMessageProps {header?: React.ReactNodeonOpenChange?: (open: boolean) => voidshowBorder?: boolean+ showIcon?: boolean}export function CollapsibleMessage({@@ -25,19 +26,21 @@ export function CollapsibleMessage({isOpen = true,header,onOpenChange,- showBorder = true+ showBorder = true,+ showIcon = true}: CollapsibleMessageProps) {const content = <div className="py-2 flex-1">{children}</div>return (<div className="flex gap-3"><div className="relative flex flex-col items-center">- <div className={cn('mt-[10px]', role === 'assistant' && 'mt-4')}>- {role === 'user' ? (- <UserCircle2 size={20} className="text-muted-foreground" />- ) : (- <IconLogo className="size-5" />- )}+ <div className={cn('mt-[10px] w-5', role === 'assistant' && 'mt-4')}>+ {showIcon &&+ (role === 'user' ? (+ <UserCircle2 size={20} className="text-muted-foreground" />+ ) : (+ <IconLogo className="size-5" />+ ))}</div></div>@@ -55,7 +58,7 @@ export function CollapsibleMessage({><CollapsibleTrigger className="flex items-center justify-between w-full group"><div className="flex items-center justify-between w-full gap-2">- {header && <div className="text-sm">{header}</div>}+ {header && <div className="text-sm w-full">{header}</div>}<ChevronDown className="h-4 w-4 text-muted-foreground transition-transform duration-200 group-data-[state=open]:rotate-180" /></div></CollapsibleTrigger>@@ -66,7 +69,7 @@ export function CollapsibleMessage({</Collapsible></div>) : (- content+ <div className="flex-1 rounded-2xl px-4">{content}</div>)}</div>)diff --git a/components/message.tsx b/components/message.tsxindex 7919526d..d52a4990 100644--- a/components/message.tsx+++ b/components/message.tsx@@ -1,5 +1,6 @@'use client'+import { cn } from '@/lib/utils'import 'katex/dist/katex.min.css'import rehypeExternalLinks from 'rehype-external-links'import rehypeKatex from 'rehype-katex'@@ -9,7 +10,13 @@ import { Citing } from './custom-link'import { CodeBlock } from './ui/codeblock'import { MemoizedReactMarkdown } from './ui/markdown'-export function BotMessage({ message }: { message: string }) {+export function BotMessage({+ message,+ className+}: {+ message: string+ className?: string+}) {// Check if the content contains LaTeX patternsconst containsLaTeX = /\\\[([\s\S]*?)\\\]|\\\(([\s\S]*?)\\\)/.test(message || ''@@ -26,7 +33,10 @@ export function BotMessage({ message }: { message: string }) {[rehypeKatex]]}remarkPlugins={[remarkGfm, remarkMath]}- className="prose-sm prose-neutral prose-a:text-accent-foreground/50"+ className={cn(+ 'prose-sm prose-neutral prose-a:text-accent-foreground/50',+ className+ )}>{processedData}</MemoizedReactMarkdown>@@ -37,7 +47,10 @@ export function BotMessage({ message }: { message: string }) {<MemoizedReactMarkdownrehypePlugins={[[rehypeExternalLinks, { target: '_blank' }]]}remarkPlugins={[remarkGfm]}- className="prose-sm prose-neutral prose-a:text-accent-foreground/50"+ className={cn(+ 'prose-sm prose-neutral prose-a:text-accent-foreground/50',+ className+ )}components={{code({ node, inline, className, children, ...props }) {if (children.length) {diff --git a/components/reasoning-answer-section.tsx b/components/reasoning-answer-section.tsxnew file mode 100644index 00000000..4938f9c2--- /dev/null+++ b/components/reasoning-answer-section.tsx@@ -0,0 +1,81 @@+'use client'++import { Check, Lightbulb, Loader2 } from 'lucide-react'+import { ChatShare } from './chat-share'+import { CollapsibleMessage } from './collapsible-message'+import { DefaultSkeleton } from './default-skeleton'+import { BotMessage } from './message'++interface ReasoningAnswerContent {+ reasoning: string+ answer?: string+}++export interface ReasoningAnswerSectionProps {+ content: ReasoningAnswerContent+ isOpen: boolean+ onOpenChange: (open: boolean) => void+ chatId?: string+}++export function ReasoningAnswerSection({+ content,+ isOpen,+ onOpenChange,+ chatId+}: ReasoningAnswerSectionProps) {+ const enableShare = process.env.NEXT_PUBLIC_ENABLE_SHARE === 'true'++ const reasoningHeader = (+ <div className="flex items-center gap-2 w-full">+ <Lightbulb size={16} />+ <div className="w-full flex-1 flex items-center justify-between">+ <span>{content.answer?.length === 0 ? 'Thinking...' : 'Thoughts'}</span>+ {content.answer?.length === 0 ? (+ <Loader2+ size={16}+ className="animate-spin text-muted-foreground/50"+ />+ ) : (+ <span className="flex items-center gap-1 text-muted-foreground">+ <Check size={16} className="text-green-500" />+ <span>{content.reasoning.trim().length} chars</span>+ </span>+ )}+ </div>+ </div>+ )++ if (!content) return <DefaultSkeleton />++ return (+ <div className="flex flex-col gap-4">+ <CollapsibleMessage+ role="assistant"+ isCollapsible={true}+ header={reasoningHeader}+ isOpen={isOpen}+ onOpenChange={onOpenChange}+ showBorder={true}+ >+ <BotMessage+ message={content.reasoning}+ className="prose-p:text-muted-foreground"+ />+ </CollapsibleMessage>++ <CollapsibleMessage+ role="assistant"+ isCollapsible={false}+ showIcon={false}+ >+ <div className="flex flex-col gap-4">+ <BotMessage message={content.answer || ''} />+ {enableShare && chatId && (+ <ChatShare chatId={chatId} className="self-end" />+ )}+ </div>+ </CollapsibleMessage>+ </div>+ )+}diff --git a/components/render-message.tsx b/components/render-message.tsxindex 1d053238..369ec042 100644--- a/components/render-message.tsx+++ b/components/render-message.tsx@@ -1,5 +1,6 @@import { Message } from 'ai'import { AnswerSection } from './answer-section'+import { ReasoningAnswerSection } from './reasoning-answer-section'import RelatedQuestions from './related-questions'import { ToolSection } from './tool-section'import { UserMessage } from './user-message'@@ -42,13 +43,24 @@ export function RenderMessage({return (<>- {message.reasoning && <pre>{message.reasoning}</pre>}- <AnswerSection- content={message.content}- isOpen={getIsOpen(messageId)}- onOpenChange={open => onOpenChange(messageId, open)}- chatId={chatId}- />+ {message.reasoning ? (+ <ReasoningAnswerSection+ content={{+ reasoning: message.reasoning,+ answer: message.content+ }}+ isOpen={getIsOpen(messageId)}+ onOpenChange={open => onOpenChange(messageId, open)}+ chatId={chatId}+ />+ ) : (+ <AnswerSection+ content={message.content}+ isOpen={getIsOpen(messageId)}+ onOpenChange={open => onOpenChange(messageId, open)}+ chatId={chatId}+ />+ )}{!message.toolInvocations && message.annotations && (<RelatedQuestionsannotations={message.annotations}