An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
refactor: Fix share functionality
Yoshiki Miura66ee9acc4591
diff --git a/components/answer-section.tsx b/components/answer-section.tsxindex 4dafb1da..75740826 100644--- a/components/answer-section.tsx+++ b/components/answer-section.tsx@@ -4,24 +4,39 @@ import { BotMessage } from './message'import { DefaultSkeleton } from './default-skeleton'import { CollapsibleMessage } from './collapsible-message'import { Text } from 'lucide-react'+import { ChatShare } from './chat-share'export type AnswerSectionProps = {content: stringisOpen: booleanonOpenChange: (open: boolean) => void+ chatId?: string}export function AnswerSection({content,isOpen,- onOpenChange+ onOpenChange,+ chatId}: AnswerSectionProps) {+ const enableShare = process.env.NEXT_PUBLIC_ENABLE_SHARE === 'true'+const header = (<div className="flex items-center gap-1"><Text size={16} /><div>Answer</div></div>)+ const message = content ? (+ <div className="flex flex-col gap-1">+ <BotMessage message={content} />+ {!enableShare && chatId && (+ <ChatShare chatId={chatId} className="self-end" />+ )}+ </div>+ ) : (+ <DefaultSkeleton />+ )return (<CollapsibleMessagerole="assistant"@@ -31,7 +46,7 @@ export function AnswerSection({onOpenChange={onOpenChange}showBorder={false}>- {content ? <BotMessage message={content} /> : <DefaultSkeleton />}+ {message}</CollapsibleMessage>)}diff --git a/components/chat-messages.tsx b/components/chat-messages.tsxindex 93ed18c0..051e8c28 100644--- a/components/chat-messages.tsx+++ b/components/chat-messages.tsx@@ -7,12 +7,14 @@ interface ChatMessagesProps {messages: Message[]onQuerySelect: (query: string) => voidisLoading: boolean+ chatId?: string}export function ChatMessages({messages,onQuerySelect,- isLoading+ isLoading,+ chatId}: ChatMessagesProps) {const [openStates, setOpenStates] = useState<Record<string, boolean>>({})@@ -54,6 +56,7 @@ export function ChatMessages({getIsOpen={getIsOpen}onOpenChange={handleOpenChange}onQuerySelect={onQuerySelect}+ chatId={chatId}/></div>))}diff --git a/components/chat-share.tsx b/components/chat-share.tsxindex 32d192cb..2dc92c6d 100644--- a/components/chat-share.tsx+++ b/components/chat-share.tsx@@ -16,6 +16,8 @@ import { shareChat } from '@/lib/actions/chat'import { toast } from 'sonner'import { useCopyToClipboard } from '@/lib/hooks/use-copy-to-clipboard'import { Spinner } from './ui/spinner'+import { useChat } from 'ai/react'+import { cn } from '@/lib/utils'interface ChatShareProps {chatId: string@@ -27,6 +29,12 @@ export function ChatShare({ chatId, className }: ChatShareProps) {const [pending, startTransition] = useTransition()const { copyToClipboard } = useCopyToClipboard({ timeout: 1000 })const [shareUrl, setShareUrl] = useState('')+ const { isLoading, messages } = useChat({+ id: 'chat'+ })+ const hasMultipleUserMessages =+ messages.filter(message => message.role === 'user').length >= 2+ const showShareButton = hasMultipleUserMessages ? true : !isLoadingconst handleShare = async () => {startTransition(() => {@@ -67,10 +75,11 @@ export function ChatShare({ chatId, className }: ChatShareProps) {><DialogTrigger asChild><Button- className="rounded-full"+ className={cn('rounded-full', !showShareButton && 'hidden')}size="icon"variant={'ghost'}onClick={() => setOpen(true)}+ disabled={!showShareButton}><Share size={14} /></Button>diff --git a/components/chat.tsx b/components/chat.tsxindex 91a52c19..bece7eaf 100644--- a/components/chat.tsx+++ b/components/chat.tsx@@ -42,6 +42,7 @@ export function Chat({})}}isLoading={isLoading}+ chatId={id}/><ChatPanelinput={input}diff --git a/components/render-message.tsx b/components/render-message.tsxindex c29aa7e2..f6e269d5 100644--- a/components/render-message.tsx+++ b/components/render-message.tsx@@ -10,6 +10,7 @@ interface RenderMessageProps {getIsOpen: (id: string) => booleanonOpenChange: (id: string, open: boolean) => voidonQuerySelect: (query: string) => void+ chatId?: string}export function RenderMessage({@@ -17,7 +18,8 @@ export function RenderMessage({messageId,getIsOpen,onOpenChange,- onQuerySelect+ onQuerySelect,+ chatId}: RenderMessageProps) {if (message.role === 'user') {return <UserMessage message={message.content} />@@ -44,6 +46,7 @@ export function RenderMessage({content={message.content}isOpen={getIsOpen(messageId)}onOpenChange={open => onOpenChange(messageId, open)}+ chatId={chatId}/>{!message.toolInvocations && message.annotations && (<RelatedQuestionsdiff --git a/components/user-message.tsx b/components/user-message.tsxindex e537b95f..fcf5dd2e 100644--- a/components/user-message.tsx+++ b/components/user-message.tsx@@ -1,22 +1,14 @@import React from 'react'-import { ChatShare } from './chat-share'import { CollapsibleMessage } from './collapsible-message'+type UserMessageProps = {message: string- chatId?: string- showShare?: boolean}-export const UserMessage: React.FC<UserMessageProps> = ({- message,- chatId,- showShare = false-}) => {- const enableShare = process.env.ENABLE_SHARE === 'true'+export const UserMessage: React.FC<UserMessageProps> = ({ message }) => {return (<CollapsibleMessage role="user"><div className="flex-1 break-words w-full">{message}</div>- {enableShare && showShare && chatId && <ChatShare chatId={chatId} />}</CollapsibleMessage>)}