From 31989eb9afe3928b231009a8df03c26109844377 Mon Sep 17 00:00:00 2001
From: Simon Farshid <simon.farshid@outlook.com>
Date: Tue, 25 Jun 2024 20:48:53 -0700
Subject: [PATCH] fix: ComposerInput autoFocus should not scroll the page,
 enable autoScroll by default in template (#318)

---
 packages/react/src/primitives/composer/ComposerInput.tsx       | 3 +--
 packages/shadcn-registry/registry/assistant-ui/full/thread.tsx | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/primitives/composer/ComposerInput.tsx b/packages/react/src/primitives/composer/ComposerInput.tsx
index a90c974598..8c61a66c48 100644
--- a/packages/react/src/primitives/composer/ComposerInput.tsx
+++ b/packages/react/src/primitives/composer/ComposerInput.tsx
@@ -68,7 +68,7 @@ export const ComposerInput = forwardRef<
       const textarea = textareaRef.current;
       if (!textarea || !autoFocusEnabled) return;
 
-      textarea.focus();
+      textarea.focus({ preventScroll: true });
       textarea.setSelectionRange(
         textareaRef.current.value.length,
         textareaRef.current.value.length,
@@ -88,7 +88,6 @@ export const ComposerInput = forwardRef<
         value={value}
         {...rest}
         ref={ref}
-        autoFocus={autoFocus}
         disabled={disabled}
         onChange={composeEventHandlers(onChange, (e) => {
           const composerState = useComposer.getState();
diff --git a/packages/shadcn-registry/registry/assistant-ui/full/thread.tsx b/packages/shadcn-registry/registry/assistant-ui/full/thread.tsx
index 41f92c4682..96473619b0 100644
--- a/packages/shadcn-registry/registry/assistant-ui/full/thread.tsx
+++ b/packages/shadcn-registry/registry/assistant-ui/full/thread.tsx
@@ -86,6 +86,7 @@ const Composer: FC = () => {
   return (
     <ComposerPrimitive.Root className="flex w-[calc(100%-32px)] max-w-[42rem] items-end rounded-lg border p-0.5 transition-shadow focus-within:shadow-sm">
       <ComposerPrimitive.Input
+        autoFocus
         placeholder="Write a message..."
         className="placeholder:text-foreground/50 h-12 max-h-40 flex-grow resize-none bg-transparent p-3.5 text-sm outline-none"
       />