react-native-tvos 0.84.1-0 → 0.85.0-0

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

@@ -14,7 +14,19 @@ import com.facebook.react.bridge.JSApplicationCausedNativeException
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 
-/** Represents all logical properties and shorthands for border radius. */
+/**
+ * Represents a box shadow effect that can be applied to a React Native view.
+ *
+ * This data class models the CSS box-shadow property, including offset, blur, spread, color, and
+ * inset options.
+ *
+ * @property offsetX The horizontal offset of the shadow in pixels
+ * @property offsetY The vertical offset of the shadow in pixels
+ * @property color The color of the shadow, or null for default
+ * @property blurRadius The blur radius of the shadow, or null for no blur
+ * @property spreadDistance The spread distance of the shadow, or null for no spread
+ * @property inset Whether the shadow is inset (inner shadow), or null for outer shadow
+ */
 public data class BoxShadow(
     val offsetX: Float,
     val offsetY: Float,
@@ -24,6 +36,16 @@ public data class BoxShadow(
     val inset: Boolean? = null,
 ) {
   public companion object {
+    /**
+     * Parses a ReadableMap into a BoxShadow.
+     *
+     * The map must contain "offsetX" and "offsetY" keys. Optional keys include "color",
+     * "blurRadius", "spreadDistance", and "inset".
+     *
+     * @param boxShadow The map containing box shadow configuration
+     * @param context Android context for color resolution
+     * @return A BoxShadow instance, or null if required fields are missing
+     */
     @JvmStatic
     public fun parse(boxShadow: ReadableMap?, context: Context): BoxShadow? {
       if (boxShadow == null || !(boxShadow.hasKey("offsetX") && boxShadow.hasKey("offsetY"))) {

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

@@ -14,18 +14,56 @@ import com.facebook.react.uimanager.LengthPercentageType
 import com.facebook.react.uimanager.PixelUtil
 import kotlin.math.ln
 
-// ColorStop type is passed by user, so color and position both could be null.
-// e.g.
-// color is null in transition hint syntax: (red, 20%, green)
-// position can be null too (red 20%, green, purple)
+/**
+ * Represents a color stop in a gradient as specified by the user.
+ *
+ * Color stops define the colors and their positions within a gradient. Both color and position can
+ * be null to support CSS gradient syntax features like transition hints.
+ *
+ * Examples:
+ * - color is null in transition hint syntax: (red, 20%, green)
+ * - position can be null too: (red 20%, green, purple)
+ *
+ * @property color The color value at this stop, or null for transition hints
+ * @property position The position of this stop as a length or percentage, or null for auto
+ */
 internal class ColorStop(var color: Int? = null, val position: LengthPercentage? = null)
 
-// ProcessedColorStop type describes type after processing.
-// Here both types are nullable to keep it convenient for the color stop fix up algorithm.
-// Final Color stop will have both non-null, we check for non null after calling getFixedColorStop.
+/**
+ * Represents a color stop after processing with resolved position.
+ *
+ * This class is used internally during the color stop fix-up algorithm. Both properties are
+ * nullable to accommodate intermediate states during processing, but will be non-null after
+ * [ColorStopUtils.getFixedColorStops] completes.
+ *
+ * @property color The resolved color value, or null during processing
+ * @property position The resolved position as a fraction (0.0 to 1.0), or null during processing
+ */
 internal class ProcessedColorStop(var color: Int? = null, val position: Float? = null)
 
+/**
+ * Utility object for processing gradient color stops according to CSS specification.
+ *
+ * This object implements the color stop fix-up algorithm as defined in the CSS Images Module Level
+ * 4 specification, handling position interpolation and transition hints.
+ *
+ * @see <a href="https://drafts.csswg.org/css-images-4/#coloring-gradient-line">CSS Images Module
+ *   Level 4</a>
+ */
 internal object ColorStopUtils {
+  /**
+   * Processes a list of color stops into fixed color stops with resolved positions.
+   *
+   * This method implements the CSS color stop fix-up algorithm:
+   * 1. Sets first stop position to 0% and last to 100% if not specified
+   * 2. Ensures positions are monotonically increasing
+   * 3. Interpolates positions for stops without explicit positions
+   * 4. Processes transition hints by generating intermediate color stops
+   *
+   * @param colorStops The input color stops from user specification
+   * @param gradientLineLength The length of the gradient line in pixels
+   * @return A list of processed color stops with all positions resolved
+   */
   fun getFixedColorStops(
       colorStops: List<ColorStop>,
       gradientLineLength: Float,

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

@@ -7,21 +7,47 @@
 
 package com.facebook.react.uimanager.style
 
-/** Represents the collection of possible computed border radius style properties. */
+/**
+ * Enum representing the computed border radius properties for each physical corner.
+ *
+ * Unlike [BorderRadiusProp] which includes logical properties, this enum only contains the four
+ * physical corners after layout direction resolution.
+ */
 public enum class ComputedBorderRadiusProp {
+  /** The computed border radius for the top-left corner. */
   COMPUTED_BORDER_TOP_LEFT_RADIUS,
+  /** The computed border radius for the top-right corner. */
   COMPUTED_BORDER_TOP_RIGHT_RADIUS,
+  /** The computed border radius for the bottom-right corner. */
   COMPUTED_BORDER_BOTTOM_RIGHT_RADIUS,
+  /** The computed border radius for the bottom-left corner. */
   COMPUTED_BORDER_BOTTOM_LEFT_RADIUS,
 }
 
-/** Physical edge lengths (in DIPs) for a border-radius. */
+/**
+ * Represents the resolved border radius values for all four physical corners.
+ *
+ * This data class contains the final computed [CornerRadii] values (in DIPs) after resolving
+ * logical properties based on layout direction and ensuring no corner overlap per CSS spec.
+ *
+ * @property topLeft The radii for the top-left corner
+ * @property topRight The radii for the top-right corner
+ * @property bottomLeft The radii for the bottom-left corner
+ * @property bottomRight The radii for the bottom-right corner
+ * @see BorderRadiusStyle
+ * @see CornerRadii
+ */
 public data class ComputedBorderRadius(
     val topLeft: CornerRadii,
     val topRight: CornerRadii,
     val bottomLeft: CornerRadii,
     val bottomRight: CornerRadii,
 ) {
+  /**
+   * Checks if any corner has a non-zero border radius.
+   *
+   * @return true if at least one corner has a positive radius
+   */
   public fun hasRoundedBorders(): Boolean {
     return topLeft.horizontal > 0f ||
         topLeft.vertical > 0f ||
@@ -32,10 +58,21 @@ public data class ComputedBorderRadius(
         bottomRight.horizontal > 0f
   }
 
+  /**
+   * Checks if all corners have the same radius values.
+   *
+   * @return true if all corners are equal
+   */
   public fun isUniform(): Boolean {
     return topLeft == topRight && topLeft == bottomLeft && topLeft == bottomRight
   }
 
+  /**
+   * Gets the corner radii for a specific computed border radius property.
+   *
+   * @param property The computed border radius property
+   * @return The CornerRadii for the specified corner
+   */
   public fun get(property: ComputedBorderRadiusProp): CornerRadii {
     return when (property) {
       ComputedBorderRadiusProp.COMPUTED_BORDER_TOP_LEFT_RADIUS -> topLeft
@@ -45,6 +82,7 @@ public data class ComputedBorderRadius(
     }
   }
 
+  /** Creates a ComputedBorderRadius with all corners set to zero radius. */
   public constructor() :
       this(CornerRadii(0f, 0f), CornerRadii(0f, 0f), CornerRadii(0f, 0f), CornerRadii(0f, 0f))
 }

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

@@ -10,17 +10,37 @@ package com.facebook.react.uimanager.style
 import com.facebook.react.uimanager.LengthPercentage
 import com.facebook.react.uimanager.PixelUtil
 
-/** Represents the resolved horizontal and vertical radii of the ellipse representing a corner. */
+/**
+ * Represents the resolved horizontal and vertical radii of the ellipse representing a corner.
+ *
+ * This data class stores the computed radius values for a single corner of a view's border. Each
+ * corner can have an elliptical shape with different horizontal and vertical radii.
+ *
+ * @property horizontal The horizontal radius of the corner ellipse in pixels
+ * @property vertical The vertical radius of the corner ellipse in pixels
+ */
 public data class CornerRadii(
     val horizontal: Float = 0f,
     val vertical: Float = 0f,
 ) {
+  /**
+   * Creates CornerRadii by resolving a LengthPercentage value against reference dimensions.
+   *
+   * @param length The length/percentage value to resolve
+   * @param referenceWidth The reference width for percentage calculations
+   * @param referenceHeight The reference height for percentage calculations
+   */
   public constructor(
       length: LengthPercentage,
       referenceWidth: Float,
       referenceHeight: Float,
   ) : this(horizontal = length.resolve(referenceWidth), vertical = length.resolve(referenceHeight))
 
+  /**
+   * Converts the corner radii from density-independent pixels (DIP) to physical pixels.
+   *
+   * @return A new CornerRadii with values converted to pixels
+   */
   public fun toPixelFromDIP(): CornerRadii {
     return CornerRadii(PixelUtil.toPixelFromDIP(horizontal), PixelUtil.toPixelFromDIP(vertical))
   }

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

@@ -9,6 +9,22 @@ package com.facebook.react.uimanager.style
 
 import android.graphics.Shader
 
+/**
+ * Interface representing a CSS gradient that can be rendered as an Android Shader.
+ *
+ * Implementations of this interface (such as [LinearGradient] and [RadialGradient]) convert CSS
+ * gradient definitions into Android Shader objects for rendering backgrounds.
+ *
+ * @see LinearGradient
+ * @see RadialGradient
+ */
 internal interface Gradient {
+  /**
+   * Creates an Android Shader for rendering this gradient.
+   *
+   * @param width The width of the area to fill
+   * @param height The height of the area to fill
+   * @return A Shader instance configured for this gradient
+   */
   fun getShader(width: Float, height: Float): Shader
 }

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

@@ -18,6 +18,16 @@ import kotlin.math.atan
 import kotlin.math.sqrt
 import kotlin.math.tan
 
+/**
+ * Represents a CSS linear gradient for background rendering.
+ *
+ * This class implements the CSS linear-gradient specification, supporting angle-based and
+ * keyword-based directions along with color stops. It generates an Android Shader for rendering.
+ *
+ * @property direction The direction of the gradient (angle or keyword)
+ * @property colorStops The list of color stops defining the gradient colors
+ * @see <a href="https://www.w3.org/TR/css-images-3/#linear-gradients">CSS Linear Gradients</a>
+ */
 internal class LinearGradient(val direction: Direction, val colorStops: List<ColorStop>) :
     Gradient {
   companion object {
@@ -76,15 +86,39 @@ internal class LinearGradient(val direction: Direction, val colorStops: List<Col
     }
   }
 
+  /**
+   * Sealed class representing the direction of a linear gradient.
+   *
+   * Directions can be specified using explicit angles or CSS keywords.
+   */
   sealed class Direction {
+    /**
+     * Represents a direction specified as an angle in degrees.
+     *
+     * @property angle The angle in degrees (0 = to top, 90 = to right, etc.)
+     */
     class Angle(val angle: Double) : Direction()
 
+    /**
+     * Represents a direction specified using a CSS keyword.
+     *
+     * @property keyword The direction keyword
+     */
     class Keyword(val keyword: KeywordType) : Direction()
 
+    /**
+     * Enum of CSS linear gradient direction keywords.
+     *
+     * @property value The CSS string value
+     */
     enum class KeywordType(val value: String) {
+      /** Gradient runs toward the top-right corner. */
       TO_TOP_RIGHT("to top right"),
+      /** Gradient runs toward the bottom-right corner. */
       TO_BOTTOM_RIGHT("to bottom right"),
+      /** Gradient runs toward the top-left corner. */
       TO_TOP_LEFT("to top left"),
+      /** Gradient runs toward the bottom-left corner. */
       TO_BOTTOM_LEFT("to bottom left");
 
       companion object {

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

@@ -10,41 +10,61 @@ package com.facebook.react.uimanager.style
 import com.facebook.react.uimanager.Spacing
 import java.lang.IllegalArgumentException
 
-/** Represents the collection of possible box edges and shorthands. */
+/**
+ * Enum representing all possible box edges using both physical and logical naming conventions.
+ *
+ * This enum includes physical edges (LEFT, RIGHT, TOP, BOTTOM), logical edges that adapt to writing
+ * direction (START, END, BLOCK_START, BLOCK_END), and shorthand values (ALL, HORIZONTAL, VERTICAL,
+ * BLOCK). Each value can be converted to a [Spacing] type for layout calculations.
+ *
+ * @see Spacing
+ */
 public enum class LogicalEdge {
+  /** Shorthand for all four edges. */
   ALL {
     override fun toSpacingType(): Int = Spacing.ALL
   },
+  /** The physical left edge. */
   LEFT {
     override fun toSpacingType(): Int = Spacing.LEFT
   },
+  /** The physical right edge. */
   RIGHT {
     override fun toSpacingType(): Int = Spacing.RIGHT
   },
+  /** The physical top edge. */
   TOP {
     override fun toSpacingType(): Int = Spacing.TOP
   },
+  /** The physical bottom edge. */
   BOTTOM {
     override fun toSpacingType(): Int = Spacing.BOTTOM
   },
+  /** The logical start edge (left in LTR, right in RTL). */
   START {
     override fun toSpacingType(): Int = Spacing.START
   },
+  /** The logical end edge (right in LTR, left in RTL). */
   END {
     override fun toSpacingType(): Int = Spacing.END
   },
+  /** Shorthand for left and right edges. */
   HORIZONTAL {
     override fun toSpacingType(): Int = Spacing.HORIZONTAL
   },
+  /** Shorthand for top and bottom edges. */
   VERTICAL {
     override fun toSpacingType(): Int = Spacing.VERTICAL
   },
+  /** The logical block-start edge (typically top in horizontal writing modes). */
   BLOCK_START {
     override fun toSpacingType(): Int = Spacing.BLOCK_START
   },
+  /** The logical block-end edge (typically bottom in horizontal writing modes). */
   BLOCK_END {
     override fun toSpacingType(): Int = Spacing.BLOCK_END
   },
+  /** Shorthand for block-start and block-end edges. */
   BLOCK {
     override fun toSpacingType(): Int = Spacing.BLOCK
   };
@@ -54,9 +74,21 @@ public enum class LogicalEdge {
   // INLINE_END,
   // INLINE;
 
+  /**
+   * Converts this logical edge to the corresponding Spacing type constant.
+   *
+   * @return The Spacing constant for this edge
+   */
   public abstract fun toSpacingType(): Int
 
   public companion object {
+    /**
+     * Converts a Spacing type constant to the corresponding LogicalEdge.
+     *
+     * @param spacingType The Spacing constant
+     * @return The corresponding LogicalEdge
+     * @throws IllegalArgumentException if the spacing type is not recognized
+     */
     @JvmStatic
     public fun fromSpacingType(spacingType: Int): LogicalEdge {
       return when (spacingType) {

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

@@ -7,12 +7,29 @@
 
 package com.facebook.react.uimanager.style
 
+/**
+ * Enum representing the possible outline rendering styles.
+ *
+ * These values correspond to CSS outline-style property values supported by React Native. Outlines
+ * are drawn outside the border edge and do not affect layout.
+ *
+ * @see BorderStyle
+ */
 public enum class OutlineStyle {
+  /** A solid continuous line. */
   SOLID,
+  /** A series of dashes. */
   DASHED,
+  /** A series of dots. */
   DOTTED;
 
   public companion object {
+    /**
+     * Parses a string into an OutlineStyle.
+     *
+     * @param outlineStyle The string value (case-insensitive)
+     * @return The corresponding OutlineStyle, or null if not recognized
+     */
     @JvmStatic
     public fun fromString(outlineStyle: String): OutlineStyle? {
       return when (outlineStyle.lowercase()) {

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

@@ -7,12 +7,27 @@
 
 package com.facebook.react.uimanager.style
 
+/**
+ * Enum representing the overflow behavior of a view's content.
+ *
+ * These values correspond to CSS overflow property values, controlling how content that exceeds the
+ * view's bounds is handled.
+ */
 internal enum class Overflow {
+  /** Content is not clipped and may be visible outside the view's bounds. */
   VISIBLE,
+  /** Content is clipped to the view's bounds without scrolling. */
   HIDDEN,
+  /** Content is clipped to the view's bounds but can be scrolled to reveal hidden content. */
   SCROLL;
 
   companion object {
+    /**
+     * Parses a string into an Overflow value.
+     *
+     * @param overflow The string value (case-insensitive)
+     * @return The corresponding Overflow, or null if not recognized
+     */
     @JvmStatic
     fun fromString(overflow: String): Overflow? {
       return when (overflow.lowercase()) {

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

@@ -23,6 +23,19 @@ import kotlin.math.min
 import kotlin.math.pow
 import kotlin.math.sqrt
 
+/**
+ * Represents a CSS radial gradient for background rendering.
+ *
+ * This class implements the CSS radial-gradient specification, supporting circular and elliptical
+ * shapes, various sizing keywords, and custom positioning. It generates an Android Shader for
+ * rendering.
+ *
+ * @property shape The shape of the gradient (circle or ellipse)
+ * @property size The sizing specification (keyword or explicit dimensions)
+ * @property position The center position of the gradient
+ * @property colorStops The list of color stops defining the gradient colors
+ * @see <a href="https://www.w3.org/TR/css-images-3/#radial-gradients">CSS Radial Gradients</a>
+ */
 internal class RadialGradient(
     val shape: Shape,
     val size: GradientSize,
@@ -129,8 +142,15 @@ internal class RadialGradient(
     }
   }
 
+  /**
+   * Enum representing the shape of a radial gradient.
+   *
+   * @see <a href="https://www.w3.org/TR/css-images-3/#valdef-radial-gradient-circle">CSS circle</a>
+   */
   internal enum class Shape {
+    /** A circular gradient with equal horizontal and vertical radii. */
     CIRCLE,
+    /** An elliptical gradient that can have different horizontal and vertical radii. */
     ELLIPSE;
 
     companion object {
@@ -144,11 +164,33 @@ internal class RadialGradient(
     }
   }
 
+  /**
+   * Sealed class representing the sizing specification for a radial gradient.
+   *
+   * Sizes can be specified using keywords (closest-side, farthest-corner, etc.) or explicit
+   * dimensions.
+   */
   sealed class GradientSize {
+    /**
+     * Represents a size specified using a CSS keyword.
+     *
+     * @property keyword The sizing keyword
+     */
     class Keyword(val keyword: KeywordType) : GradientSize()
 
+    /**
+     * Represents a size specified using explicit horizontal and vertical dimensions.
+     *
+     * @property x The horizontal radius
+     * @property y The vertical radius
+     */
     class Dimensions(val x: LengthPercentage, val y: LengthPercentage) : GradientSize()
 
+    /**
+     * Enum of CSS radial gradient sizing keywords.
+     *
+     * @property value The CSS string value
+     */
     enum class KeywordType(val value: String) {
       CLOSEST_SIDE("closest-side"),
       FARTHEST_SIDE("farthest-side"),

package/ReactAndroid/src/main/java/com/facebook/react/views/common/UiModeUtils.kt

@@ -7,12 +7,32 @@
 
 package com.facebook.react.views.common
 
+import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
 
 /** Utility object providing static methods for working with UI mode properties from Context. */
 internal object UiModeUtils {
 
+  private var isTVDeviceCached: Boolean? = null
+
+  /**
+   * Determines whether the device is a TV (Android TV / Fire TV).
+   * The result is cached after the first call.
+   *
+   * @param context The context to check the UI mode from
+   * @return true if the device is running in television mode, false otherwise
+   */
+  @JvmStatic
+  fun isTVDevice(context: Context): Boolean {
+    return isTVDeviceCached ?: run {
+      val uiModeManager = context.getSystemService(Context.UI_MODE_SERVICE) as? UiModeManager
+      val result = uiModeManager?.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION
+      isTVDeviceCached = result
+      result
+    }
+  }
+
   /**
    * Determines whether the current UI mode is dark mode
    *

package/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.kt

@@ -46,8 +46,7 @@ public class ReactDrawerLayoutManager :
       reactContext: ThemedReactContext,
       view: ReactDrawerLayout,
   ) {
-    val eventDispatcher =
-        UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id) ?: return
+    val eventDispatcher = UIManagerHelper.getEventDispatcher(reactContext) ?: return
     view.addDrawerListener(DrawerEventEmitter(view, eventDispatcher))
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt

@@ -129,9 +129,7 @@ public class ReactImageView(
     if (!shouldNotify) {
       downloadListener = null
     } else {
-      val eventDispatcher =
-          UIManagerHelper.getEventDispatcherForReactTag((context as ReactContext), id)
-
+      val eventDispatcher = UIManagerHelper.getEventDispatcher((context as ReactContext))
       downloadListener =
           object : ReactImageDownloadListener<ImageInfo>() {
             override fun onProgressChange(loaded: Int, total: Int) {
@@ -378,8 +376,7 @@ public class ReactImageView(
       } catch (e: RuntimeException) {
         // Only provide updates if downloadListener is set (shouldNotify is true)
         if (downloadListener != null) {
-          val eventDispatcher =
-              UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)
+          val eventDispatcher = UIManagerHelper.getEventDispatcher(context as ReactContext)
           eventDispatcher?.dispatchEvent(
               createErrorEvent(UIManagerHelper.getSurfaceId(this), id, e)
           )
@@ -414,14 +411,16 @@ public class ReactImageView(
 
     // We store this in a local variable as it's coming from super.getHierarchy()
     val hierarchy = this.hierarchy
-    hierarchy.actualImageScaleType = scaleType
+    hierarchy.setActualImageScaleType(scaleType)
 
-    if (defaultImageDrawable != null) {
-      hierarchy.setPlaceholderImage(defaultImageDrawable, scaleType)
+    val defaultDrawable = defaultImageDrawable
+    if (defaultDrawable != null) {
+      hierarchy.setPlaceholderImage(defaultDrawable, scaleType)
     }
 
-    if (loadingImageDrawable != null) {
-      hierarchy.setPlaceholderImage(loadingImageDrawable, ScalingUtils.ScaleType.CENTER)
+    val loadingDrawable = loadingImageDrawable
+    if (loadingDrawable != null) {
+      hierarchy.setPlaceholderImage(loadingDrawable, ScalingUtils.ScaleType.CENTER)
     }
 
     val roundingParams = hierarchy.roundingParams

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt

@@ -91,7 +91,7 @@ internal class ReactModalHostManager :
   }
 
   override fun addEventEmitters(reactContext: ThemedReactContext, view: ReactModalHostView) {
-    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id)
+    val dispatcher = UIManagerHelper.getEventDispatcher(reactContext)
     if (dispatcher != null) {
       view.onRequestCloseListener = OnRequestCloseListener {
         dispatcher.dispatchEvent(

package/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.kt

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+@file:Suppress("DEPRECATION")
+
 package com.facebook.react.views.progressbar
 
 import android.content.Context
@@ -16,6 +18,7 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.BaseViewManager
+import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.PixelUtil.toDIPFromPixel
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewManagerDelegate
@@ -33,10 +36,9 @@ import java.util.WeakHashMap
  * a [ProgressBar] changes, we have to drop the existing [ProgressBar] (if there is one) and create
  * a new one with the style given.
  */
-@Suppress("DEPRECATION")
 @ReactModule(name = ReactProgressBarViewManager.REACT_CLASS)
 internal class ReactProgressBarViewManager :
-    BaseViewManager<ProgressBarContainerView, ProgressBarShadowNode>(),
+    BaseViewManager<ProgressBarContainerView, LayoutShadowNode>(),
     AndroidProgressBarManagerInterface<ProgressBarContainerView> {
   @Suppress("IDENTITY_SENSITIVE_OPERATIONS_WITH_VALUE_TYPE")
   private val measuredStyles = WeakHashMap<Int, Pair<Int, Int>>()
@@ -82,10 +84,9 @@ internal class ReactProgressBarViewManager :
   @ReactProp(name = PROP_ATTR)
   override fun setTypeAttr(view: ProgressBarContainerView, value: String?): Unit = Unit
 
-  override fun createShadowNodeInstance(): ProgressBarShadowNode = ProgressBarShadowNode()
+  override fun createShadowNodeInstance(): LayoutShadowNode = LayoutShadowNode()
 
-  override fun getShadowNodeClass(): Class<ProgressBarShadowNode> =
-      ProgressBarShadowNode::class.java
+  override fun getShadowNodeClass(): Class<LayoutShadowNode> = LayoutShadowNode::class.java
 
   override fun updateExtraData(root: ProgressBarContainerView, extraData: Any) {
     // do nothing