From 5e771185088b96c56e36b561806b4d33c41e020d Mon Sep 17 00:00:00 2001 From: mesalogo Date: Thu, 1 Oct 2026 22:01:47 +0800 Subject: [PATCH] fix: remove redundant chat input placeholder greeting --- src/renderer/src/App.test.tsx | 12 ++++++------ src/renderer/src/App.tsx | 6 +++--- src/renderer/src/i18n/locales/en-US/app.ts | 1 - src/renderer/src/i18n/locales/zh-CN/app.ts | 1 - 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/renderer/src/App.test.tsx b/src/renderer/src/App.test.tsx index e6dba3ee..0cae2f8e 100644 --- a/src/renderer/src/App.test.tsx +++ b/src/renderer/src/App.test.tsx @@ -2118,7 +2118,7 @@ describe("App", () => { ).toBeInTheDocument(); expect(screen.getByLabelText("Message GoodBuddy")).toHaveAttribute( "placeholder", - "Message GoodBuddy…\nEnter to send · Shift+Enter for a new line · Ctrl+V to paste\nCtrl+N for a new conversation · Ctrl+Shift+Space for quick access", + "Enter to send · Shift+Enter for a new line · Ctrl+V to paste\nCtrl+N for a new conversation · Ctrl+Shift+Space for quick access", ); expect(screen.getByLabelText("Message GoodBuddy")).toHaveAttribute( "title", @@ -5985,7 +5985,7 @@ describe("App", () => { render(); const composer = await screen.findByLabelText("向 GoodBuddy 提问"); await waitFor(() => expect(composer).toHaveAttribute("placeholder", - `给 GoodBuddy 发消息…\nEnter 发送 · Shift+Enter 换行 · ${modifier}+V 粘贴\n${modifier}+N 新建对话${shortcut ? ` · ${shortcut} 快捷唤起` : ""}`)); + `Enter 发送 · Shift+Enter 换行 · ${modifier}+V 粘贴\n${modifier}+N 新建对话${shortcut ? ` · ${shortcut} 快捷唤起` : ""}`)); expect(document.querySelector(".composer-meta__shortcut")).toBeNull(); }); @@ -6061,7 +6061,7 @@ describe("App", () => { render(); const composer = await screen.findByLabelText("向 GoodBuddy 提问"); await waitFor(() => expect(composer).toHaveAttribute("placeholder", - `给 GoodBuddy 发消息…\nEnter 发送 · Shift+Enter 换行 · Ctrl+V 粘贴\nCtrl+N 新建对话${infoState === "loaded" ? " · Ctrl+Shift+Space 快捷唤起" : ""}`)); + `Enter 发送 · Shift+Enter 换行 · Ctrl+V 粘贴\nCtrl+N 新建对话${infoState === "loaded" ? " · Ctrl+Shift+Space 快捷唤起" : ""}`)); expect(document.querySelector(".composer-meta__shortcut")).toBeNull(); fireEvent.change(composer, { target: { value: "草稿" } }); expect(composer).toHaveValue("草稿"); @@ -6102,11 +6102,11 @@ describe("App", () => { await screen.findByLabelText("向 GoodBuddy 提问"); expect(screen.queryByText("Ctrl+Alt+K")).not.toBeInTheDocument(); await waitFor(() => expect(screen.getByLabelText("向 GoodBuddy 提问")) - .toHaveAttribute("placeholder", "给 GoodBuddy 发消息…\nEnter 发送 · Shift+Enter 换行 · Ctrl+V 粘贴\nCtrl+N 新建对话")); + .toHaveAttribute("placeholder", "Enter 发送 · Shift+Enter 换行 · Ctrl+V 粘贴\nCtrl+N 新建对话")); if (infoState === "pending") { await act(async () => pendingInfo.resolve(initialInfo)); expect(screen.getByLabelText("向 GoodBuddy 提问")).toHaveAttribute("placeholder", - "给 GoodBuddy 发消息…\nEnter 发送 · Shift+Enter 换行 · Ctrl+V 粘贴\nCtrl+N 新建对话"); + "Enter 发送 · Shift+Enter 换行 · Ctrl+V 粘贴\nCtrl+N 新建对话"); } } finally { delete api.shortcuts; @@ -8254,7 +8254,7 @@ describe("App", () => { ).toHaveTextContent(/^Ask$/u); expect(screen.getByLabelText("向 GoodBuddy 提问")).toHaveAttribute( "placeholder", - "给 GoodBuddy 发消息…\nEnter 发送 · Shift+Enter 换行 · Ctrl+V 粘贴\nCtrl+N 新建对话 · Ctrl+Shift+Space 快捷唤起", + "Enter 发送 · Shift+Enter 换行 · Ctrl+V 粘贴\nCtrl+N 新建对话 · Ctrl+Shift+Space 快捷唤起", ); expect( within(conversationSettings).getByRole("button", { diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index 91a68d2b..f513323a 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -9966,9 +9966,9 @@ function App(): React.JSX.Element { aria-label={t("composer.inputLabel")} placeholder={`${ runtime?.capability === "image-generation" - ? t("composer.imagePlaceholder") - : t("composer.placeholder") - }\n${composerKeyboardHint}\n${composerConversationHint}`} + ? `${t("composer.imagePlaceholder")}\n` + : "" + }${composerKeyboardHint}\n${composerConversationHint}`} ref={inputRef} rows={3} title={`${composerKeyboardHint}\n${composerConversationHint}`} diff --git a/src/renderer/src/i18n/locales/en-US/app.ts b/src/renderer/src/i18n/locales/en-US/app.ts index 741fc062..0e2c1bbf 100644 --- a/src/renderer/src/i18n/locales/en-US/app.ts +++ b/src/renderer/src/i18n/locales/en-US/app.ts @@ -544,7 +544,6 @@ export const app = { composer: { menuSelection: '{{label}}: {{selection}}', inputLabel: 'Message GoodBuddy', - placeholder: 'Message GoodBuddy…', imagePlaceholder: 'Describe the image you want to generate…', keyboardHint: 'Enter to send · Shift+Enter for a new line · {{pasteShortcut}} to paste', diff --git a/src/renderer/src/i18n/locales/zh-CN/app.ts b/src/renderer/src/i18n/locales/zh-CN/app.ts index b05549ac..56348d3d 100644 --- a/src/renderer/src/i18n/locales/zh-CN/app.ts +++ b/src/renderer/src/i18n/locales/zh-CN/app.ts @@ -525,7 +525,6 @@ export const app = { composer: { menuSelection: '{{label}}:{{selection}}', inputLabel: '向 GoodBuddy 提问', - placeholder: '给 GoodBuddy 发消息…', imagePlaceholder: '描述你想生成的图片…', keyboardHint: 'Enter 发送 · Shift+Enter 换行 · {{pasteShortcut}} 粘贴',