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

Fix autocorrect onChangeText firing (#22691) #23666

Closed
wants to merge 3 commits into from
Closed

Fix autocorrect onChangeText firing (#22691) #23666

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bfa4fa
Fix autocorrect onChangeText firing (#22691)
ericlewis Feb 27, 2019
3a66142
Revert "Fix autocorrect onChangeText firing (#22691)"
ericlewis Feb 28, 2019
ff110f9
Clean-up
ericlewis Feb 28, 2019
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
42 changes: 11 additions & 31 deletions Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ @interface RCTBackedTextFieldDelegateAdapter () <UITextFieldDelegate>

@implementation RCTBackedTextFieldDelegateAdapter {
__weak UITextField<RCTBackedTextInputViewProtocol> *_backedTextInputView;
BOOL _textDidChangeIsComing;
UITextRange *_previousSelectedTextRange;
}

Expand Down Expand Up @@ -58,22 +57,12 @@ - (BOOL)textFieldShouldEndEditing:(__unused UITextField *)textField

- (void)textFieldDidEndEditing:(__unused UITextField *)textField
{
if (_textDidChangeIsComing) {
// iOS does't call `textViewDidChange:` delegate method if the change was happened because of autocorrection
// which was triggered by losing focus. So, we call it manually.
_textDidChangeIsComing = NO;
[_backedTextInputView.textInputDelegate textInputDidChange];
}

[_backedTextInputView.textInputDelegate textInputDidEndEditing];
}

- (BOOL)textField:(__unused UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
{
BOOL result = [_backedTextInputView.textInputDelegate textInputShouldChangeTextInRange:range replacementText:string];
if (result) {
_textDidChangeIsComing = YES;
}
return result;
}

Expand All @@ -86,9 +75,7 @@ - (BOOL)textFieldShouldReturn:(__unused UITextField *)textField

- (void)textFieldDidChange
{
_textDidChangeIsComing = NO;
[_backedTextInputView.textInputDelegate textInputDidChange];

// `selectedTextRangeWasSet` isn't triggered during typing.
[self textFieldProbablyDidChangeSelection];
}
Expand Down Expand Up @@ -136,12 +123,11 @@ - (void)textFieldProbablyDidChangeSelection

#pragma mark - RCTBackedTextViewDelegateAdapter (for UITextView)

@interface RCTBackedTextViewDelegateAdapter () <UITextViewDelegate>
@interface RCTBackedTextViewDelegateAdapter () <UITextViewDelegate, NSTextStorageDelegate>
@end

@implementation RCTBackedTextViewDelegateAdapter {
__weak UITextView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
BOOL _textDidChangeIsComing;
UITextRange *_previousSelectedTextRange;
}

Expand All @@ -150,11 +136,21 @@ - (instancetype)initWithTextView:(UITextView<RCTBackedTextInputViewProtocol> *)b
if (self = [super init]) {
_backedTextInputView = backedTextInputView;
backedTextInputView.delegate = self;
backedTextInputView.textStorage.delegate = self;
}

return self;
}

#pragma mark -
- (void)textStorage:(NSTextStorage *)textStorage
didProcessEditing:(__unused NSTextStorageEditActions)editedMask
range:(__unused NSRange)editedRange
changeInLength:(__unused NSInteger)delta {
[_backedTextInputView.textInputDelegate textInputDidChange];
Copy link
Contributor

Choose a reason for hiding this comment

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

I am worried a bit about over-firing. So, e.g. if only text attributes were changed, we don't want to send an event.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will check if this is the case & fix it if that does occur.

}


#pragma mark - UITextViewDelegate

- (BOOL)textViewShouldBeginEditing:(__unused UITextView *)textView
Expand All @@ -174,13 +170,6 @@ - (BOOL)textViewShouldEndEditing:(__unused UITextView *)textView

- (void)textViewDidEndEditing:(__unused UITextView *)textView
{
if (_textDidChangeIsComing) {
// iOS does't call `textViewDidChange:` delegate method if the change was happened because of autocorrection
// which was triggered by losing focus. So, we call it manually.
_textDidChangeIsComing = NO;
[_backedTextInputView.textInputDelegate textInputDidChange];
}

[_backedTextInputView.textInputDelegate textInputDidEndEditing];
}

Expand All @@ -196,18 +185,9 @@ - (BOOL)textView:(__unused UITextView *)textView shouldChangeTextInRange:(NSRang
}

BOOL result = [_backedTextInputView.textInputDelegate textInputShouldChangeTextInRange:range replacementText:text];
if (result) {
_textDidChangeIsComing = YES;
}
return result;
}

- (void)textViewDidChange:(__unused UITextView *)textView
{
_textDidChangeIsComing = NO;
[_backedTextInputView.textInputDelegate textInputDidChange];
}

- (void)textViewDidChangeSelection:(__unused UITextView *)textView
{
[self textViewProbablyDidChangeSelection];
Expand Down