Merge pull request facebook#49 from perunt/cursor-position-x-y

Cursor position
fabioh8010 · Apr 24, 2023 · 2d5847c · 2d5847c
2 parents 33ce1f4 + 7abd47e
commit 2d5847c
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 8 deletions.
diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.m b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -184,7 +184,8 @@ - (RCTTextSelection *)selection
       initWithStart:[backedTextInputView offsetFromPosition:backedTextInputView.beginningOfDocument
                                                  toPosition:selectedTextRange.start]
                 end:[backedTextInputView offsetFromPosition:backedTextInputView.beginningOfDocument
-                                                 toPosition:selectedTextRange.end]];
+                                                 toPosition:selectedTextRange.end]
+   cursorPosition:[backedTextInputView caretRectForPosition:selectedTextRange.start].origin];
 }
 
 - (void)setSelection:(RCTTextSelection *)selection
@@ -519,6 +520,8 @@ - (void)textInputDidChangeSelection
     @"selection" : @{
       @"start" : @(selection.start),
       @"end" : @(selection.end),
+      @"positionY": @(selectionOrigin.y),
+      @"positionX": @(selectionOrigin.x),
     },
   });
 }

diff --git a/packages/react-native/Libraries/Text/TextInput/RCTTextSelection.h b/packages/react-native/Libraries/Text/TextInput/RCTTextSelection.h
@@ -14,8 +14,9 @@
 
 @property (nonatomic, assign, readonly) NSInteger start;
 @property (nonatomic, assign, readonly) NSInteger end;
+@property (nonatomic, assign, readonly) CGPoint cursorPosition;
 
-- (instancetype)initWithStart:(NSInteger)start end:(NSInteger)end;
+- (instancetype)initWithStart:(NSInteger)start end:(NSInteger)end cursorPosition:(CGPoint)cursorPosition;
 
 @end
 

diff --git a/packages/react-native/Libraries/Text/TextInput/RCTTextSelection.m b/packages/react-native/Libraries/Text/TextInput/RCTTextSelection.m
@@ -9,11 +9,12 @@
 
 @implementation RCTTextSelection
 
-- (instancetype)initWithStart:(NSInteger)start end:(NSInteger)end
+- (instancetype)initWithStart:(NSInteger)start end:(NSInteger)end cursorPosition:(CGPoint)cursorPosition
 {
   if (self = [super init]) {
     _start = start;
     _end = end;
+    _cursorPosition = cursorPosition;
   }
   return self;
 }
@@ -27,7 +28,13 @@ + (RCTTextSelection *)RCTTextSelection:(id)json
   if ([json isKindOfClass:[NSDictionary class]]) {
     NSInteger start = [self NSInteger:json[@"start"]];
     NSInteger end = [self NSInteger:json[@"end"]];
-    return [[RCTTextSelection alloc] initWithStart:start end:end];
+    CGPoint cursorPosition = CGPointMake(
+      [self CGFloat:json[@"cursorPositionX"]],
+      [self CGFloat:json[@"cursorPositionY"]]
+    );
+    return [[RCTTextSelection alloc] initWithStart:start
+                                               end:end 
+                                    cursorPosition:cursorPosition];
   }
 
   return nil;

diff --git a/.../ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/.../ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -81,6 +81,7 @@
 import java.util.LinkedList;
 import java.util.Locale;
 import java.util.Map;
+import android.view.ViewTreeObserver;
 
 /** Manages instances of TextInput. */
 @ReactModule(name = ReactTextInputManager.REACT_CLASS)
@@ -1240,6 +1241,26 @@ public ReactSelectionWatcher(ReactEditText editText) {
 
     @Override
     public void onSelectionChanged(int start, int end) {
+      // Calculate cursor position
+      Layout layout = mReactEditText.getLayout();
+
+      // Wait for the TextInput to mount, if needed
+      if (layout == null) {
+        mReactEditText.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+          @Override
+          public void onGlobalLayout() {
+            mReactEditText.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+            onSelectionChanged(start, end);
+          }
+        });
+        return;
+        }
+
+      int line = layout.getLineForOffset(start);
+      int baseline = layout.getLineBaseline(line);
+      int ascent = layout.getLineAscent(line);
+      float cursorPositionX = layout.getPrimaryHorizontal(start);
+      float cursorPositionY = baseline + ascent;
       // Android will call us back for both the SELECTION_START span and SELECTION_END span in text
       // To prevent double calling back into js we cache the result of the previous call and only
       // forward it on if we have new values
@@ -1252,7 +1273,12 @@ public void onSelectionChanged(int start, int end) {
       if (mPreviousSelectionStart != realStart || mPreviousSelectionEnd != realEnd) {
         mEventDispatcher.dispatchEvent(
             new ReactTextInputSelectionEvent(
-                mSurfaceId, mReactEditText.getId(), realStart, realEnd));
+                mSurfaceId,
+                mReactEditText.getId(),
+                realStart,
+                realEnd,
+                Math.round(PixelUtil.toDIPFromPixel(cursorPositionX)),
+                Math.round(PixelUtil.toDIPFromPixel(cursorPositionY))));
 
         mPreviousSelectionStart = realStart;
         mPreviousSelectionEnd = realEnd;

diff --git a/...ndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java b/...ndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
@@ -19,17 +19,31 @@
 
   private int mSelectionStart;
   private int mSelectionEnd;
+  private float mCursorPositionX;
+  private float mCursorPositionY;
 
   @Deprecated
-  public ReactTextInputSelectionEvent(int viewId, int selectionStart, int selectionEnd) {
-    this(-1, viewId, selectionStart, selectionEnd);
+  public ReactTextInputSelectionEvent(
+      int viewId,
+      int selectionStart,
+      int selectionEnd,
+      float cursorPositionX,
+      float cursorPositionY) {
+    this(-1, viewId, selectionStart, selectionEnd, cursorPositionX, cursorPositionY);
   }
 
   public ReactTextInputSelectionEvent(
-      int surfaceId, int viewId, int selectionStart, int selectionEnd) {
+      int surfaceId,
+      int viewId,
+      int selectionStart,
+      int selectionEnd,
+      float cursorPositionX,
+      float cursorPositionY) {
     super(surfaceId, viewId);
     mSelectionStart = selectionStart;
     mSelectionEnd = selectionEnd;
+    mCursorPositionX = cursorPositionX;
+    mCursorPositionY = cursorPositionY;
   }
 
   @Override
@@ -45,6 +59,8 @@ protected WritableMap getEventData() {
     WritableMap selectionData = Arguments.createMap();
     selectionData.putInt("end", mSelectionEnd);
     selectionData.putInt("start", mSelectionStart);
+    selectionData.putDouble("cursorPositionX", mCursorPositionX);
+    selectionData.putDouble("cursorPositionY", mCursorPositionY);
 
     eventData.putMap("selection", selectionData);
     return eventData;