react-native-tvos 0.76.6-0 → 0.77.0-0

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

@@ -28,6 +28,7 @@ import android.text.InputType;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
+import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.method.KeyListener;
@@ -62,6 +63,8 @@ import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.common.UIManagerType;
+import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.style.BorderRadiusProp;
 import com.facebook.react.uimanager.style.BorderStyle;
@@ -74,14 +77,15 @@ import com.facebook.react.views.text.TextLayoutManager;
 import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
 import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
 import com.facebook.react.views.text.internal.span.CustomStyleSpan;
+import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
 import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
 import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
 import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
 import com.facebook.react.views.text.internal.span.ReactSpan;
 import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan;
+import com.facebook.react.views.text.internal.span.ReactTextPaintHolderSpan;
 import com.facebook.react.views.text.internal.span.ReactUnderlineSpan;
 import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
-import com.facebook.react.views.view.ReactViewBackgroundManager;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -138,8 +142,6 @@ public class ReactEditText extends AppCompatEditText {
   private @Nullable String mPlaceholder = null;
   private Overflow mOverflow = Overflow.VISIBLE;
 
-  private final ReactViewBackgroundManager mReactBackgroundManager;
-
   private StateWrapper mStateWrapper = null;
   protected boolean mDisableTextDiffing = false;
 
@@ -154,7 +156,6 @@ public class ReactEditText extends AppCompatEditText {
     super(context);
     setFocusableInTouchMode(false);
 
-    mReactBackgroundManager = new ReactViewBackgroundManager(this);
     mInputMethodManager =
         (InputMethodManager)
             Assertions.assertNotNull(context.getSystemService(Context.INPUT_METHOD_SERVICE));
@@ -442,6 +443,10 @@ public class ReactEditText extends AppCompatEditText {
       return;
     }
 
+    maybeSetSelection(start, end);
+  }
+
+  private void maybeSetSelection(int start, int end) {
     if (start != ReactConstants.UNSET && end != ReactConstants.UNSET) {
       // clamp selection values for safety
       start = clampToTextLength(start);
@@ -572,7 +577,8 @@ public class ReactEditText extends AppCompatEditText {
       int selectionStart = getSelectionStart();
       int selectionEnd = getSelectionEnd();
       setInputType(mStagedInputType);
-      setSelection(selectionStart, selectionEnd);
+      // Restore the selection
+      maybeSetSelection(selectionStart, selectionEnd);
     }
   }
 
@@ -805,7 +811,9 @@ public class ReactEditText extends AppCompatEditText {
     stripSpansOfKind(
         sb,
         ReactBackgroundColorSpan.class,
-        (span) -> span.getBackgroundColor() == mReactBackgroundManager.getBackgroundColor());
+        (span) ->
+            Objects.equals(
+                span.getBackgroundColor(), BackgroundStyleApplicator.getBackgroundColor(this)));
 
     stripSpansOfKind(
         sb,
@@ -867,8 +875,8 @@ public class ReactEditText extends AppCompatEditText {
     workingText.setSpan(
         new ReactForegroundColorSpan(getCurrentTextColor()), 0, workingText.length(), spanFlags);
 
-    int backgroundColor = mReactBackgroundManager.getBackgroundColor();
-    if (backgroundColor != Color.TRANSPARENT) {
+    @Nullable Integer backgroundColor = BackgroundStyleApplicator.getBackgroundColor(this);
+    if (backgroundColor != null && backgroundColor != Color.TRANSPARENT) {
       workingText.setSpan(
           new ReactBackgroundColorSpan(backgroundColor), 0, workingText.length(), spanFlags);
     }
@@ -905,7 +913,13 @@ public class ReactEditText extends AppCompatEditText {
 
     float lineHeight = mTextAttributes.getEffectiveLineHeight();
     if (!Float.isNaN(lineHeight)) {
-      workingText.setSpan(new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
+      if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
+        workingText.setSpan(
+            new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
+      } else {
+        workingText.setSpan(
+            new LegacyLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
+      }
     }
   }
 
@@ -1113,12 +1127,18 @@ public class ReactEditText extends AppCompatEditText {
   public void onAttachedToWindow() {
     super.onAttachedToWindow();
 
+    int selectionStart = getSelectionStart();
+    int selectionEnd = getSelectionEnd();
+
     // Used to ensure that text is selectable inside of removeClippedSubviews
     // See https://github.com/facebook/react-native/issues/6805 for original
     // fix that was ported to here.
 
     super.setTextIsSelectable(true);
 
+    // Restore the selection since `setTextIsSelectable` changed it.
+    maybeSetSelection(selectionStart, selectionEnd);
+
     if (mContainsImages) {
       Spanned text = getText();
       TextInlineImageSpan[] spans = text.getSpans(0, text.length(), TextInlineImageSpan.class);
@@ -1148,39 +1168,23 @@ public class ReactEditText extends AppCompatEditText {
 
   @Override
   public void setBackgroundColor(int color) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      BackgroundStyleApplicator.setBackgroundColor(this, color);
-    } else {
-      mReactBackgroundManager.setBackgroundColor(color);
-    }
+    BackgroundStyleApplicator.setBackgroundColor(this, color);
   }
 
   public void setBorderWidth(int position, float width) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      BackgroundStyleApplicator.setBorderWidth(
-          this, LogicalEdge.values()[position], PixelUtil.toDIPFromPixel(width));
-    } else {
-      mReactBackgroundManager.setBorderWidth(position, width);
-    }
+    BackgroundStyleApplicator.setBorderWidth(
+        this, LogicalEdge.values()[position], PixelUtil.toDIPFromPixel(width));
   }
 
   public void setBorderColor(int position, @Nullable Integer color) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      BackgroundStyleApplicator.setBorderColor(this, LogicalEdge.values()[position], color);
-    } else {
-      mReactBackgroundManager.setBorderColor(position, color);
-    }
+    BackgroundStyleApplicator.setBorderColor(this, LogicalEdge.values()[position], color);
   }
 
   public int getBorderColor(int position) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      @Nullable
-      Integer borderColor =
-          BackgroundStyleApplicator.getBorderColor(this, LogicalEdge.values()[position]);
-      return borderColor == null ? Color.TRANSPARENT : borderColor;
-    } else {
-      return mReactBackgroundManager.getBorderColor(position);
-    }
+    @Nullable
+    Integer borderColor =
+        BackgroundStyleApplicator.getBorderColor(this, LogicalEdge.values()[position]);
+    return borderColor == null ? Color.TRANSPARENT : borderColor;
   }
 
   public void setBorderRadius(float borderRadius) {
@@ -1188,26 +1192,18 @@ public class ReactEditText extends AppCompatEditText {
   }
 
   public void setBorderRadius(float borderRadius, int position) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      @Nullable
-      LengthPercentage radius =
-          Float.isNaN(borderRadius)
-              ? null
-              : new LengthPercentage(
-                  PixelUtil.toDIPFromPixel(borderRadius), LengthPercentageType.POINT);
-      BackgroundStyleApplicator.setBorderRadius(this, BorderRadiusProp.values()[position], radius);
-    } else {
-      mReactBackgroundManager.setBorderRadius(borderRadius, position);
-    }
+    @Nullable
+    LengthPercentage radius =
+        Float.isNaN(borderRadius)
+            ? null
+            : new LengthPercentage(
+                PixelUtil.toDIPFromPixel(borderRadius), LengthPercentageType.POINT);
+    BackgroundStyleApplicator.setBorderRadius(this, BorderRadiusProp.values()[position], radius);
   }
 
   public void setBorderStyle(@Nullable String style) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      BackgroundStyleApplicator.setBorderStyle(
-          this, style == null ? null : BorderStyle.fromString(style));
-    } else {
-      mReactBackgroundManager.setBorderStyle(style);
-    }
+    BackgroundStyleApplicator.setBorderStyle(
+        this, style == null ? null : BorderStyle.fromString(style));
   }
 
   public void setLetterSpacingPt(float letterSpacingPt) {
@@ -1339,13 +1335,18 @@ public class ReactEditText extends AppCompatEditText {
     if (!haveText) {
       if (getHint() != null && getHint().length() > 0) {
         sb.append(getHint());
-      } else {
+      } else if (ViewUtil.getUIManagerType(this) != UIManagerType.FABRIC) {
         // Measure something so we have correct height, even if there's no string.
         sb.append("I");
       }
     }
 
     addSpansFromStyleAttributes(sb);
+    sb.setSpan(
+        new ReactTextPaintHolderSpan(new TextPaint(getPaint())),
+        0,
+        sb.length(),
+        Spannable.SPAN_INCLUSIVE_INCLUSIVE);
     TextLayoutManager.setCachedSpannableForTag(getId(), sb);
   }
 
@@ -1361,18 +1362,13 @@ public class ReactEditText extends AppCompatEditText {
       mOverflow = parsedOverflow == null ? Overflow.VISIBLE : parsedOverflow;
     }
 
-    mReactBackgroundManager.setOverflow(overflow);
     invalidate();
   }
 
   @Override
   public void onDraw(Canvas canvas) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      if (mOverflow != Overflow.VISIBLE) {
-        BackgroundStyleApplicator.clipToPaddingBox(this, canvas);
-      }
-    } else {
-      mReactBackgroundManager.maybeClipToPaddingBox(canvas);
+    if (mOverflow != Overflow.VISIBLE) {
+      BackgroundStyleApplicator.clipToPaddingBox(this, canvas);
     }
 
     super.onDraw(canvas);

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

@@ -29,7 +29,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
-import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;
 import androidx.autofill.HintConstants;
 import androidx.core.content.ContextCompat;
@@ -45,7 +44,6 @@ import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.mapbuffer.MapBuffer;
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.BackgroundStyleApplicator;
 import com.facebook.react.uimanager.BaseViewManager;
@@ -957,36 +955,20 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
       },
       defaultFloat = Float.NaN)
   public void setBorderRadius(ReactEditText view, int index, float borderRadius) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      @Nullable
