An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
refactor: use proper status propagation in chat components instead of multiple useChat instances
Yoshiki Miura577e383019e1
diff --git a/components/answer-section.tsx b/components/answer-section.tsxindex d2188fda..be7e49e5 100644--- a/components/answer-section.tsx+++ b/components/answer-section.tsx@@ -1,5 +1,6 @@'use client'+import { UseChatHelpers } from '@ai-sdk/react'import { ChatRequestOptions } from 'ai'import { CollapsibleMessage } from './collapsible-message'import { DefaultSkeleton } from './default-skeleton'@@ -13,6 +14,7 @@ export type AnswerSectionProps = {chatId?: stringshowActions?: booleanmessageId: string+ status?: UseChatHelpers['status']reload?: (messageId: string,options?: ChatRequestOptions@@ -26,6 +28,7 @@ export function AnswerSection({chatId,showActions = true, // Default to true for backward compatibilitymessageId,+ status,reload}: AnswerSectionProps) {const enableShare = process.env.NEXT_PUBLIC_SUPABASE_URL !== undefined@@ -47,6 +50,7 @@ export function AnswerSection({chatId={chatId}enableShare={enableShare}reload={handleReload}+ status={status}/>)}</div>diff --git a/components/chat-messages.tsx b/components/chat-messages.tsxindex 2a80e0dd..b6772e17 100644--- a/components/chat-messages.tsx+++ b/components/chat-messages.tsx@@ -1,6 +1,7 @@'use client'import { cn } from '@/lib/utils'+import { UseChatHelpers } from '@ai-sdk/react'import { UIMessage } from 'ai'import { useEffect, useState } from 'react'import { RenderMessage } from './render-message'@@ -16,7 +17,7 @@ interface ChatSection {interface ChatMessagesProps {sections: ChatSection[] // Changed from messages to sectionsonQuerySelect: (query: string) => void- isLoading: boolean+ status: UseChatHelpers['status'] // isLoadingの代わりにstatusを使用chatId?: stringaddToolResult?: (params: { toolCallId: string; result: any }) => void/** Ref for the scroll container */@@ -28,7 +29,7 @@ interface ChatMessagesProps {export function ChatMessages({sections,onQuerySelect,- isLoading,+ status, // isLoadingの代わりにstatusを使用chatId,addToolResult,scrollContainerRef,@@ -37,6 +38,7 @@ export function ChatMessages({}: ChatMessagesProps) {const [openStates, setOpenStates] = useState<Record<string, boolean>>({})const manualToolCallId = 'manual-tool-call'+ const isLoading = status === 'submitted' || status === 'streaming' // statusからisLoadingを導出useEffect(() => {// Open manual tool call when the last section is a user message@@ -115,6 +117,7 @@ export function ChatMessages({onOpenChange={handleOpenChange}onQuerySelect={onQuerySelect}chatId={chatId}+ status={status}addToolResult={addToolResult}onUpdateMessage={onUpdateMessage}reload={reload}@@ -132,6 +135,7 @@ export function ChatMessages({onOpenChange={handleOpenChange}onQuerySelect={onQuerySelect}chatId={chatId}+ status={status}addToolResult={addToolResult}onUpdateMessage={onUpdateMessage}reload={reload}diff --git a/components/chat-panel.tsx b/components/chat-panel.tsxindex 8c908238..a92c8414 100644--- a/components/chat-panel.tsx+++ b/components/chat-panel.tsx@@ -2,7 +2,7 @@import { Model } from '@/lib/types/models'import { cn } from '@/lib/utils'-import { UIMessage } from '@ai-sdk/react'+import { UIMessage, UseChatHelpers } from '@ai-sdk/react'import { ArrowUp, ChevronDown, MessageCirclePlus, Square } from 'lucide-react'import { useRouter } from 'next/navigation'import { useEffect, useRef, useState } from 'react'@@ -18,7 +18,7 @@ interface ChatPanelProps {input: stringhandleInputChange: (e: React.ChangeEvent<HTMLTextAreaElement>) => voidhandleSubmit: (e: React.FormEvent<HTMLFormElement>) => void- isLoading: boolean+ status: UseChatHelpers['status']messages: UIMessage[]setMessages: (messages: UIMessage[]) => voidquery?: string@@ -35,7 +35,7 @@ export function ChatPanel({input,handleInputChange,handleSubmit,- isLoading,+ status,messages,setMessages,query,@@ -53,6 +53,8 @@ export function ChatPanel({const [enterDisabled, setEnterDisabled] = useState(false) // Disable Enter after composition endsconst { close: closeArtifact } = useArtifact()+ const isLoading = status === 'submitted' || status === 'streaming'+const handleCompositionStart = () => setIsComposing(true)const handleCompositionEnd = () => {diff --git a/components/chat.tsx b/components/chat.tsxindex e42246f7..21366855 100644--- a/components/chat.tsx+++ b/components/chat.tsx@@ -75,8 +75,6 @@ export function Chat({generateId: generateUUID})- const isLoading = status === 'submitted' || status === 'streaming'-// Convert messages array to sections arrayconst sections = useMemo<ChatSection[]>(() => {const result: ChatSection[] = []@@ -297,7 +295,7 @@ export function Chat({<ChatMessagessections={sections}onQuerySelect={onQuerySelect}- isLoading={isLoading}+ status={status}chatId={id}addToolResult={addToolResult}scrollContainerRef={scrollContainerRef}@@ -308,7 +306,7 @@ export function Chat({input={input}handleInputChange={handleInputChange}handleSubmit={onSubmit}- isLoading={isLoading}+ status={status}messages={messages}setMessages={setMessages}stop={stop}diff --git a/components/message-actions.tsx b/components/message-actions.tsxindex 0356d235..247d4578 100644--- a/components/message-actions.tsx+++ b/components/message-actions.tsx@@ -1,8 +1,7 @@'use client'-import { CHAT_ID } from '@/lib/constants'import { cn } from '@/lib/utils'-import { useChat } from '@ai-sdk/react'+import { UseChatHelpers } from '@ai-sdk/react'import { Copy } from 'lucide-react'import { toast } from 'sonner'import { ChatShare } from './chat-share'@@ -16,6 +15,7 @@ interface MessageActionsProps {chatId?: stringenableShare?: booleanclassName?: string+ status?: UseChatHelpers['status']}export function MessageActions({@@ -24,13 +24,13 @@ export function MessageActions({reload,chatId,enableShare,- className+ className,+ status}: MessageActionsProps) {- const { status } = useChat({- id: CHAT_ID- })const isLoading = status === 'submitted' || status === 'streaming'+ console.log('isLoading', status)+async function handleCopy() {await navigator.clipboard.writeText(message)toast.success('Message copied to clipboard')diff --git a/components/render-message.tsx b/components/render-message.tsxindex a119590f..46fc8bf6 100644--- a/components/render-message.tsx+++ b/components/render-message.tsx@@ -1,4 +1,4 @@-import { UIMessage } from '@ai-sdk/react'+import { UIMessage, UseChatHelpers } from '@ai-sdk/react'import { AnswerSection } from './answer-section'import { ReasoningSection } from './reasoning-section'import { ToolSection } from './tool-section'@@ -11,6 +11,7 @@ interface RenderMessageProps {onOpenChange: (id: string, open: boolean) => voidonQuerySelect: (query: string) => voidchatId?: string+ status?: UseChatHelpers['status']addToolResult?: (params: { toolCallId: string; result: any }) => voidonUpdateMessage?: (messageId: string, newContent: string) => Promise<void>reload?: (messageId: string) => Promise<void | string | null | undefined>@@ -23,6 +24,7 @@ export function RenderMessage({onOpenChange,onQuerySelect,chatId,+ status,addToolResult,onUpdateMessage,reload@@ -69,6 +71,7 @@ export function RenderMessage({showActions={isLastPart}messageId={messageId}reload={reload}+ status={status}/>)case 'reasoning':