[TextInput] Fix macOS support for setting selection

microsoft · Oct 8, 2020 · 8a20e2c · 8a20e2c
1 parent 45f680f
commit 8a20e2c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -235,7 +235,7 @@ - (void)setSelection:(RCTTextSelection *)selection
 - (void)setSelectionStart:(NSInteger)start
              selectionEnd:(NSInteger)end
 {
-#if !TARGET_OS_OSX // [TODO(macOS v0.63)
+#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
   UITextPosition *startPosition = [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument
                                                                           offset:start];
   UITextPosition *endPosition = [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument
@@ -244,7 +244,11 @@ - (void)setSelectionStart:(NSInteger)start
     UITextRange *range = [self.backedTextInputView textRangeFromPosition:startPosition toPosition:endPosition];
     [self.backedTextInputView setSelectedTextRange:range notifyDelegate:NO];
   }
-#endif // ]TODO(macOS v0.63)
+#else // [TODO(macOS ISS#2323203)
+  NSInteger startPosition = MIN(start, end);
+  NSInteger endPosition = MAX(start, end);
+  [self.backedTextInputView setSelectedTextRange:NSMakeRange(startPosition, endPosition - startPosition) notifyDelegate:NO];
+#endif // ]TODO(macOS ISS#2323203)
 }
 
 - (void)setTextContentType:(NSString *)type