Skip to content

Fix onSubmitEditing firing on delete/tab #442

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

Merged
merged 2 commits into from
Jun 17, 2020
Merged

Fix onSubmitEditing firing on delete/tab #442

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6430230
Fix onSubmitEditing firing on delete/tab
tido64 Jun 10, 2020
5deabb0
Submit only on ⌘+Enter
tido64 Jun 10, 2020
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
21 changes: 14 additions & 7 deletions Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@

static void *TextFieldSelectionObservingContext = &TextFieldSelectionObservingContext;

#if TARGET_OS_OSX // [TODO(macOS ISS#2323203)
BOOL RCTEventIsCommandEnterEvent(NSEvent *event) {
NSEventModifierFlags modifierFlags = event.modifierFlags & NSEventModifierFlagDeviceIndependentFlagsMask;
return (modifierFlags & NSEventModifierFlagCommand) == NSEventModifierFlagCommand && event.keyCode == 0x24;
}
#endif // ]TODO(macOS ISS#2323203)

@interface RCTBackedTextFieldDelegateAdapter ()
#if !TARGET_OS_OSX // [TODO(macOS ISS#2323203)
<UITextFieldDelegate>
Expand Down Expand Up @@ -275,18 +282,16 @@ - (void)textViewDidEndEditing:(__unused UITextView *)textView

- (BOOL)textView:(__unused UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
{
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
// Custom implementation of `textInputShouldReturn` and `textInputDidReturn` pair for `UITextView`.
if (!_backedTextInputView.textWasPasted && [text isEqualToString:@"\n"]) {
if ([_backedTextInputView.textInputDelegate textInputShouldReturn]) {
[_backedTextInputView.textInputDelegate textInputDidReturn];
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
[_backedTextInputView endEditing:NO];
#else // [TODO(macOS ISS#2323203)
[[_backedTextInputView window] endEditingFor:nil];
#endif // ]TODO(macOS ISS#2323203)
return NO;
}
}
#endif // ]TODO(macOS ISS#2323203)

BOOL result = [_backedTextInputView.textInputDelegate textInputShouldChangeTextInRange:range replacementText:text];
if (result) {
Expand Down Expand Up @@ -352,9 +357,11 @@ - (BOOL)textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector
{
BOOL commandHandled = NO;
id<RCTBackedTextInputDelegate> textInputDelegate = [_backedTextInputView textInputDelegate];
// enter/return
if (textInputDelegate.textInputShouldReturn && (commandSelector == @selector(insertNewline:) || commandSelector == @selector(insertNewlineIgnoringFieldEditor:))) {
[_backedTextInputView.window makeFirstResponder:nil];
// cmd + enter/return
if (commandSelector == @selector(noop:) && RCTEventIsCommandEnterEvent(NSApp.currentEvent)) {
if (textInputDelegate.textInputShouldReturn) {
[_backedTextInputView.window makeFirstResponder:nil];
}
commandHandled = YES;
//backspace
} else if (commandSelector == @selector(deleteBackward:)) {
Expand Down