Skip to content

Your always-on AI coworkers that move between text, calls, and Slack.

TypeScript

fix(chat): ignore composer enter during IME composition (#40)

fawaz_ah005ea4fa0b61
diff --git a/src/client/Chat.tsx b/src/client/Chat.tsx
index 4797aaf..b326fc0 100644
--- a/src/client/Chat.tsx
+++ b/src/client/Chat.tsx
@@ -30,6 +30,8 @@ import type { CallReceipt, Conversation, Dot } from '../shared/types';
import { Mascot } from './Mascot';
import { useVoice } from './useVoice';
import { CallView } from './CallView';
+import { shouldSubmitComposerOnKeyDown } from './chat-composer';
+
export function Chat({
thread,
dot,
@@ -416,7 +418,7 @@ export function Chat({
maxLength={4000}
onChange={(e) => setDraft(e.target.value)}
onKeyDown={(e) => {
- if (e.key === 'Enter' && !e.shiftKey) {
+ if (shouldSubmitComposerOnKeyDown(e)) {
e.preventDefault();
e.currentTarget.form?.requestSubmit();
}
diff --git a/src/client/chat-composer.ts b/src/client/chat-composer.ts
new file mode 100644
index 0000000..039ebbf
--- /dev/null
+++ b/src/client/chat-composer.ts
@@ -0,0 +1,15 @@
+export function shouldSubmitComposerOnKeyDown(event: {
+ key: string;
+ shiftKey: boolean;
+ nativeEvent: {
+ isComposing?: boolean;
+ keyCode?: number;
+ };
+}) {
+ return (
+ event.key === 'Enter' &&
+ !event.shiftKey &&
+ !event.nativeEvent.isComposing &&
+ event.nativeEvent.keyCode !== 229
+ );
+}
diff --git a/tests/chat-composer.test.ts b/tests/chat-composer.test.ts
new file mode 100644
index 0000000..71a2f10
--- /dev/null
+++ b/tests/chat-composer.test.ts
@@ -0,0 +1,43 @@
+import { expect, it } from 'vitest';
+import { shouldSubmitComposerOnKeyDown } from '../src/client/chat-composer';
+
+function keyEvent({
+ key = 'Enter',
+ shiftKey = false,
+ isComposing = false,
+ keyCode,
+}: {
+ key?: string;
+ shiftKey?: boolean;
+ isComposing?: boolean;
+ keyCode?: number;
+} = {}) {
+ return {
+ key,
+ shiftKey,
+ nativeEvent: {
+ isComposing,
+ keyCode,
+ },
+ };
+}
+
+it('does not submit Enter while IME composition is active', () => {
+ expect(shouldSubmitComposerOnKeyDown(keyEvent({ isComposing: true }))).toBe(
+ false,
+ );
+});
+
+it('does not submit legacy IME composition Enter events', () => {
+ expect(shouldSubmitComposerOnKeyDown(keyEvent({ keyCode: 229 }))).toBe(false);
+});
+
+it('submits Enter after composition completes', () => {
+ expect(shouldSubmitComposerOnKeyDown(keyEvent())).toBe(true);
+});
+
+it('keeps Shift+Enter available for multiline drafts', () => {
+ expect(shouldSubmitComposerOnKeyDown(keyEvent({ shiftKey: true }))).toBe(
+ false,
+ );
+});