react-native-tvos 0.87.1-1 → 0.88.0-0rc2

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.kt

@@ -11,6 +11,7 @@ import android.content.Context
 import android.view.View
 import com.facebook.common.logging.FLog
 import com.facebook.react.bridge.ColorPropConverter
+import com.facebook.react.bridge.DimensionPropConverter
 import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.DynamicFromObject
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
@@ -18,6 +19,7 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.uimanager.annotations.ReactPropGroup
+import com.facebook.yoga.YogaValue
 import java.lang.reflect.Method
 
 /**
@@ -192,6 +194,15 @@ internal object ViewManagersPropertyCache {
     }
   }
 
+  private class DimensionPropSetter(prop: ReactProp, setter: Method) :
+      PropSetter(prop, "mixed", setter) {
+
+    // A DimensionValue arrives from JS as either a number (points) or a string
+    // (e.g. "100%"), and is nullable, so the conversion is delegated wholesale.
+    override fun getValueOrDefault(value: Any?, context: Context): Any? =
+        DimensionPropConverter.getDimension(value)
+  }
+
   private class BooleanPropSetter(
       prop: ReactProp,
       setter: Method,
@@ -259,6 +270,18 @@ internal object ViewManagersPropertyCache {
     }
   }
 
+  private class BoxedFloatPropSetter(prop: ReactProp, setter: Method) :
+      PropSetter(prop, "number", setter) {
+
+    override fun getValueOrDefault(value: Any?, context: Context): Any? {
+      if (value != null) {
+        // All numbers from JS are Doubles which can't be simply cast to Float
+        return if (value is Double) value.toFloat() else value as Float
+      }
+      return null
+    }
+  }
+
   private class BoxedIntPropSetter : PropSetter {
 
     constructor(prop: ReactProp, setter: Method) : super(prop, "number", setter)
@@ -322,7 +345,7 @@ internal object ViewManagersPropertyCache {
    */
   @JvmStatic
   internal fun getNativePropSettersForViewManagerClass(
-      cls: Class<out ViewManager<*, *>>
+      cls: Class<out ViewManager<*, *>>,
   ): Map<String, PropSetter> {
     if (cls == ViewManager::class.java) {
       return EMPTY_PROPS_MAP
@@ -333,10 +356,9 @@ internal object ViewManagersPropertyCache {
     // This is to include all the setters from parent classes. Once calculated the result will be
     // stored in CLASS_PROPS_CACHE so that we only scan for @ReactProp annotations once per class.
     @Suppress("UNCHECKED_CAST")
-    val props: MutableMap<String, PropSetter> =
-        HashMap(
-            getNativePropSettersForViewManagerClass(cls.superclass as Class<out ViewManager<*, *>>)
-        )
+    val props: MutableMap<String, PropSetter> = HashMap(
+        getNativePropSettersForViewManagerClass(cls.superclass as Class<out ViewManager<*, *>>),
+    )
     extractPropSettersFromViewManagerClassDefinition(cls, props)
     CLASS_PROPS_CACHE[cls] = props
     return props
@@ -349,7 +371,7 @@ internal object ViewManagersPropertyCache {
    */
   @JvmStatic
   internal fun getNativePropSettersForShadowNodeClass(
-      cls: Class<out ReactShadowNode<*>>
+      cls: Class<out ReactShadowNode<*>>,
   ): Map<String, PropSetter> {
     for (iface in cls.interfaces) {
       if (iface == ReactShadowNode::class.java) {
@@ -392,6 +414,7 @@ internal object ViewManagersPropertyCache {
             DoublePropSetter(annotation, method, annotation.defaultDouble)
         String::class.java -> StringPropSetter(annotation, method)
         java.lang.Boolean::class.java -> BoxedBooleanPropSetter(annotation, method)
+        java.lang.Float::class.java -> BoxedFloatPropSetter(annotation, method)
         java.lang.Integer::class.java ->
             if ("Color" == annotation.customType) {
               BoxedColorPropSetter(annotation, method)
@@ -400,9 +423,10 @@ internal object ViewManagersPropertyCache {
             }
         ReadableArray::class.java -> ArrayPropSetter(annotation, method)
         ReadableMap::class.java -> MapPropSetter(annotation, method)
+        YogaValue::class.java -> DimensionPropSetter(annotation, method)
         else ->
             throw RuntimeException(
-                "Unrecognized type: $propTypeClass for method: ${method.declaringClass.name}#${method.name}"
+                "Unrecognized type: $propTypeClass for method: ${method.declaringClass.name}#${method.name}",
             )
       }
 
@@ -446,7 +470,7 @@ internal object ViewManagersPropertyCache {
           }
       else ->
           throw RuntimeException(
-              "Unrecognized type: $propTypeClass for method: ${method.declaringClass.name}#${method.name}"
+              "Unrecognized type: $propTypeClass for method: ${method.declaringClass.name}#${method.name}",
           )
     }
   }
@@ -464,7 +488,7 @@ internal object ViewManagersPropertyCache {
         }
         if (!View::class.java.isAssignableFrom(paramTypes[0])) {
           throw RuntimeException(
-              "First param should be a view subclass to be updated: ${cls.name}#${method.name}"
+              "First param should be a view subclass to be updated: ${cls.name}#${method.name}",
           )
         }
         props[annotation.name] = createPropSetter(annotation, method, paramTypes[1])
@@ -475,17 +499,17 @@ internal object ViewManagersPropertyCache {
         val paramTypes = method.parameterTypes
         if (paramTypes.size != 3) {
           throw RuntimeException(
-              "Wrong number of args for group prop setter: ${cls.name}#${method.name}"
+              "Wrong number of args for group prop setter: ${cls.name}#${method.name}",
           )
         }
         if (!View::class.java.isAssignableFrom(paramTypes[0])) {
           throw RuntimeException(
-              "First param should be a view subclass to be updated: ${cls.name}#${method.name}"
+              "First param should be a view subclass to be updated: ${cls.name}#${method.name}",
           )
         }
         if (paramTypes[1] != Int::class.javaPrimitiveType) {
           throw RuntimeException(
-              "Second argument should be property index: ${cls.name}#${method.name}"
+              "Second argument should be property index: ${cls.name}#${method.name}",
           )
         }
         createPropSetters(groupAnnotation, method, paramTypes[2], props)
@@ -512,12 +536,12 @@ internal object ViewManagersPropertyCache {
         val paramTypes = method.parameterTypes
         if (paramTypes.size != 2) {
           throw RuntimeException(
-              "Wrong number of args for group prop setter: ${cls.name}#${method.name}"
+              "Wrong number of args for group prop setter: ${cls.name}#${method.name}",
           )
         }
         if (paramTypes[0] != Int::class.javaPrimitiveType) {
           throw RuntimeException(
-              "Second argument should be property index: ${cls.name}#${method.name}"
+              "Second argument should be property index: ${cls.name}#${method.name}",
           )
         }
         createPropSetters(groupAnnotation, method, paramTypes[1], props)

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt

@@ -75,15 +75,22 @@ public object ViewProps {
   public const val BACKGROUND_IMAGE: String = "backgroundImage"
   // Backwards-compatible alias for the original experimental_ prefixed prop name.
   public const val EXPERIMENTAL_BACKGROUND_IMAGE: String = "experimental_backgroundImage"
-  public const val BACKGROUND_SIZE: String = "experimental_backgroundSize"
-  public const val BACKGROUND_POSITION: String = "experimental_backgroundPosition"
-  public const val BACKGROUND_REPEAT: String = "experimental_backgroundRepeat"
+  public const val BACKGROUND_SIZE: String = "backgroundSize"
+  // Backwards-compatible alias for the original experimental_ prefixed prop name.
+  public const val EXPERIMENTAL_BACKGROUND_SIZE: String = "experimental_backgroundSize"
+  public const val BACKGROUND_POSITION: String = "backgroundPosition"
+  // Backwards-compatible alias for the original experimental_ prefixed prop name.
+  public const val EXPERIMENTAL_BACKGROUND_POSITION: String = "experimental_backgroundPosition"
+  public const val BACKGROUND_REPEAT: String = "backgroundRepeat"
+  // Backwards-compatible alias for the original experimental_ prefixed prop name.
+  public const val EXPERIMENTAL_BACKGROUND_REPEAT: String = "experimental_backgroundRepeat"
   public const val FOREGROUND_COLOR: String = "foregroundColor"
   public const val COLOR: String = "color"
   public const val FONT_SIZE: String = "fontSize"
   public const val FONT_WEIGHT: String = "fontWeight"
   public const val FONT_STYLE: String = "fontStyle"
   public const val FONT_VARIANT: String = "fontVariant"
+  public const val FONT_VARIATION_SETTINGS: String = "fontVariationSettings"
   public const val FONT_FAMILY: String = "fontFamily"
   public const val LINE_HEIGHT: String = "lineHeight"
   public const val LETTER_SPACING: String = "letterSpacing"
@@ -187,81 +194,77 @@ public object ViewProps {
   internal const val ON_CLICK: String = "onClick"
   internal const val ON_CLICK_CAPTURE: String = "onClickCapture"
   @JvmField
-  public val BORDER_SPACING_TYPES: IntArray =
-      intArrayOf(
-          Spacing.ALL,
-          Spacing.START,
-          Spacing.END,
-          Spacing.TOP,
-          Spacing.BOTTOM,
-          Spacing.LEFT,
-          Spacing.RIGHT,
-      )
+  public val BORDER_SPACING_TYPES: IntArray = intArrayOf(
+      Spacing.ALL,
+      Spacing.START,
+      Spacing.END,
+      Spacing.TOP,
+      Spacing.BOTTOM,
+      Spacing.LEFT,
+      Spacing.RIGHT,
+  )
   @JvmField
-  public val PADDING_MARGIN_SPACING_TYPES: IntArray =
-      intArrayOf(
-          Spacing.ALL,
-          Spacing.VERTICAL,
-          Spacing.HORIZONTAL,
-          Spacing.START,
-          Spacing.END,
-          Spacing.TOP,
-          Spacing.BOTTOM,
-          Spacing.LEFT,
-          Spacing.RIGHT,
-      )
-  private val LAYOUT_ONLY_PROPS: HashSet<String> =
-      HashSet(
-          listOf(
-              ALIGN_SELF,
-              ALIGN_ITEMS,
-              COLLAPSABLE,
-              FLEX,
-              FLEX_BASIS,
-              FLEX_DIRECTION,
-              FLEX_GROW,
-              ROW_GAP,
-              COLUMN_GAP,
-              GAP,
-              FLEX_SHRINK,
-              FLEX_WRAP,
-              JUSTIFY_CONTENT,
-              OVERFLOW,
-              ALIGN_CONTENT,
-              DISPLAY, /* position */
-              POSITION,
-              RIGHT,
-              TOP,
-              BOTTOM,
-              LEFT,
-              START,
-              END, /* dimensions */
-              WIDTH,
-              HEIGHT,
-              MIN_WIDTH,
-              MAX_WIDTH,
-              MIN_HEIGHT,
-              MAX_HEIGHT, /* margins */
-              MARGIN,
-              MARGIN_VERTICAL,
-              MARGIN_HORIZONTAL,
-              MARGIN_LEFT,
-              MARGIN_RIGHT,
-              MARGIN_TOP,
-              MARGIN_BOTTOM,
-              MARGIN_START,
-              MARGIN_END, /* paddings */
-              PADDING,
-              PADDING_VERTICAL,
-              PADDING_HORIZONTAL,
-              PADDING_LEFT,
-              PADDING_RIGHT,
-              PADDING_TOP,
-              PADDING_BOTTOM,
-              PADDING_START,
-              PADDING_END,
-          )
-      )
+  public val PADDING_MARGIN_SPACING_TYPES: IntArray = intArrayOf(
+      Spacing.ALL,
+      Spacing.VERTICAL,
+      Spacing.HORIZONTAL,
+      Spacing.START,
+      Spacing.END,
+      Spacing.TOP,
+      Spacing.BOTTOM,
+      Spacing.LEFT,
+      Spacing.RIGHT,
+  )
+  private val LAYOUT_ONLY_PROPS: HashSet<String> = HashSet(
+      listOf(
+          ALIGN_SELF,
+          ALIGN_ITEMS,
+          COLLAPSABLE,
+          FLEX,
+          FLEX_BASIS,
+          FLEX_DIRECTION,
+          FLEX_GROW,
+          ROW_GAP,
+          COLUMN_GAP,
+          GAP,
+          FLEX_SHRINK,
+          FLEX_WRAP,
+          JUSTIFY_CONTENT,
+          ALIGN_CONTENT,
+          DISPLAY, /* position */
+          POSITION,
+          RIGHT,
+          TOP,
+          BOTTOM,
+          LEFT,
+          START,
+          END, /* dimensions */
+          WIDTH,
+          HEIGHT,
+          MIN_WIDTH,
+          MAX_WIDTH,
+          MIN_HEIGHT,
+          MAX_HEIGHT, /* margins */
+          MARGIN,
+          MARGIN_VERTICAL,
+          MARGIN_HORIZONTAL,
+          MARGIN_LEFT,
+          MARGIN_RIGHT,
+          MARGIN_TOP,
+          MARGIN_BOTTOM,
+          MARGIN_START,
+          MARGIN_END, /* paddings */
+          PADDING,
+          PADDING_VERTICAL,
+          PADDING_HORIZONTAL,
+          PADDING_LEFT,
+          PADDING_RIGHT,
+          PADDING_TOP,
+          PADDING_BOTTOM,
+          PADDING_START,
+          PADDING_END,
+      ),
+  )
 
   @JvmStatic
   public fun isLayoutOnly(map: ReadableMap, prop: String): Boolean {

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/UIManagerType.kt

@@ -30,7 +30,7 @@ public annotation class UIManagerType {
      * @deprecated Use [LEGACY] instead.
      */
     @Deprecated(
-        "UIManagerType.DEFAULT will be deleted in the next release of React Native. Use [LEGACY] instead."
+        "UIManagerType.DEFAULT will be deleted in the next release of React Native. Use [LEGACY] instead.",
     )
     public const val DEFAULT: Int = 1
 

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BorderDrawable.kt

@@ -137,26 +137,24 @@ internal class BorderDrawable(
 
   @Deprecated("Deprecated in Java")
   override fun getOpacity(): Int {
-    val maxBorderAlpha =
-        maxOf(
-            (Color.alpha(multiplyColorAlpha(computedBorderColors.left, borderAlpha))),
-            (Color.alpha(multiplyColorAlpha(computedBorderColors.top, borderAlpha))),
-            (Color.alpha(multiplyColorAlpha(computedBorderColors.right, borderAlpha))),
-            (Color.alpha(multiplyColorAlpha(computedBorderColors.bottom, borderAlpha))),
-        )
+    val maxBorderAlpha = maxOf(
+        (Color.alpha(multiplyColorAlpha(computedBorderColors.left, borderAlpha))),
+        (Color.alpha(multiplyColorAlpha(computedBorderColors.top, borderAlpha))),
+        (Color.alpha(multiplyColorAlpha(computedBorderColors.right, borderAlpha))),
+        (Color.alpha(multiplyColorAlpha(computedBorderColors.bottom, borderAlpha))),
+    )
 
     // If the highest alpha value of all border edges is 0, then the drawable is TRANSPARENT.
     if (maxBorderAlpha == 0) {
       return PixelFormat.TRANSPARENT
     }
 
-    val minBorderAlpha =
-        minOf(
-            (Color.alpha(multiplyColorAlpha(computedBorderColors.left, borderAlpha))),
-            (Color.alpha(multiplyColorAlpha(computedBorderColors.top, borderAlpha))),
-            (Color.alpha(multiplyColorAlpha(computedBorderColors.right, borderAlpha))),
-            (Color.alpha(multiplyColorAlpha(computedBorderColors.bottom, borderAlpha))),
-        )
+    val minBorderAlpha = minOf(
+        (Color.alpha(multiplyColorAlpha(computedBorderColors.left, borderAlpha))),
+        (Color.alpha(multiplyColorAlpha(computedBorderColors.top, borderAlpha))),
+        (Color.alpha(multiplyColorAlpha(computedBorderColors.right, borderAlpha))),
+        (Color.alpha(multiplyColorAlpha(computedBorderColors.bottom, borderAlpha))),
+    )
 
     /*
      * If the lowest alpha value of all border edges is 255, then the drawable is OPAQUE.
@@ -243,17 +241,16 @@ internal class BorderDrawable(
       val top = bounds.top
 
       // Check for fast path to border drawing.
-      val fastBorderColor =
-          fastBorderCompatibleColorOrZero(
-              borderLeft,
-              borderTop,
-              borderRight,
-              borderBottom,
-              computedBorderColors.left,
-              computedBorderColors.top,
-              computedBorderColors.right,
-              computedBorderColors.bottom,
-          )
+      val fastBorderColor = fastBorderCompatibleColorOrZero(
+          borderLeft,
+          borderTop,
+          borderRight,
+          borderBottom,
+          computedBorderColors.left,
+          computedBorderColors.top,
+          computedBorderColors.right,
+          computedBorderColors.bottom,
+      )
       if (fastBorderColor != 0) {
         if (Color.alpha(fastBorderColor) != 0) {
           // Border color is not transparent.

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CompositeBackgroundDrawable.kt

@@ -69,7 +69,7 @@ internal class CompositeBackgroundDrawable(
             feedbackUnderlay,
             innerShadows,
             outline,
-        )
+        ),
     ) {
 
   init {
@@ -80,7 +80,7 @@ internal class CompositeBackgroundDrawable(
   }
 
   fun withNewBackgroundImage(
-      backgroundImage: BackgroundImageDrawable?
+      backgroundImage: BackgroundImageDrawable?,
   ): CompositeBackgroundDrawable {
     return CompositeBackgroundDrawable(
         context,

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/InsetBoxShadowDrawable.kt

@@ -85,13 +85,12 @@ internal class InsetBoxShadowDrawable(
     val computedBorderRadii = computeBorderRadii()
     val computedBorderInsets = computeBorderInsets()
 
-    val paddingBoxRect =
-        RectF(
-            bounds.left + (computedBorderInsets?.left ?: 0f),
-            bounds.top + (computedBorderInsets?.top ?: 0f),
-            bounds.right - (computedBorderInsets?.right ?: 0f),
-            bounds.bottom - (computedBorderInsets?.bottom ?: 0f),
-        )
+    val paddingBoxRect = RectF(
+        bounds.left + (computedBorderInsets?.left ?: 0f),
+        bounds.top + (computedBorderInsets?.top ?: 0f),
+        bounds.right - (computedBorderInsets?.right ?: 0f),
+        bounds.bottom - (computedBorderInsets?.bottom ?: 0f),
+    )
     val paddingBoxRadii = computedBorderRadii?.let {
       floatArrayOf(
           innerRadius(it.topLeft.horizontal, computedBorderInsets?.left),
@@ -131,7 +130,7 @@ internal class InsetBoxShadowDrawable(
     canvas.save().let { saveCount ->
       if (paddingBoxRadii != null) {
         canvas.clipPath(
-            Path().apply { addRoundRect(paddingBoxRect, paddingBoxRadii, Path.Direction.CW) }
+            Path().apply { addRoundRect(paddingBoxRect, paddingBoxRadii, Path.Direction.CW) },
         )
 
         val innerRadii =

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutsetBoxShadowDrawable.kt

@@ -136,7 +136,7 @@ internal class OutsetBoxShadowDrawable(
               ),
               Path.Direction.CW,
           )
-        }
+        },
     )
 
     canvas.drawPath(

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventCategoryDef.kt

@@ -21,7 +21,7 @@ import androidx.annotation.IntDef
             EventCategoryDef.UNSPECIFIED,
             EventCategoryDef.DISCRETE,
             EventCategoryDef.CONTINUOUS,
-        ]
+        ],
 )
 @Retention(AnnotationRetention.SOURCE)
 internal annotation class EventCategoryDef {

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt

@@ -78,7 +78,7 @@ internal class FabricEventDispatcher(
         ReactSoftExceptionLogger.logSoftException(
             TAG,
             IllegalStateException(
-                "Fabric UIManager expected to implement SynchronousEventReceiver."
+                "Fabric UIManager expected to implement SynchronousEventReceiver.",
             ),
         )
       }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.kt

@@ -61,7 +61,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
           TAG,
           IllegalStateException(
               "Cannot dispatch a Pointer that has no MotionEvent; the PointerEvent has been" +
-                  " recycled"
+                  " recycled",
           ),
       )
       return
@@ -204,13 +204,14 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
         "button",
         getButtonChange(pointerType, eventState.lastButtonState, buttonState),
     )
-    pointerEvent.putInt("buttons", getButtons(_eventName, pointerType, buttonState))
+    val buttons = getButtons(_eventName, pointerType, buttonState)
+    pointerEvent.putInt("buttons", buttons)
 
     val pressure =
         if (isClickEvent) {
           0.0 // click events need pressure=0
         } else {
-          getPressure(pointerEvent.getInt("buttons"), _eventName)
+          getPressure(buttons, _eventName)
         }
 
     pointerEvent.putDouble("pressure", pressure)
@@ -256,7 +257,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
       logSoftException(
           TAG,
           IllegalStateException(
-              "Cannot dispatch a Pointer that has no MotionEvent; the PointerEvent has been recycled"
+              "Cannot dispatch a Pointer that has no MotionEvent; the PointerEvent has been recycled",
           ),
       )
       return

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.kt

@@ -137,7 +137,7 @@ public class TouchEvent private constructor() : Event<TouchEvent>() {
           TAG,
           IllegalStateException(
               "Cannot dispatch a TouchEvent that has no MotionEvent; the TouchEvent has been" +
-                  " recycled"
+                  " recycled",
           ),
       )
       return false

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderColors.kt

@@ -43,7 +43,7 @@ internal data class ColorEdges(
  */
 @JvmInline
 internal value class BorderColors(
-    @param:ColorInt val edgeColors: Array<Int?> = arrayOfNulls<Int?>(LogicalEdge.values().size)
+    @param:ColorInt val edgeColors: Array<Int?> = arrayOfNulls<Int?>(LogicalEdge.values().size),
 ) {
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderInsets.kt

@@ -27,10 +27,10 @@ internal class BorderInsets {
    * Sets the border width for a specific logical edge.
    *
    * @param edge The logical edge to set
-   * @param width The border width in pixels, or null to clear
+   * @param width The border width in pixels, or null or NaN to clear
    */
   fun setBorderWidth(edge: LogicalEdge, width: Float?) {
-    edgeInsets[edge.ordinal] = width
+    edgeInsets[edge.ordinal] = width?.takeUnless { it.isNaN() }
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/ColorStop.kt

@@ -143,7 +143,7 @@ internal object ColorStopUtils {
   // Algorithm is referred from Blink engine
   // [source](https://github.com/chromium/chromium/blob/a296b1bad6dc1ed9d751b7528f7ca2134227b828/third_party/blink/renderer/core/css/css_gradient_value.cc#L240).
   private fun processColorTransitionHints(
-      originalStops: Array<ProcessedColorStop>
+      originalStops: Array<ProcessedColorStop>,
   ): List<ProcessedColorStop> {
     val colorStops = originalStops.toMutableList()
     var indexOffset = 0

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/Overflow.kt

@@ -25,17 +25,18 @@ internal enum class Overflow {
     /**
      * Parses a string into an Overflow value.
      *
-     * @param overflow The string value (case-insensitive)
-     * @return The corresponding Overflow, or null if not recognized
+     * @param overflow The string value (case-insensitive), or null
+     * @param default The value to return when [overflow] is null or unrecognized
+     * @return The corresponding Overflow, or [default]
      */
     @JvmStatic
-    fun fromString(overflow: String): Overflow? {
-      return when (overflow.lowercase()) {
-        "visible" -> VISIBLE
-        "hidden" -> HIDDEN
-        "scroll" -> SCROLL
-        else -> null
-      }
-    }
+    @JvmOverloads
+    fun fromString(overflow: String?, default: Overflow = VISIBLE): Overflow =
+        when (overflow?.lowercase()) {
+          "visible" -> VISIBLE
+          "hidden" -> HIDDEN
+          "scroll" -> SCROLL
+          else -> default
+        }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/RadialGradient.kt

@@ -327,20 +327,18 @@ internal class RadialGradient(
       height: Float,
       sizeKeyword: GradientSize.KeywordType,
   ): Pair<Float, Float> {
-    val corners =
-        arrayOf(
-            Pair(0f, 0f), // top-left
-            Pair(width, 0f), // top-right
-            Pair(width, height), // bottom-right
-            Pair(0f, height), // bottom-left
-        )
+    val corners = arrayOf(
+        Pair(0f, 0f), // top-left
+        Pair(width, 0f), // top-right
+        Pair(width, height), // bottom-right
+        Pair(0f, height), // bottom-left
+    )
 
     var cornerIndex = 0
-    var distance =
-        sqrt(
-            (centerX - corners[cornerIndex].first).pow(2) +
-                (centerY - corners[cornerIndex].second).pow(2)
-        )
+    var distance = sqrt(
+        (centerX - corners[cornerIndex].first).pow(2) +
+            (centerY - corners[cornerIndex].second).pow(2),
+    )
     val isClosestCorner = sizeKeyword == GradientSize.KeywordType.CLOSEST_CORNER
 
     for (i in 1 until corners.size) {