-      LengthPercentage radius =
-          Float.isNaN(borderRadius)
-              ? null
-              : new LengthPercentage(borderRadius, LengthPercentageType.POINT);
-      BackgroundStyleApplicator.setBorderRadius(view, BorderRadiusProp.values()[index], radius);
-    } else {
-      if (!Float.isNaN(borderRadius)) {
-        borderRadius = PixelUtil.toPixelFromDIP(borderRadius);
-      }
-
-      if (index == 0) {
-        view.setBorderRadius(borderRadius);
-      } else {
-        view.setBorderRadius(borderRadius, index - 1);
-      }
-    }
+    @Nullable
+    LengthPercentage radius =
+        Float.isNaN(borderRadius)
+            ? null
+            : new LengthPercentage(borderRadius, LengthPercentageType.POINT);
+    BackgroundStyleApplicator.setBorderRadius(view, BorderRadiusProp.values()[index], radius);
   }
 
   @ReactProp(name = "borderStyle")
   public void setBorderStyle(ReactEditText view, @Nullable String borderStyle) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      @Nullable
-      BorderStyle parsedBorderStyle =
-          borderStyle == null ? null : BorderStyle.fromString(borderStyle);
-      BackgroundStyleApplicator.setBorderStyle(view, parsedBorderStyle);
-    } else {
-      view.setBorderStyle(borderStyle);
-    }
+    @Nullable
+    BorderStyle parsedBorderStyle =
+        borderStyle == null ? null : BorderStyle.fromString(borderStyle);
+    BackgroundStyleApplicator.setBorderStyle(view, parsedBorderStyle);
   }
 
   @ReactProp(name = "showSoftInputOnFocus", defaultBoolean = true)
