react-native-tvos 0.73.7-1 → 0.74.0-0

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

@@ -25,7 +25,6 @@ import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextWatcher;
 import android.view.Gravity;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
@@ -70,10 +69,10 @@ import com.facebook.react.views.text.ReactTextUpdate;
 import com.facebook.react.views.text.ReactTextViewManagerCallback;
 import com.facebook.react.views.text.ReactTypefaceUtils;
 import com.facebook.react.views.text.TextAttributeProps;
-import com.facebook.react.views.text.TextInlineImageSpan;
 import com.facebook.react.views.text.TextLayoutManager;
 import com.facebook.react.views.text.TextLayoutManagerMapBuffer;
 import com.facebook.react.views.text.TextTransform;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 import com.facebook.yoga.YogaConstants;
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -168,14 +167,11 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   private static final String KEYBOARD_TYPE_URI = "url";
   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_HANDLE_RESOURCES = {
+    "mTextSelectHandleLeftRes", "mTextSelectHandleRightRes", "mTextSelectHandleRes"
   };
-  private static final String[] DRAWABLE_RESOURCES = {
-    "mCursorDrawableRes",
-    "mTextSelectHandleLeftRes",
-    "mTextSelectHandleRightRes",
-    "mTextSelectHandleRes"
+  private static final String[] DRAWABLE_HANDLE_FIELDS = {
+    "mSelectHandleLeft", "mSelectHandleRight", "mSelectHandleCenter"
   };
 
   protected @Nullable ReactTextViewManagerCallback mReactTextViewManagerCallback;
@@ -386,6 +382,11 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     }
   }
 
+  @ReactProp(name = ViewProps.LINE_HEIGHT, defaultFloat = ViewDefaults.LINE_HEIGHT)
+  public void setLineHeight(ReactEditText view, int lineHeight) {
+    view.setLineHeight(lineHeight);
+  }
+
   @ReactProp(name = ViewProps.FONT_SIZE, defaultFloat = ViewDefaults.FONT_SIZE_SP)
   public void setFontSize(ReactEditText view, float fontSize) {
     view.setFontSize(fontSize);
@@ -524,70 +525,124 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     } else {
       view.setHighlightColor(color);
     }
-
-    setCursorColor(view, color);
   }
 
-  @ReactProp(name = "cursorColor", customType = "Color")
-  public void setCursorColor(ReactEditText view, @Nullable Integer color) {
-    if (color == null) {
-      return;
-    }
-
+  @ReactProp(name = "selectionHandleColor", customType = "Color")
+  public void setSelectionHandleColor(ReactEditText view, @Nullable Integer color) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      Drawable cursorDrawable = view.getTextCursorDrawable();
-      if (cursorDrawable != null) {
-        cursorDrawable.setColorFilter(new BlendModeColorFilter(color, BlendMode.SRC_IN));
-        view.setTextCursorDrawable(cursorDrawable);
+      Drawable drawableCenter = view.getTextSelectHandle().mutate();
+      Drawable drawableLeft = view.getTextSelectHandleLeft().mutate();
+      Drawable drawableRight = view.getTextSelectHandleRight().mutate();
+      if (color != null) {
+        BlendModeColorFilter filter = new BlendModeColorFilter(color, BlendMode.SRC_IN);
+        drawableCenter.setColorFilter(filter);
+        drawableLeft.setColorFilter(filter);
+        drawableRight.setColorFilter(filter);
+      } else {
+        drawableCenter.clearColorFilter();
+        drawableLeft.clearColorFilter();
+        drawableRight.clearColorFilter();
       }
+      view.setTextSelectHandle(drawableCenter);
+      view.setTextSelectHandleLeft(drawableLeft);
+      view.setTextSelectHandleRight(drawableRight);
       return;
     }
 
+    // Based on https://github.com/facebook/react-native/pull/31007
     if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
-      // Pre-Android 10, there was no supported API to change the cursor color programmatically.
-      // In Android 9.0, they changed the underlying implementation,
-      // but also "dark greylisted" the new field, rendering it unusable.
       return;
     }
 
