-
Notifications
You must be signed in to change notification settings - Fork 52.6k
fix(desktop): guard composer Enter during IME candidate confirmation #40015
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
1525164075
wants to merge
1
commit into
NousResearch:main
from
1525164075:fix/desktop-ime-enter-composer
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { describe, expect, it } from 'vitest' | ||
|
|
||
| import { shouldLetImeHandleKeyDown } from './ime-keyboard' | ||
|
|
||
| describe('shouldLetImeHandleKeyDown', () => { | ||
| it('lets the IME consume Enter while native composition is active', () => { | ||
| expect(shouldLetImeHandleKeyDown({ key: 'Enter', isComposing: true })).toBe(true) | ||
| }) | ||
|
|
||
| it('lets the IME consume Enter for Process-key candidate confirmation', () => { | ||
| expect(shouldLetImeHandleKeyDown({ key: 'Process', isComposing: false })).toBe(true) | ||
| }) | ||
|
|
||
| it('lets the IME consume Enter for keyCode 229 candidate confirmation', () => { | ||
| expect(shouldLetImeHandleKeyDown({ key: 'Enter', keyCode: 229, isComposing: false })).toBe(true) | ||
| }) | ||
|
|
||
| it('lets the IME consume Enter for which 229 candidate confirmation', () => { | ||
| expect(shouldLetImeHandleKeyDown({ key: 'Enter', which: 229, isComposing: false })).toBe(true) | ||
| }) | ||
|
|
||
| it('does not treat normal Enter as IME input', () => { | ||
| expect(shouldLetImeHandleKeyDown({ key: 'Enter', keyCode: 13, isComposing: false })).toBe(false) | ||
| }) | ||
| }) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| export interface ImeKeyboardEventLike { | ||
| isComposing?: boolean | ||
| key?: string | ||
| keyCode?: number | ||
| which?: number | ||
| } | ||
|
|
||
| export function shouldLetImeHandleKeyDown(event: ImeKeyboardEventLike): boolean { | ||
| return Boolean(event.isComposing || event.key === 'Process' || event.keyCode === 229 || event.which === 229) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This verifies only the pure helper. Please add a DOM-level regression that drives the composer keydown path and asserts a 229/Process candidate-confirmation event cannot submit or select a trigger item.