@@ -1004,6 +986,9 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     view.setPaintFlags(
         view.getPaintFlags() & ~(Paint.STRIKE_THRU_TEXT_FLAG | Paint.UNDERLINE_TEXT_FLAG));
 
+    if (textDecorationLineString == null) {
+      return;
+    }
     for (String token : textDecorationLineString.split(" ")) {
       if (token.equals("underline")) {
         view.setPaintFlags(view.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
@@ -1023,14 +1008,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
       },
       defaultFloat = Float.NaN)
   public void setBorderWidth(ReactEditText view, int index, float width) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width);
-    } else {
-      if (!Float.isNaN(width)) {
-        width = PixelUtil.toPixelFromDIP(width);
-      }
-      view.setBorderWidth(SPACING_TYPES[index], width);
-    }
+    BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width);
   }
 
   @ReactPropGroup(
@@ -1043,12 +1021,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
       },
       customType = "Color")
   public void setBorderColor(ReactEditText view, int index, @Nullable Integer color) {
-
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      BackgroundStyleApplicator.setBorderColor(view, LogicalEdge.ALL, color);
-    } else {
-      view.setBorderColor(SPACING_TYPES[index], color);
-    }
+    BackgroundStyleApplicator.setBorderColor(view, LogicalEdge.ALL, color);
   }
 
   @ReactProp(name = "overflow")
