Fix crash if set text and set selection at the same time.

Since text and selection has dependency, handle text selection in updateExtraData as well.
facebook · Dec 30, 2018 · 3984c27 · 3984c27
1 parent 386c2ec
commit 3984c27
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 13 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
@@ -26,6 +26,8 @@ public class ReactTextUpdate {
   private final float mPaddingBottom;
   private final int mTextAlign;
   private final int mTextBreakStrategy;
+  private final int mSelectionStart;
+  private final int mSelectionEnd;
 
   /**
    * @deprecated Use a non-deprecated constructor for ReactTextUpdate instead. This one remains
@@ -49,7 +51,9 @@ public ReactTextUpdate(
         paddingEnd,
         paddingBottom,
         textAlign,
-        Layout.BREAK_STRATEGY_HIGH_QUALITY);
+        Layout.BREAK_STRATEGY_HIGH_QUALITY,
+        -1,
+        -1);
   }
 
   public ReactTextUpdate(
@@ -62,6 +66,31 @@ public ReactTextUpdate(
     float paddingBottom,
     int textAlign,
     int textBreakStrategy) {
+    this(text,
+        jsEventCounter,
+        containsImages,
+        paddingStart,
+        paddingTop,
+        paddingEnd,
+        paddingBottom,
+        textAlign,
+        textBreakStrategy,
+        -1,
+        -1);
+  }
+
+  public ReactTextUpdate(
+    Spannable text,
+    int jsEventCounter,
+    boolean containsImages,
+    float paddingStart,
+    float paddingTop,
+    float paddingEnd,
+    float paddingBottom,
+    int textAlign,
+    int textBreakStrategy,
+    int selectionStart,
+    int selectionEnd) {
     mText = text;
     mJsEventCounter = jsEventCounter;
     mContainsImages = containsImages;
@@ -71,6 +100,8 @@ public ReactTextUpdate(
     mPaddingBottom = paddingBottom;
     mTextAlign = textAlign;
     mTextBreakStrategy = textBreakStrategy;
+    mSelectionStart = selectionStart;
+    mSelectionEnd = selectionEnd;
   }
 
   public Spannable getText() {
@@ -108,4 +139,12 @@ public int getTextAlign() {
   public int getTextBreakStrategy() {
     return mTextBreakStrategy;
   }
+
+  public int getSelectionStart() {
+    return mSelectionStart;
+  }
+
+  public int getSelectionEnd() {
+    return mSelectionEnd;
+  }
 }
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
@@ -199,6 +199,8 @@ public void updateExtraData(ReactEditText view, Object extraData) {
         TextInlineImageSpan.possiblyUpdateInlineImageSpans(spannable, view);
       }
       view.maybeSetText(update);
+      if (update.getSelectionStart() != UNSET && update.getSelectionEnd() != UNSET)
+        view.setSelection(update.getSelectionStart(), update.getSelectionEnd());
     }
   }
 
@@ -268,17 +270,6 @@ public void setFontStyle(ReactEditText view, @Nullable String fontStyleString) {
     }
   }
 
-  @ReactProp(name = "selection")
-  public void setSelection(ReactEditText view, @Nullable ReadableMap selection) {
-    if (selection == null) {
-      return;
-    }
-
-    if (selection.hasKey("start") && selection.hasKey("end")) {
-      view.setSelection(selection.getInt("start"), selection.getInt("end"));
-    }
-  }
-
   @ReactProp(name = "onSelectionChange", defaultBoolean = false)
   public void setOnSelectionChange(final ReactEditText view, boolean onSelectionChange) {
     if (onSelectionChange) {

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
@@ -42,10 +42,13 @@ public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
 
   @VisibleForTesting public static final String PROP_TEXT = "text";
   @VisibleForTesting public static final String PROP_PLACEHOLDER = "placeholder";
+  @VisibleForTesting public static final String PROP_SELECTION = "selection";
 
   // Represents the {@code text} property only, not possible nested content.
   private @Nullable String mText = null;
   private @Nullable String mPlaceholder = null;
+  private int mSelectionStart = UNSET;
+  private int mSelectionEnd = UNSET;
 
   public ReactTextInputShadowNode() {
     mTextBreakStrategy = (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ?
@@ -172,6 +175,19 @@ public void setPlaceholder(@Nullable String placeholder) {
     return mPlaceholder;
   }
 
+  @ReactProp(name = PROP_SELECTION)
+  public void setSelection(@Nullable ReadableMap selection) {
+    mSelectionStart = mSelectionEnd = UNSET;
+    if (selection == null)
+      return;
+
+    if (selection.hasKey("start") && selection.hasKey("end")) {
+      mSelectionStart = selection.getInt("start");
+      mSelectionEnd = selection.getInt("end");
+      markUpdated();
+    }
+  }
+
   @Override
   public void setTextBreakStrategy(@Nullable String textBreakStrategy) {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
@@ -204,7 +220,9 @@ public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
               getPadding(Spacing.RIGHT),
               getPadding(Spacing.BOTTOM),
               mTextAlign,
-              mTextBreakStrategy);
+              mTextBreakStrategy,
+              mSelectionStart,
+              mSelectionEnd);
       uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), reactTextUpdate);
     }
   }