Skip to content

An AI-powered search engine with a generative UI

Add scroll container reference to ChatMessages component

Yoshiki Miurad5256bc7cd62
diff --git a/components/chat-messages.tsx b/components/chat-messages.tsx
index 870f44c1..07d56d9e 100644
--- a/components/chat-messages.tsx
+++ b/components/chat-messages.tsx
@@ -1,3 +1,4 @@
+import { cn } from '@/lib/utils'
import { ChatRequestOptions, JSONValue, Message } from 'ai'
import { useEffect, useMemo, useState } from 'react'
import { RenderMessage } from './render-message'
@@ -13,6 +14,8 @@ interface ChatMessagesProps {
addToolResult?: (params: { toolCallId: string; result: any }) => void
/** Ref for anchoring auto-scroll position */
anchorRef: React.RefObject<HTMLDivElement>
+ /** Ref for the scroll container */
+ scrollContainerRef: React.RefObject<HTMLDivElement>
onUpdateMessage?: (messageId: string, newContent: string) => Promise<void>
reload?: (
messageId: string,
@@ -28,6 +31,7 @@ export function ChatMessages({
chatId,
addToolResult,
anchorRef,
+ scrollContainerRef,
onUpdateMessage,
reload
}: ChatMessagesProps) {
@@ -92,35 +96,47 @@ export function ChatMessages({
}
return (
- <div className="relative mx-auto w-full max-w-3xl px-4">
- {messages.map(message => (
- <div key={message.id} className="mb-4 flex flex-col gap-4">
- <RenderMessage
- message={message}
- messageId={message.id}
- getIsOpen={getIsOpen}
- onOpenChange={handleOpenChange}
- onQuerySelect={onQuerySelect}
- chatId={chatId}
- addToolResult={addToolResult}
- onUpdateMessage={onUpdateMessage}
- reload={reload}
- />
- </div>
- ))}
- {showLoading &&
- (lastToolData ? (
- <ToolSection
- key={manualToolCallId}
- tool={lastToolData}
- isOpen={getIsOpen(manualToolCallId)}
- onOpenChange={open => handleOpenChange(manualToolCallId, open)}
- addToolResult={addToolResult}
- />
- ) : (
- <Spinner />
+ <div
+ id="scroll-container"
+ ref={scrollContainerRef}
+ role="list"
+ aria-roledescription="chat messages"
+ className={cn(
+ 'relative size-full pt-14',
+ messages.length > 0 ? 'flex-1 overflow-y-auto' : ''
+ )}
+ style={{ contain: 'strict' }}
+ >
+ <div className="relative mx-auto w-full max-w-3xl px-4">
+ {messages.map(message => (
+ <div key={message.id} className="mb-4 flex flex-col gap-4">
+ <RenderMessage
+ message={message}
+ messageId={message.id}
+ getIsOpen={getIsOpen}
+ onOpenChange={handleOpenChange}
+ onQuerySelect={onQuerySelect}
+ chatId={chatId}
+ addToolResult={addToolResult}
+ onUpdateMessage={onUpdateMessage}
+ reload={reload}
+ />
+ </div>
))}
- <div ref={anchorRef} />
+ {showLoading &&
+ (lastToolData ? (
+ <ToolSection
+ key={manualToolCallId}
+ tool={lastToolData}
+ isOpen={getIsOpen(manualToolCallId)}
+ onOpenChange={open => handleOpenChange(manualToolCallId, open)}
+ addToolResult={addToolResult}
+ />
+ ) : (
+ <Spinner />
+ ))}
+ <div ref={anchorRef} />
+ </div>
</div>
)
}
diff --git a/components/chat.tsx b/components/chat.tsx
index 0196e842..58f98f19 100644
--- a/components/chat.tsx
+++ b/components/chat.tsx
@@ -139,29 +139,18 @@ export function Chat({
)}
data-testid="full-chat"
>
- <div
- id="scroll-container"
- ref={scrollContainerRef}
- role="list"
- aria-roledescription="chat messages"
- className={cn(
- 'relative size-full pt-14',
- messages.length > 0 ? 'flex-1 overflow-y-auto' : ''
- )}
- style={{ contain: 'strict' }}
- >
- <ChatMessages
- messages={messages}
- data={data}
- onQuerySelect={onQuerySelect}
- isLoading={isLoading}
- chatId={id}
- addToolResult={addToolResult}
- anchorRef={anchorRef}
- onUpdateMessage={handleUpdateAndReloadMessage}
- reload={handleReloadFrom}
- />
- </div>
+ <ChatMessages
+ messages={messages}
+ data={data}
+ onQuerySelect={onQuerySelect}
+ isLoading={isLoading}
+ chatId={id}
+ addToolResult={addToolResult}
+ anchorRef={anchorRef}
+ scrollContainerRef={scrollContainerRef}
+ onUpdateMessage={handleUpdateAndReloadMessage}
+ reload={handleReloadFrom}
+ />
<ChatPanel
input={input}
handleInputChange={handleInputChange}