@@ -1056,22 +1029,6 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     view.setOverflow(overflow);
   }
 
-  @ReactProp(name = ViewProps.BOX_SHADOW, customType = "BoxShadow")
-  public void setBoxShadow(ReactEditText view, @Nullable ReadableArray shadows) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      BackgroundStyleApplicator.setBoxShadow(view, shadows);
-    }
-  }
-
-  @Override
-  public void setBackgroundColor(ReactEditText view, @ColorInt int backgroundColor) {
-    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
-      BackgroundStyleApplicator.setBackgroundColor(view, backgroundColor);
-    } else {
-      super.setBackgroundColor(view, backgroundColor);
-    }
-  }
-
   @Override
   protected void onAfterUpdateTransaction(ReactEditText view) {
     super.onAfterUpdateTransaction(view);
@@ -1345,8 +1302,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
                 0, // can't get content width
                 0, // can't get content height
                 mReactEditText.getWidth(),
-                mReactEditText.getHeight(),
-                false);
+                mReactEditText.getHeight());
 
         mEventDispatcher.dispatchEvent(event);
 

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

@@ -13,7 +13,7 @@ import android.view.Gravity
 import android.widget.LinearLayout
 import androidx.appcompat.widget.AppCompatTextView
 
-public class ReactUnimplementedView(context: Context) : LinearLayout(context) {
+internal class ReactUnimplementedView(context: Context) : LinearLayout(context) {
 
   private val textView: AppCompatTextView
 
@@ -31,7 +31,7 @@ public class ReactUnimplementedView(context: Context) : LinearLayout(context) {
     addView(textView)
   }
 
-  public fun setName(name: String) {
+  internal fun setName(name: String) {
     textView.setText("'$name' is not Fabric compatible yet.")
   }
 }

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

@@ -10,11 +10,21 @@ package com.facebook.react.views.unimplementedview
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.UnimplementedNativeViewManagerDelegate
+import com.facebook.react.viewmanagers.UnimplementedNativeViewManagerInterface
 
 /** ViewManager for [ReactUnimplementedView] to represent a component that is not yet supported. */
 @ReactModule(name = ReactUnimplementedViewManager.REACT_CLASS)
-public class ReactUnimplementedViewManager : ViewGroupManager<ReactUnimplementedView>() {
+internal class ReactUnimplementedViewManager :
+    ViewGroupManager<ReactUnimplementedView>(),
+    UnimplementedNativeViewManagerInterface<ReactUnimplementedView> {
+
+  private val delegate: ViewManagerDelegate<ReactUnimplementedView> =
+      UnimplementedNativeViewManagerDelegate(this)
+
+  public override fun getDelegate(): ViewManagerDelegate<ReactUnimplementedView> = delegate
 
   protected override fun createViewInstance(
       reactContext: ThemedReactContext
@@ -23,11 +33,11 @@ public class ReactUnimplementedViewManager : ViewGroupManager<ReactUnimplemented
   public override fun getName(): String = REACT_CLASS
 
   @ReactProp(name = "name")
-  public fun setName(view: ReactUnimplementedView, name: String) {
-    view.setName(name)
+  public override fun setName(view: ReactUnimplementedView, name: String?): Unit {
+    view.setName(name ?: "<null component name>")
   }
 
-  public companion object {
+  internal companion object {
     public const val REACT_CLASS: String = "UnimplementedNativeView"
   }
 }

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

@@ -10,11 +10,6 @@ package com.facebook.react.views.view
 import android.annotation.SuppressLint
 import android.graphics.Canvas
 import android.os.Build
-import android.os.Build.VERSION
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES
-import android.os.Build.VERSION_CODES.P
-import android.os.Build.VERSION_CODES.Q
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 

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

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.views.view
+
+import android.view.View
+import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.uimanager.ReactClippingViewGroupHelper
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+
+/**
+ * View manager which handles clipped subviews. Useful for custom views which extends from
+ * [com.facebook.react.views.view.ReactViewGroup]
+ */
+public abstract class ReactClippingViewManager<T : ReactViewGroup> : ViewGroupManager<T>() {
+
+  @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
+  public open fun setRemoveClippedSubviews(view: T, removeClippedSubviews: Boolean) {
+    UiThreadUtil.assertOnUiThread()
+
+    view.removeClippedSubviews = removeClippedSubviews
+  }
+
+  override fun addView(parent: T, child: View, index: Int) {
+    UiThreadUtil.assertOnUiThread()
+
+    val removeClippedSubviews = parent.removeClippedSubviews
+    if (removeClippedSubviews) {
+      parent.addViewWithSubviewClippingEnabled(child, index)
+    } else {
+      parent.addView(child, index)
+    }
+  }
+
+  override fun getChildCount(parent: T): Int {
+    val removeClippedSubviews = parent.removeClippedSubviews
+    return if (removeClippedSubviews) {
+      parent.allChildrenCount
+    } else {
+      parent.childCount
+    }
+  }
+
+  override fun getChildAt(parent: T, index: Int): View? {
+    val removeClippedSubviews = parent.removeClippedSubviews
+    return if (removeClippedSubviews) {
+      parent.getChildAtWithSubviewClippingEnabled(index)
+    } else {
+      parent.getChildAt(index)
+    }
+  }
+
+  override fun removeViewAt(parent: T, index: Int) {
+    UiThreadUtil.assertOnUiThread()
+
+    val removeClippedSubviews = parent.removeClippedSubviews
+    if (removeClippedSubviews) {
+      val child = getChildAt(parent, index)
+      if (child != null) {
+        parent.removeViewWithSubviewClippingEnabled(child)
+      }
+    } else {
+      parent.removeViewAt(index)
+    }
+  }
+
+  override fun removeAllViews(parent: T) {
+    UiThreadUtil.assertOnUiThread()
+
+    val removeClippedSubviews = parent.removeClippedSubviews
+    if (removeClippedSubviews) {
+      parent.removeAllViewsWithSubviewClippingEnabled()
+    } else {
+      parent.removeAllViews()
+    }
+  }
+}

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

@@ -15,9 +15,9 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RippleDrawable;
 import android.util.TypedValue;
 import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ViewProps;
 
@@ -25,15 +25,19 @@ import com.facebook.react.uimanager.ViewProps;
  * Utility class that helps with converting android drawable description used in JS to an actual
  * instance of {@link Drawable}.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ReactDrawableHelper {
 
   private static final TypedValue sResolveOutValue = new TypedValue();
 
-  public static Drawable createDrawableFromJSDescription(
+  public static @Nullable Drawable createDrawableFromJSDescription(
       Context context, ReadableMap drawableDescriptionDict) {
     String type = drawableDescriptionDict.getString("type");
     if ("ThemeAttrAndroid".equals(type)) {
       String attr = drawableDescriptionDict.getString("attribute");
+      if (attr == null) {
+        throw new JSApplicationIllegalArgumentException("JS description missing 'attribute' field");
+      }
       int attrId = getAttrId(context, attr);
       if (!context.getTheme().resolveAttribute(attrId, sResolveOutValue, true)) {
         throw new JSApplicationIllegalArgumentException(
@@ -50,7 +54,6 @@ public class ReactDrawableHelper {
   }
 
   private static int getAttrId(Context context, String attr) {
-    SoftAssertions.assertNotNull(attr);
     if ("selectableItemBackground".equals(attr)) {
       return android.R.attr.selectableItemBackground;
     } else if ("selectableItemBackgroundBorderless".equals(attr)) {
@@ -60,7 +63,7 @@ public class ReactDrawableHelper {
     }
   }
 
-  private static Drawable getDefaultThemeDrawable(Context context) {
+  private static @Nullable Drawable getDefaultThemeDrawable(Context context) {
     return context.getResources().getDrawable(sResolveOutValue.resourceId, context.getTheme());
   }
 
@@ -74,7 +77,8 @@ public class ReactDrawableHelper {
     return new RippleDrawable(colorStateList, null, mask);
   }
 
-  private static Drawable setRadius(ReadableMap drawableDescriptionDict, Drawable drawable) {
+  private static @Nullable Drawable setRadius(
+      ReadableMap drawableDescriptionDict, @Nullable Drawable drawable) {
     if (drawableDescriptionDict.hasKey("rippleRadius") && drawable instanceof RippleDrawable) {
       RippleDrawable rippleDrawable = (RippleDrawable) drawable;
       double rippleRadius = drawableDescriptionDict.getDouble("rippleRadius");