-    // The evil code that follows uses reflection to achieve this on Android 8.1 and below.
-    // Based on https://tinyurl.com/3vff8lyu https://tinyurl.com/vehggzs9
-    for (int i = 0; i < DRAWABLE_RESOURCES.length; i++) {
+    // The following code uses reflection to change handles color on Android 8.1 and below.
+    for (int i = 0; i < DRAWABLE_HANDLE_RESOURCES.length; i++) {
       try {
-        Field drawableResourceField = TextView.class.getDeclaredField(DRAWABLE_RESOURCES[i]);
+        Field drawableResourceField =
+            view.getClass().getDeclaredField(DRAWABLE_HANDLE_RESOURCES[i]);
         drawableResourceField.setAccessible(true);
         int resourceId = drawableResourceField.getInt(view);
 
-        // The view has no cursor drawable.
+        // The view has no handle drawable.
         if (resourceId == 0) {
           return;
         }
 
-        Drawable drawable = ContextCompat.getDrawable(view.getContext(), resourceId);
-
-        Drawable drawableCopy = drawable.mutate();
-        drawableCopy.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+        Drawable drawable = ContextCompat.getDrawable(view.getContext(), resourceId).mutate();
+        if (color != null) {
+          drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+        } else {
+          drawable.clearColorFilter();
+        }
 
         Field editorField = TextView.class.getDeclaredField("mEditor");
         editorField.setAccessible(true);
         Object editor = editorField.get(view);
 
-        Field cursorDrawableField = editor.getClass().getDeclaredField(DRAWABLE_FIELDS[i]);
+        Field cursorDrawableField = editor.getClass().getDeclaredField(DRAWABLE_HANDLE_FIELDS[i]);
         cursorDrawableField.setAccessible(true);
-        if (DRAWABLE_RESOURCES[i] == "mCursorDrawableRes") {
-          Drawable[] drawables = {drawableCopy, drawableCopy};
-          cursorDrawableField.set(editor, drawables);
-        } else {
-          cursorDrawableField.set(editor, drawableCopy);
-        }
+        cursorDrawableField.set(editor, drawable);
       } catch (NoSuchFieldException ex) {
-        // Ignore errors to avoid crashing if these private fields don't exist on modified
-        // or future android versions.
       } catch (IllegalAccessException ex) {
       }
     }
   }
 
