Skip to content

Commit

Permalink
Apply the fix for CJK languages on single-line text fields. (#22546)
Browse files Browse the repository at this point in the history
Summary:
Follow-up to #19809

This fix generalizes the `setAttributedString:` fix to single-line text fields.

Fixes #19339

_Pull requests that expand test coverage are more likely to get reviewed. Add a test case whenever possible!_
Pull Request resolved: #22546

Differential Revision: D13948951

Pulled By: shergin

fbshipit-source-id: 67992c02b32f33f6d61fac4554e4f46b973262c1
  • Loading branch information
mandrigin authored and facebook-github-bot committed Feb 4, 2019
1 parent 8ae1852 commit 05ebf77
Showing 1 changed file with 45 additions and 0 deletions.
45 changes: 45 additions & 0 deletions Libraries/Text/TextInput/Singleline/RCTUITextField.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

@implementation RCTUITextField {
RCTBackedTextFieldDelegateAdapter *_textInputDelegateAdapter;
NSMutableAttributedString *_attributesHolder;
}

- (instancetype)initWithFrame:(CGRect)frame
Expand All @@ -25,6 +26,7 @@ - (instancetype)initWithFrame:(CGRect)frame
object:self];

_textInputDelegateAdapter = [[RCTBackedTextFieldDelegateAdapter alloc] initWithTextField:self];
_attributesHolder = [[NSMutableAttributedString alloc] init];
}

return self;
Expand Down Expand Up @@ -107,6 +109,49 @@ - (CGRect)caretRectForPosition:(UITextPosition *)position
return [super caretRectForPosition:position];
}

#pragma mark - Fix for CJK Languages

/*
* The workaround to fix inputting complex locales (like CJK languages).
* When we use `setAttrbutedText:` while user is inputting text in a complex
* locale (like Chinese, Japanese or Korean), some internal state breaks and
* input stops working.
*
* To workaround that, we don't skip underlying attributedString in the text
* field if only attributes were changed. We keep track of these attributes in
* a local variable.
*
* There are two methods that are altered by this workaround:
*
* (1) `-setAttributedText:`
* Applies the attributed string change to a local variable `_attributesHolder` instead of calling `-[super setAttributedText:]`.
* If new attributed text differs from the existing one only in attributes,
* skips `-[super setAttributedText:`] completely.
*
* (2) `-attributedText`
* Return `_attributesHolder` context.
* Updates `_atributesHolder` before returning if the underlying `super.attributedText.string` was changed.
*
*/
- (void)setAttributedText:(NSAttributedString *)attributedText
{
BOOL textWasChanged = ![_attributesHolder.string isEqualToString:attributedText.string];
[_attributesHolder setAttributedString:attributedText];

if (textWasChanged) {
[super setAttributedText:attributedText];
}
}

- (NSAttributedString *)attributedText
{
if (![super.attributedText.string isEqualToString:_attributesHolder.string]) {
[_attributesHolder setAttributedString:super.attributedText];
}

return _attributesHolder;
}

#pragma mark - Positioning Overrides

- (CGRect)textRectForBounds:(CGRect)bounds
Expand Down

0 comments on commit 05ebf77

Please sign in to comment.