From 3c8e893cab216eb1f748ec1245aeb059a1349639 Mon Sep 17 00:00:00 2001
From: David Luzar <5153846+dwelle@users.noreply.github.com>
Date: Tue, 20 Jan 2026 20:14:28 +0100
Subject: [PATCH] fix: keep input focus during generation (#10679)

---
 .../TTDDialog/Chat/ChatInterface.tsx          | 19 +++++++++++++++----
 packages/excalidraw/locales/en.json           |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/excalidraw/components/TTDDialog/Chat/ChatInterface.tsx b/packages/excalidraw/components/TTDDialog/Chat/ChatInterface.tsx
index b26aa9bc70..312c49ac9c 100644
--- a/packages/excalidraw/components/TTDDialog/Chat/ChatInterface.tsx
+++ b/packages/excalidraw/components/TTDDialog/Chat/ChatInterface.tsx
@@ -90,7 +90,9 @@ export const ChatInterface = ({
   const handleKeyDown = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
     if (event.key === KEYS.ENTER && !event.shiftKey) {
       event.preventDefault();
-      handleSubmit();
+      if (!isGenerating) {
+        handleSubmit();
+      }
     }
   };
 
@@ -143,7 +145,14 @@ export const ChatInterface = ({
 
       <div className="chat-interface__input-container">
         <div className="chat-interface__input-outer">
-          <div className="chat-interface__input-wrapper">
+          <div
+            className="chat-interface__input-wrapper"
+            style={{
+              borderColor: isGenerating
+                ? "var(--dialog-border-color)"
+                : undefined,
+            }}
+          >
             <textarea
               ref={textareaRef}
               autoFocus
@@ -152,13 +161,15 @@ export const ChatInterface = ({
               onChange={handleInputChange}
               onKeyDown={handleKeyDown}
               placeholder={
-                rateLimits?.rateLimitRemaining === 0
+                isGenerating
+                  ? t("chat.generating")
+                  : rateLimits?.rateLimitRemaining === 0
                   ? t("chat.rateLimit.messageLimitInputPlaceholder")
                   : messages.length > 0
                   ? t("chat.inputPlaceholderWithMessages")
                   : t("chat.inputPlaceholder", { shortcut: "Shift + Enter" })
               }
-              disabled={isGenerating || rateLimits?.rateLimitRemaining === 0}
+              disabled={rateLimits?.rateLimitRemaining === 0}
               rows={1}
               cols={30}
               onInput={onInput}
diff --git a/packages/excalidraw/locales/en.json b/packages/excalidraw/locales/en.json
index 48cbc8b2d6..dd69162c3f 100644
--- a/packages/excalidraw/locales/en.json
+++ b/packages/excalidraw/locales/en.json
@@ -623,6 +623,7 @@
   "chat": {
     "inputPlaceholder": "Start typing your diagram idea here... ({{shortcut}} for new line)",
     "inputPlaceholderWithMessages": "Continue refining your diagram...",
+    "generating": "Generating...",
     "rateLimitRemaining": "{{count}} requests left today",
     "role": {
       "user": "You",