[iOS] Resubmit facebook#24714 and fixes kvo crash

zhongwuzw · May 14, 2019 · fc3a1f8 · fc3a1f8
1 parent de0d7cf
commit fc3a1f8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)skipNextTextInputDidChangeSelectionEventWithTextRange:(UITextRange *)textRange;
 - (void)selectedTextRangeWasSet;
+- (void)cleanupWithTextField:(UITextField<RCTBackedTextInputViewProtocol> *)backedTextInputView;
 
 @end
 

diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
@@ -28,15 +28,27 @@ - (instancetype)initWithTextField:(UITextField<RCTBackedTextInputViewProtocol> *
 
     [_backedTextInputView addTarget:self action:@selector(textFieldDidChange) forControlEvents:UIControlEventEditingChanged];
     [_backedTextInputView addTarget:self action:@selector(textFieldDidEndEditingOnExit) forControlEvents:UIControlEventEditingDidEndOnExit];
+    [_backedTextInputView addObserver:self forKeyPath:@"selectedTextRange" options:NSKeyValueObservingOptionNew context:NULL];
   }
 
   return self;
 }
 
-- (void)dealloc
+- (void)cleanupWithTextField:(UITextField<RCTBackedTextInputViewProtocol> *)backedTextInputView
 {
-  [_backedTextInputView removeTarget:self action:nil forControlEvents:UIControlEventEditingChanged];
-  [_backedTextInputView removeTarget:self action:nil forControlEvents:UIControlEventEditingDidEndOnExit];
+  [backedTextInputView removeTarget:self action:nil forControlEvents:UIControlEventEditingChanged];
+  [backedTextInputView removeTarget:self action:nil forControlEvents:UIControlEventEditingDidEndOnExit];
+  [backedTextInputView removeObserver:self forKeyPath:@"selectedTextRange"];
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+  // UITextField doesn't have a delegate like UITextView to get notified on selection. Use KVO to observe changes.
+  if ([keyPath isEqualToString:@"selectedTextRange"]) {
+    [self textFieldProbablyDidChangeSelection];
+  } else {
+    [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+  }
 }
 
 #pragma mark - UITextFieldDelegate

diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
@@ -35,6 +35,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 - (void)dealloc
 {
+  [_textInputDelegateAdapter cleanupWithTextField:self];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN @@
     - (void)skipNextTextInputDidChangeSelectionEventWithTextRange:(UITextRange *)textRange;
     - (void)selectedTextRangeWasSet;
+    - (void)cleanupWithTextField:(UITextField<RCTBackedTextInputViewProtocol> *)backedTextInputView;
     @end
@@ Expand Down @@