+  @ReactProp(name = "cursorColor", customType = "Color")
+  public void setCursorColor(ReactEditText view, @Nullable Integer color) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      Drawable cursorDrawable = view.getTextCursorDrawable();
+      if (cursorDrawable != null) {
+        if (color != null) {
+          cursorDrawable.setColorFilter(new BlendModeColorFilter(color, BlendMode.SRC_IN));
+        } else {
+          cursorDrawable.clearColorFilter();
+        }
+        view.setTextCursorDrawable(cursorDrawable);
+      }
+      return;
+    }
+
+    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
+      // Pre-Android 10, there was no supported API to change the cursor color programmatically.
+      // In Android 9.0, they changed the underlying implementation,
+      // but also "dark greylisted" the new field, rendering it unusable.
+      return;
+    }
+
+    // The evil code that follows uses reflection to achieve this on Android 8.1 and below.
+    // Based on https://tinyurl.com/3vff8lyu https://tinyurl.com/vehggzs9
+    try {
+      Field drawableCursorField = view.getClass().getDeclaredField("mCursorDrawableRes");
+      drawableCursorField.setAccessible(true);
+      int resourceId = drawableCursorField.getInt(view);
+
+      // The view has no cursor drawable.
+      if (resourceId == 0) {
+        return;
+      }
+
+      Drawable drawable = ContextCompat.getDrawable(view.getContext(), resourceId).mutate();
+      if (color != null) {
+        drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+      } else {
+        drawable.clearColorFilter();
+      }
+
+      Field editorField = TextView.class.getDeclaredField("mEditor");
+      editorField.setAccessible(true);
+      Object editor = editorField.get(view);
+
+      Field cursorDrawableField = editor.getClass().getDeclaredField("mCursorDrawable");
+      cursorDrawableField.setAccessible(true);
+      Drawable[] drawables = {drawable, drawable};
+      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) {
+    }
+  }
+
   private static boolean shouldHideCursorForEmailTextInput() {
     String manufacturer = Build.MANUFACTURER.toLowerCase(Locale.ROOT);
     return (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q && manufacturer.contains("xiaomi"));
@@ -747,9 +802,9 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     if (maxLength == null) {
       if (currentFilters.length > 0) {
         LinkedList<InputFilter> list = new LinkedList<>();
-        for (int i = 0; i < currentFilters.length; i++) {
-          if (!(currentFilters[i] instanceof InputFilter.LengthFilter)) {
-            list.add(currentFilters[i]);
+        for (InputFilter currentFilter : currentFilters) {
+          if (!(currentFilter instanceof InputFilter.LengthFilter)) {
+            list.add(currentFilter);
           }
         }
         if (!list.isEmpty()) {
@@ -838,14 +893,19 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     } else if (autoCapitalize.getType() == ReadableType.String) {
       final String autoCapitalizeStr = autoCapitalize.asString();
 
-      if (autoCapitalizeStr.equals("none")) {
-        autoCapitalizeValue = 0;
-      } else if (autoCapitalizeStr.equals("characters")) {
-        autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS;
-      } else if (autoCapitalizeStr.equals("words")) {
-        autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_WORDS;
-      } else if (autoCapitalizeStr.equals("sentences")) {
-        autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
+      switch (autoCapitalizeStr) {
+        case "none":
+          autoCapitalizeValue = 0;
+          break;
+        case "characters":
+          autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS;
+          break;
+        case "words":
+          autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_WORDS;
+          break;
+        case "sentences":
+          autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
+          break;
       }
     }
 
@@ -1016,7 +1076,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     private final ReactEditText mEditText;
     private final EventDispatcher mEventDispatcher;
     private final int mSurfaceId;
-    private String mPreviousText;
+    @Nullable private String mPreviousText;
 
     public ReactTextInputTextWatcher(
         final ReactContext reactContext, final ReactEditText editText) {
@@ -1085,73 +1145,67 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     editText.setEventDispatcher(getEventDispatcher(reactContext, editText));
     editText.addTextChangedListener(new ReactTextInputTextWatcher(reactContext, editText));
     editText.setOnFocusChangeListener(
-        new View.OnFocusChangeListener() {
-          public void onFocusChange(View v, boolean hasFocus) {
-            int surfaceId = reactContext.getSurfaceId();
-            EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
-            if (hasFocus) {
-              eventDispatcher.dispatchEvent(
-                  new ReactTextInputFocusEvent(surfaceId, editText.getId()));
-            } else {
-              eventDispatcher.dispatchEvent(
-                  new ReactTextInputBlurEvent(surfaceId, editText.getId()));
-
-              eventDispatcher.dispatchEvent(
-                  new ReactTextInputEndEditingEvent(
-                      surfaceId, editText.getId(), editText.getText().toString()));
-            }
+        (v, hasFocus) -> {
+          int surfaceId = reactContext.getSurfaceId();
+          EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
+          if (hasFocus) {
+            eventDispatcher.dispatchEvent(
+                new ReactTextInputFocusEvent(surfaceId, editText.getId()));
+          } else {
+            eventDispatcher.dispatchEvent(new ReactTextInputBlurEvent(surfaceId, editText.getId()));
+
+            eventDispatcher.dispatchEvent(
+                new ReactTextInputEndEditingEvent(
+                    surfaceId, editText.getId(), editText.getText().toString()));
           }
         });
 
     editText.setOnEditorActionListener(
-        new TextView.OnEditorActionListener() {
-          @Override
-          public boolean onEditorAction(TextView v, int actionId, KeyEvent keyEvent) {
-            if ((actionId & EditorInfo.IME_MASK_ACTION) != 0 || actionId == EditorInfo.IME_NULL) {
-              boolean isMultiline = editText.isMultiline();
-
-              boolean shouldSubmit = editText.shouldSubmitOnReturn();
-              boolean shouldBlur = editText.shouldBlurOnReturn();
-
-              // Motivation:
-              // * shouldSubmit => Clear focus; prevent default behavior (return true);
-              // * shouldBlur => Submit; prevent default behavior (return true);
-              // * !shouldBlur && !shouldSubmit && isMultiline => Perform default behavior (return
-              // false);
-              // * !shouldBlur && !shouldSubmit && !isMultiline => Prevent default behavior (return
-              // true);
-              if (shouldSubmit) {
-                EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
-                eventDispatcher.dispatchEvent(
-                    new ReactTextInputSubmitEditingEvent(
-                        reactContext.getSurfaceId(),
-                        editText.getId(),
-                        editText.getText().toString()));
-              }
-
-              if (shouldBlur) {
-                editText.clearFocus();
-              }
-
-              // Prevent default behavior except when we want it to insert a newline.
-              if (shouldBlur || shouldSubmit || !isMultiline) {
-                return true;
-              }
-
-              // If we've reached this point, it means that the TextInput has 'submitBehavior' set
-              // nullish and 'multiline' set to true. But it's still possible to get IME_ACTION_NEXT
-              // and IME_ACTION_PREVIOUS here in case if 'disableFullscreenUI' is false and Android
-              // decides to render this EditText in the full screen mode (when a phone has the
-              // landscape orientation for example). The full screen EditText also renders an action
-              // button specified by the 'returnKeyType' prop. We have to prevent Android from
-              // requesting focus from the next/previous focusable view since it must only be
-              // controlled from JS.
-              return actionId == EditorInfo.IME_ACTION_NEXT
-                  || actionId == EditorInfo.IME_ACTION_PREVIOUS;
+        (v, actionId, keyEvent) -> {
+          if ((actionId & EditorInfo.IME_MASK_ACTION) != 0 || actionId == EditorInfo.IME_NULL) {
+            boolean isMultiline = editText.isMultiline();
+
+            boolean shouldSubmit = editText.shouldSubmitOnReturn();
+            boolean shouldBlur = editText.shouldBlurOnReturn();
+
+            // Motivation:
+            // * shouldSubmit => Clear focus; prevent default behavior (return true);
+            // * shouldBlur => Submit; prevent default behavior (return true);
+            // * !shouldBlur && !shouldSubmit && isMultiline => Perform default behavior (return
+            // false);
+            // * !shouldBlur && !shouldSubmit && !isMultiline => Prevent default behavior (return
+            // true);
+            if (shouldSubmit) {
+              EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
+              eventDispatcher.dispatchEvent(
+                  new ReactTextInputSubmitEditingEvent(
+                      reactContext.getSurfaceId(),
+                      editText.getId(),
+                      editText.getText().toString()));
+            }
+
+            if (shouldBlur) {
+              editText.clearFocus();
+            }
+
+            // Prevent default behavior except when we want it to insert a newline.
+            if (shouldBlur || shouldSubmit || !isMultiline) {
+              return true;
             }
 
-            return true;
+            // If we've reached this point, it means that the TextInput has 'submitBehavior' set
+            // nullish and 'multiline' set to true. But it's still possible to get IME_ACTION_NEXT
+            // and IME_ACTION_PREVIOUS here in case if 'disableFullscreenUI' is false and Android
+            // decides to render this EditText in the full screen mode (when a phone has the
+            // landscape orientation for example). The full screen EditText also renders an action
+            // button specified by the 'returnKeyType' prop. We have to prevent Android from
+            // requesting focus from the next/previous focusable view since it must only be
+            // controlled from JS.
+            return actionId == EditorInfo.IME_ACTION_NEXT
+                || actionId == EditorInfo.IME_ACTION_PREVIOUS;
           }
+
+          return true;
         });
   }
 
@@ -1244,7 +1298,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     private final ReactEditText mReactEditText;
     private final EventDispatcher mEventDispatcher;
     private final int mSurfaceId;
-    private int mPreviousHoriz;
+    private int mPreviousHorizontal;
     private int mPreviousVert;
 
     public ReactScrollWatcher(ReactEditText editText) {
@@ -1256,7 +1310,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
 
     @Override
     public void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert) {
-      if (mPreviousHoriz != horiz || mPreviousVert != vert) {
+      if (mPreviousHorizontal != horiz || mPreviousVert != vert) {
         ScrollEvent event =
             ScrollEvent.obtain(
                 mSurfaceId,
@@ -1273,14 +1327,14 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
 
         mEventDispatcher.dispatchEvent(event);
 
-        mPreviousHoriz = horiz;
+        mPreviousHorizontal = horiz;
         mPreviousVert = vert;
       }
     }
   }
 
   @Override
-  public @Nullable Map getExportedViewConstants() {
+  public @Nullable Map<String, Object> getExportedViewConstants() {
     return MapBuilder.of(
         "AutoCapitalizationType",
         MapBuilder.of(
@@ -1352,7 +1406,8 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
         TextAttributeProps.getJustificationMode(props, currentJustificationMode));
   }
 
-  public Object getReactTextUpdate(ReactEditText view, ReactStylesDiffMap props, MapBuffer state) {
+  public @Nullable Object getReactTextUpdate(
+      ReactEditText view, ReactStylesDiffMap props, MapBuffer state) {
     // If native wants to update the state wrapper but the state data hasn't actually
     // changed, the MapBuffer may be empty
     if (state.getCount() == 0) {
@@ -1361,10 +1416,6 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
 
     MapBuffer attributedString = state.getMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING);
     MapBuffer paragraphAttributes = state.getMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES);
-    if (attributedString == null || paragraphAttributes == null) {
-      throw new IllegalArgumentException(
-          "Invalid TextInput State (MapBuffer) was received as a parameters");
-    }
 
     Spannable spanned =
         TextLayoutManagerMapBuffer.getOrCreateSpannableForText(

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java

@@ -7,8 +7,6 @@
 
 package com.facebook.react.views.textinput;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.text.Layout;
 import android.util.TypedValue;
 import android.view.ViewGroup;
@@ -35,11 +33,10 @@ import com.facebook.yoga.YogaMeasureOutput;
 import com.facebook.yoga.YogaNode;
 
 @VisibleForTesting
-@TargetApi(Build.VERSION_CODES.M)
 public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
     implements YogaMeasureFunction {
 
-  private int mMostRecentEventCount = UNSET;
+  private int mMostRecentEventCount = ReactConstants.UNSET;
   private @Nullable EditText mInternalEditText;
   private @Nullable ReactTextInputLocalData mLocalData;
 
@@ -53,10 +50,7 @@ public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
   public ReactTextInputShadowNode(
       @Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
     super(reactTextViewManagerCallback);
-    mTextBreakStrategy =
-        (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
-            ? Layout.BREAK_STRATEGY_SIMPLE
-            : Layout.BREAK_STRATEGY_HIGH_QUALITY;
+    mTextBreakStrategy = Layout.BREAK_STRATEGY_HIGH_QUALITY;
 
     initMeasureFunction();
   }
@@ -114,12 +108,11 @@ public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
     } else {
       editText.setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextAttributes.getEffectiveFontSize());
 
-      if (mNumberOfLines != UNSET) {
+      if (mNumberOfLines != ReactConstants.UNSET) {
         editText.setLines(mNumberOfLines);
       }
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-          && editText.getBreakStrategy() != mTextBreakStrategy) {
+      if (editText.getBreakStrategy() != mTextBreakStrategy) {
         editText.setBreakStrategy(mTextBreakStrategy);
       }
     }
@@ -182,10 +175,6 @@ public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
 
   @Override
   public void setTextBreakStrategy(@Nullable String textBreakStrategy) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-      return;
-    }
-
     if (textBreakStrategy == null || "simple".equals(textBreakStrategy)) {
       mTextBreakStrategy = Layout.BREAK_STRATEGY_SIMPLE;
     } else if ("highQuality".equals(textBreakStrategy)) {
@@ -202,7 +191,7 @@ public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
   public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
     super.onCollectExtraUpdates(uiViewOperationQueue);
 
-    if (mMostRecentEventCount != UNSET) {
+    if (mMostRecentEventCount != ReactConstants.UNSET) {
       ReactTextUpdate reactTextUpdate =
           new ReactTextUpdate(
               spannedFromShadowNode(

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java

@@ -8,5 +8,5 @@
 package com.facebook.react.views.textinput;
 
 public interface ScrollWatcher {
-  public void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert);
+  void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert);
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java

@@ -12,5 +12,5 @@ package com.facebook.react.views.textinput;
  * the ReactTextInputManager to forward events from the EditText to JS
  */
 interface SelectionWatcher {
-  public void onSelectionChanged(int start, int end);
+  void onSelectionChanged(int start, int end);
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/ReactUnimplementedView.java

@@ -12,7 +12,9 @@ import android.graphics.Color;
 import android.view.Gravity;
 import android.widget.LinearLayout;
 import androidx.appcompat.widget.AppCompatTextView;
+import com.facebook.infer.annotation.Nullsafe;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ReactUnimplementedView extends LinearLayout {
   private AppCompatTextView mTextView;
 

package/ReactAndroid/src/main/java/com/facebook/react/views/view/CanvasUtil.java

@@ -10,6 +10,7 @@ package com.facebook.react.views.view;
 import android.annotation.SuppressLint;
 import android.graphics.Canvas;
 import android.os.Build;
+import com.facebook.infer.annotation.Nullsafe;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import javax.annotation.Nullable;
@@ -19,7 +20,9 @@ import javax.annotation.Nullable;
  * href="https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/CanvasUtils.android.kt;drc=3b2dde134afab8d58b9c39ad4820eaf9a6e014a9">
  * Compose canvas utils </a>
  */
-public class CanvasUtil {
+@Nullsafe(Nullsafe.Mode.LOCAL)
+class CanvasUtil {
+
   private CanvasUtil() {}
 
   private @Nullable static Method mReorderBarrierMethod = null;

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java

@@ -8,12 +8,14 @@
 package com.facebook.react.views.view;
 
 import android.graphics.PixelFormat;
+import com.facebook.infer.annotation.Nullsafe;
 
 /**
  * Simple utility class for manipulating colors, based on Fresco's DrawableUtils
  * (https://github.com/facebook/fresco). For a small helper like this, copying is simpler than
  * adding a dependency on com.facebook.fresco.drawee.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ColorUtil {
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.java

@@ -8,8 +8,10 @@
 package com.facebook.react.views.view;
 
 import android.view.View;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.yoga.YogaMeasureMode;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class MeasureUtil {
 
   public static int getMeasureSpec(float size, YogaMeasureMode mode) {

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java

@@ -8,6 +8,7 @@
 package com.facebook.react.views.view;
 
 import android.view.View;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -16,6 +17,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
  * View manager which handles clipped subviews. Useful for custom views which extends from {@link
  * com.facebook.react.views.view.ReactViewGroup}
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public abstract class ReactClippingViewManager<T extends ReactViewGroup>
     extends ViewGroupManager<T> {
 

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java

@@ -13,7 +13,6 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RippleDrawable;
-import android.os.Build;
 import android.util.TypedValue;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
@@ -76,9 +75,7 @@ public class ReactDrawableHelper {
   }
 
   private static Drawable setRadius(ReadableMap drawableDescriptionDict, Drawable drawable) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-        && drawableDescriptionDict.hasKey("rippleRadius")
-        && drawable instanceof RippleDrawable) {
+    if (drawableDescriptionDict.hasKey("rippleRadius") && drawable instanceof RippleDrawable) {
       RippleDrawable rippleDrawable = (RippleDrawable) drawable;
       double rippleRadius = drawableDescriptionDict.getDouble("rippleRadius");
       rippleDrawable.setRadius((int) PixelUtil.toPixelFromDIP(rippleRadius));

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java

@@ -24,7 +24,6 @@ import android.graphics.drawable.Drawable;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.uimanager.FloatUtil;
 import com.facebook.react.uimanager.Spacing;
@@ -110,8 +109,7 @@ public class ReactViewBackgroundDrawable extends Drawable {
   // such as between the mBackgroundColorRenderPath and its border.
   // The smallest amount (found to be 0.8f) is used to extend
   // the paths, overlapping them and closing the visible gap.
-  private final float mGapBetweenPaths =
-      ReactFeatureFlags.enableCloseVisibleGapBetweenPaths ? 0.8f : 0.0f;
+  private final float mGapBetweenPaths = 0.8f;
 
   private @Nullable float[] mBorderCornerRadii;
   private final Context mContext;

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java

@@ -22,13 +22,13 @@ public class ReactViewBackgroundManager {
   private int mColor = Color.TRANSPARENT;
 
   public ReactViewBackgroundManager(View view) {
-    this.mView = view;
+    mView = view;
   }
 
   public void cleanup() {
     ViewCompat.setBackground(mView, null);
-    this.mView = null;
-    this.mReactBackgroundDrawable = null;
+    mView = null;
+    mReactBackgroundDrawable = null;
   }
 
   private ReactViewBackgroundDrawable getOrCreateReactViewBackground() {