From 892212bad2daadd373f4be241e4cd9889b0a1005 Mon Sep 17 00:00:00 2001 From: Mehdi Mulani Date: Mon, 30 Jul 2018 07:54:19 -0700 Subject: [PATCH] Fix controlled on iOS when inputting in Chinese/Japanese MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: @public This should fix #18403. When the user is inputting in Chinese/Japanese with in a controlled manner, the RCTBaseTextInputView will compare the JS-generated attributed string against the TextInputView attributed string and repeatedly overwrite the TextInputView one. This is because the native TextInputView will provide extra styling to show that some text is provisional. My solution is to do a plain text string comparison at this point, like how we do for dictation. Expected behavior when typing in a language that has "multistage" text input: For instance, in Chinese/Japanese it's common to type out the pronunciation for a word and then choose the appropriate word from above the keyboard. In this model, the "pronunciation" shows up in the text box first and then is replaced with the chosen word. Using the word Japan which is written 日本 but first typed as にほん. It takes 4 key-presses to get to 日本, since に, ほ, ん, are all typed and then 日本 is selected. So here is what should happen: 1. enter に, onChange fires with 'に', markedTextRange covers 'に' 2. enter ほ, onChange fires with 'にほ', markedTextRange covers 'にほ' 3. enter ん, onChange fires with 'にほん', markedTextRange covers 'にほん' 4. user selects 日本 from the menu above the keyboard (provided by the keyboard/OS), onChange fires with '日本', markedTextRange is removed previously we were overwriting the attributed text which would remove the markedTextRange, preventing the user from selecting 日本 from above the keyboard. Cheekily, I've also fixed an issue with secure text entry as it's the same type of problem. Reviewed By: PeteTheHeat Differential Revision: D9002295 fbshipit-source-id: 7304ede055f301dab9ce1ea70f65308f2a4b4a8f --- .../Text/TextInput/RCTBaseTextInputView.m | 18 ++++-- RNTester/js/TextInputExample.ios.js | 60 +++++++++++++++---- 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m index 0d085c19cac616..88798f42a61c3b 100644 --- a/Libraries/Text/TextInput/RCTBaseTextInputView.m +++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m @@ -99,11 +99,19 @@ - (NSAttributedString *)attributedText } - (BOOL)textOf:(NSAttributedString*)newText equals:(NSAttributedString*)oldText{ - UITextInputMode *currentInputMode = self.backedTextInputView.textInputMode; - if ([currentInputMode.primaryLanguage isEqualToString:@"dictation"]) { - // When the dictation is running we can't update the attibuted text on the backed up text view - // because setting the attributed string will kill the dictation. This means that we can't impose - // the settings on a dictation. + // When the dictation is running we can't update the attibuted text on the backed up text view + // because setting the attributed string will kill the dictation. This means that we can't impose + // the settings on a dictation. + // Similarly, when the user is in the middle of inputting some text in Japanese/Chinese, there will be styling on the + // text that we should disregard. See https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc + // for more info. + // Lastly, when entering a password, etc., there will be additional styling on the field as the native text view + // handles showing the last character for a split second. + BOOL shouldFallbackToBareTextComparison = + [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] || + self.backedTextInputView.markedTextRange || + self.backedTextInputView.isSecureTextEntry; + if (shouldFallbackToBareTextComparison) { return ([newText.string isEqualToString:oldText.string]); } else { return ([newText isEqualToAttributedString:oldText]); diff --git a/RNTester/js/TextInputExample.ios.js b/RNTester/js/TextInputExample.ios.js index d536d46d8b235c..39fc77f82ee68c 100644 --- a/RNTester/js/TextInputExample.ios.js +++ b/RNTester/js/TextInputExample.ios.js @@ -173,6 +173,48 @@ class RewriteExampleInvalidCharacters extends React.Component< } } +class RewriteExampleKana extends React.Component<$FlowFixMeProps, any> { + constructor(props) { + super(props); + this.state = {text: ''}; + } + render() { + return ( + + { + this.setState({text: text.replace(/ひ/g, '日')}); + }} + style={styles.default} + value={this.state.text} + /> + + ); + } +} + +class SecureEntryExample extends React.Component<$FlowFixMeProps, any> { + constructor(props) { + super(props); + this.state = {text: ''}; + } + render() { + return ( + + this.setState({text})} + value={this.state.text} + /> + Current text is: {this.state.text} + + ); + } +} + class TokenizedTextExample extends React.Component<$FlowFixMeProps, any> { constructor(props) { super(props); @@ -524,6 +566,12 @@ exports.examples = [ return ; }, }, + { + title: 'Live Re-Write (ひ -> 日)', + render: function() { + return ; + }, + }, { title: 'Keyboard Accessory View', render: function() { @@ -677,17 +725,7 @@ exports.examples = [ { title: 'Secure text entry', render: function() { - return ( - - - - - - ); + return ; }, }, {