Fix selectionColor doesn't style Android TextInput selection handles

ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java

@@ -110,6 +110,15 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
  private static final String KEYBOARD_TYPE_VISIBLE_PASSWORD = "visible-password";
  private static final InputFilter[] EMPTY_FILTERS = new InputFilter[0];
  private static final int UNSET = -1;
+ private static final String[] DRAWABLE_FIELDS = {
+ "mCursorDrawable", "mSelectHandleLeft", "mSelectHandleRight", "mSelectHandleCenter"
+ };
+ private static final String[] DRAWABLE_RESOURCES = {
+ "mCursorDrawableRes",
+ "mTextSelectHandleLeftRes",
+ "mTextSelectHandleRightRes",
+ "mTextSelectHandleRes"
+ };
 
  protected @Nullable ReactTextViewManagerCallback mReactTextViewManagerCallback;
 
@@ -446,34 +455,40 @@ public void setCursorColor(ReactEditText view, @Nullable Integer color) {
  }
 
  // The evil code that follows uses reflection to achieve this on Android 8.1 and below.
- // Based on
- // http://stackoverflow.com/questions/25996032/how-to-change-programatically-edittext-cursor-color-in-android.
- try {
- // Get the original cursor drawable resource.
- Field cursorDrawableResField = TextView.class.getDeclaredField("mCursorDrawableRes");
- cursorDrawableResField.setAccessible(true);
- int drawableResId = cursorDrawableResField.getInt(view);
-
- // The view has no cursor drawable.
- if (drawableResId == 0) {
- return;
- }
+ // Based on https://tinyurl.com/3vff8lyu https://tinyurl.com/vehggzs9
+ for (int i = 0; i < DRAWABLE_RESOURCES.length; i++) {
+ try {
+ Field drawableResourceField = TextView.class.getDeclaredField(DRAWABLE_RESOURCES[i]);
+ drawableResourceField.setAccessible(true);
+ int resourceId = drawableResourceField.getInt(view);
 
- Drawable drawable = ContextCompat.getDrawable(view.getContext(), drawableResId);
- drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
- Drawable[] drawables = {drawable, drawable};
-
- // Update the current cursor drawable with the new one.
- Field editorField = TextView.class.getDeclaredField("mEditor");
- editorField.setAccessible(true);
- Object editor = editorField.get(view);
- Field cursorDrawableField = editor.getClass().getDeclaredField("mCursorDrawable");
- cursorDrawableField.setAccessible(true);
- cursorDrawableField.set(editor, drawables);
- } catch (NoSuchFieldException ex) {
- // Ignore errors to avoid crashing if these private fields don't exist on modified
- // or future android versions.
- } catch (IllegalAccessException ex) {
+ // The view has no cursor drawable.
+ if (resourceId == 0) {
+ return;
+ }
+
+ Drawable drawable = ContextCompat.getDrawable(view.getContext(), resourceId);
+
+ Drawable drawableCopy = drawable.mutate();
+ drawableCopy.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+
+ Field editorField = TextView.class.getDeclaredField("mEditor");
+ editorField.setAccessible(true);
+ Object editor = editorField.get(view);
+
+ Field cursorDrawableField = editor.getClass().getDeclaredField(DRAWABLE_FIELDS[i]);
+ cursorDrawableField.setAccessible(true);
+ if (DRAWABLE_RESOURCES[i] == "mCursorDrawableRes") {
+ Drawable[] drawables = {drawableCopy, drawableCopy};
+ cursorDrawableField.set(editor, drawables);
+ } else {
+ cursorDrawableField.set(editor, drawableCopy);
+ }
+ } catch (NoSuchFieldException ex) {
+ // Ignore errors to avoid crashing if these private fields don't exist on modified
+ // or future android versions.
+ } catch (IllegalAccessException ex) {
+ }
  }
  }