Skip to content
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.

Sign up for GitHub

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

Add isComposing check to EditableText toggleEdit #7021

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Add isComposing check to EditableText toggleEdit #7021

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf0d13e
Add isComposing check to EditableText toggleEdit
Oct 21, 2024
103571c
Fix isComposing check
Oct 21, 2024
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
2 changes: 1 addition & 1 deletion packages/core/src/components/editable-text/editableText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ export class EditableText extends AbstractPureComponent<EditableTextProps, Edita
}

const hasModifierKey = altKey || ctrlKey || metaKey || shiftKey;
if (event.key === "Enter") {
if (event.key === "Enter" && !event.nativeEvent.isComposing) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we actually need to do this earlier, before we handle escape. Normally, at least on macOS, pressing escape while composing cancels the current sequence. Both with and without this change, it cancels the entire edit, i.e. everything that was changed will be abandoned, instead of just the current sequence discarded and other changes and editing mode preserved.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey you're right that maybe we should not escape when the IME is composing, but in my understanding people don't usually press escape during typing. Personally, I would expect to escape even when composing

// prevent browsers (Edge?) from full screening with alt + enter
// shift + enter adds a newline by default
if (altKey || shiftKey) {
Expand Down