diff --git a/mobile/src/terminal/use-terminal-live-accessory-input-commit.test.ts b/mobile/src/terminal/use-terminal-live-accessory-input-commit.test.ts index 1dfab4b0ffe..ad1d1726798 100644 --- a/mobile/src/terminal/use-terminal-live-accessory-input-commit.test.ts +++ b/mobile/src/terminal/use-terminal-live-accessory-input-commit.test.ts @@ -70,7 +70,7 @@ function createAccessoryInputCommitHarness({ } } const applyLiveInputMirror = vi.fn( - (_handle: string, _fieldText: string, _composing?: boolean) => {} + async (_handle: string, _fieldText: string, _composing?: boolean) => true ) const clearPendingLiveInputCommit = vi.fn(() => {}) const flushPendingLiveInputText = vi.fn(async (_expectedHandle: string | null) => flushResult) diff --git a/mobile/src/terminal/use-terminal-live-accessory-input-commit.ts b/mobile/src/terminal/use-terminal-live-accessory-input-commit.ts index ec86e995de7..80a8422d085 100644 --- a/mobile/src/terminal/use-terminal-live-accessory-input-commit.ts +++ b/mobile/src/terminal/use-terminal-live-accessory-input-commit.ts @@ -21,7 +21,11 @@ export async function getTerminalLiveAccessoryInactiveInputCommitResult( type TerminalLiveAccessoryInputCommitOptions = { readonly activeHandle: string | null - readonly applyLiveInputMirror: (handle: string, fieldText: string, composing?: boolean) => void + readonly applyLiveInputMirror: ( + handle: string, + fieldText: string, + composing?: boolean + ) => Promise readonly clearPendingLiveInputCommit: () => void readonly flushPendingLiveInputText: (expectedHandle: string | null) => Promise readonly heldLiveInputTextRef: RefObject @@ -84,8 +88,12 @@ export function useTerminalLiveAccessoryInputCommit({ setLiveInputCapture(editedText) liveInputRef.current?.setNativeProps({ text: editedText }) // Preserve undefined so Android's heuristic hold still settles on its timer. - applyLiveInputMirror(activeHandle, editedText, liveInputComposingRef.current) - return { kind: 'handled' } + const sent = await applyLiveInputMirror( + activeHandle, + editedText, + liveInputComposingRef.current + ) + return sent ? { kind: 'handled' } : { kind: 'suppress-raw' } } case 'commit-held-then-send': { const sent = await sendTerminalLiveControlAfterPendingFlush( diff --git a/mobile/src/terminal/use-terminal-live-input-commit.test.ts b/mobile/src/terminal/use-terminal-live-input-commit.test.ts index b24636114a9..6077ccb4033 100644 --- a/mobile/src/terminal/use-terminal-live-input-commit.test.ts +++ b/mobile/src/terminal/use-terminal-live-input-commit.test.ts @@ -190,6 +190,20 @@ describe('terminal live input commit hook', () => { await vi.waitFor(() => expect(sent).toEqual(['한'])) }) + it('Given a failed mirrored Backspace When accessory input commits Then reports failure', async () => { + const { handlers, sent } = createTerminalLiveInputCommitHarness({ sendResult: false }) + changeLiveInput(handlers, 'a', false) + await vi.waitFor(() => expect(sent).toEqual(['a'])) + + const result = await handlers.handleLiveInputAccessoryBytes({ + bytes: '\x7f', + localEdit: 'backspace' + }) + + expect(sent).toEqual(['a', '\x7f']) + expect(result).toEqual({ kind: 'suppress-raw' }) + }) + it('Given a held syllable When the settle timer elapses Then commits it to the terminal', async () => { // Given vi.useFakeTimers() diff --git a/mobile/src/terminal/use-terminal-live-input-commit.ts b/mobile/src/terminal/use-terminal-live-input-commit.ts index 25bbf1ae002..952612f0a87 100644 --- a/mobile/src/terminal/use-terminal-live-input-commit.ts +++ b/mobile/src/terminal/use-terminal-live-input-commit.ts @@ -133,7 +133,7 @@ export function useTerminalLiveInputCommit({ // that differs from the native field text, so the controlled capture must // echo the field verbatim; only the PTY mirror sees normalized text. setLiveInputCapture(nativeEvent.text) - applyLiveInputMirror( + void applyLiveInputMirror( activeHandle, normalizeTerminalTextInput(nativeEvent.text), nativeEvent.isComposing diff --git a/mobile/src/terminal/use-terminal-live-pending-input-flush.ts b/mobile/src/terminal/use-terminal-live-pending-input-flush.ts index c01aa5af213..ff0c09c1c51 100644 --- a/mobile/src/terminal/use-terminal-live-pending-input-flush.ts +++ b/mobile/src/terminal/use-terminal-live-pending-input-flush.ts @@ -30,7 +30,11 @@ type RunTerminalLiveMirrorStep = ( ) => Promise type TerminalLivePendingInputFlush = { - readonly applyLiveInputMirror: (handle: string, fieldText: string, composing?: boolean) => void + readonly applyLiveInputMirror: ( + handle: string, + fieldText: string, + composing?: boolean + ) => Promise readonly clearPendingLiveInputCommit: () => void readonly flushPendingLiveInputText: (expectedHandle: string | null) => Promise readonly heldLiveInputTextRef: RefObject @@ -153,9 +157,8 @@ export function useTerminalLivePendingInputFlush({ }, [runMirrorStep]) const applyLiveInputMirror = useCallback( - (handle: string, fieldText: string, composing?: boolean): void => { - void runMirrorStep(handle, fieldText, false, composing) - }, + (handle: string, fieldText: string, composing?: boolean): Promise => + runMirrorStep(handle, fieldText, false, composing), [runMirrorStep] )