Merge pull request #3 from CHANOMA/feature/fix_textinput_bugs

Apply facebook#18456 Fix controlled TextInput for Chinese (and other languages)
CHANOMA · Mar 23, 2018 · 57819bb · 57819bb
2 parents d53747f + 169a025
commit 57819bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
@@ -25,6 +25,7 @@ @implementation RCTBaseTextInputShadowView
   NSAttributedString *_Nullable _localAttributedText;
   CGSize _previousContentSize;
 
+  NSString *_text;
   NSTextStorage *_textStorage;
   NSTextContainer *_textContainer;
   NSLayoutManager *_layoutManager;
@@ -97,6 +98,17 @@ - (void)invalidateContentSize
   });
 }
 
+- (NSString *)text
+{
+  return _text;
+}
+
+- (void)setText:(NSString *)text
+{
+  _text = text;
+  _previousAttributedText = _localAttributedText;
+}
+
 #pragma mark - RCTUIManagerObserver
 
 - (void)uiManagerWillPerformMounting

diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -311,7 +311,7 @@ - (void)textInputDidChange
 
   _nativeEventCount++;
 
-  if (_onChange) {
+  if (_onChange && backedTextInputView.markedTextRange == nil) {
     _onChange(@{
        @"text": self.attributedText.string,
        @"target": self.reactTag,