Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/happy-app/sources/components/AgentInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,14 @@ export const AgentInput = React.memo(React.forwardRef<MultiTextInputHandle, Agen
return true;
}

// Cmd+Enter or Ctrl+Enter sends on all platforms (external keyboard support)
if (event.key === 'Enter' && (event.metaKey || event.ctrlKey)) {
if (props.value.trim()) {
props.onSend();
return true;
}
}

// Original key handling
if (Platform.OS === 'web') {
if (agentInputEnterToSend && event.key === 'Enter' && !event.shiftKey) {
Expand Down
6 changes: 5 additions & 1 deletion packages/happy-app/sources/components/MultiTextInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ export type SupportedKey = 'Enter' | 'Escape' | 'ArrowUp' | 'ArrowDown' | 'Arrow
export interface KeyPressEvent {
key: SupportedKey;
shiftKey: boolean;
metaKey: boolean;
ctrlKey: boolean;
}

export type OnKeyPressCallback = (event: KeyPressEvent) => boolean;
Expand Down Expand Up @@ -96,7 +98,9 @@ export const MultiTextInput = React.forwardRef<MultiTextInputHandle, MultiTextIn
if (normalizedKey) {
const keyEvent: KeyPressEvent = {
key: normalizedKey,
shiftKey: (nativeEvent as any).shiftKey || false
shiftKey: (nativeEvent as any).shiftKey || false,
metaKey: (nativeEvent as any).metaKey || false,
ctrlKey: (nativeEvent as any).ctrlKey || false,
};

const handled = onKeyPress(keyEvent);
Expand Down
6 changes: 5 additions & 1 deletion packages/happy-app/sources/components/MultiTextInput.web.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export type SupportedKey = 'Enter' | 'Escape' | 'ArrowUp' | 'ArrowDown' | 'Arrow
export interface KeyPressEvent {
key: SupportedKey;
shiftKey: boolean;
metaKey: boolean;
ctrlKey: boolean;
}

export type OnKeyPressCallback = (event: KeyPressEvent) => boolean;
Expand Down Expand Up @@ -98,7 +100,9 @@ export const MultiTextInput = React.forwardRef<MultiTextInputHandle, MultiTextIn
if (normalizedKey) {
const keyEvent: KeyPressEvent = {
key: normalizedKey,
shiftKey: e.shiftKey
shiftKey: e.shiftKey,
metaKey: e.metaKey,
ctrlKey: e.ctrlKey,
};

const handled = onKeyPress(keyEvent);
Expand Down