react-native-tvos 0.78.0-0rc4 → 0.79.0-0

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

@@ -7,19 +7,34 @@
 
 package com.facebook.react.uimanager.style
 
+import android.content.Context
 import android.graphics.LinearGradient as AndroidLinearGradient
 import android.graphics.Shader
+import androidx.core.graphics.ColorUtils
+import com.facebook.react.bridge.ColorPropConverter
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
+import com.facebook.react.uimanager.FloatUtil
+import com.facebook.react.uimanager.LengthPercentage
+import com.facebook.react.uimanager.LengthPercentageType
+import com.facebook.react.uimanager.PixelUtil
 import kotlin.math.atan
+import kotlin.math.ln
+import kotlin.math.sqrt
 import kotlin.math.tan
 
+private data class ColorStop(var color: Int? = null, val position: LengthPercentage? = null)
+
+private data class ProcessedColorStop(var color: Int? = null, val position: Float? = null)
+
 internal class LinearGradient(
     directionMap: ReadableMap,
-    private val colors: IntArray,
-    private val positions: FloatArray
+    private val colorStopsArray: ReadableArray,
+    private val context: Context
 ) {
   private sealed class Direction {
-    public data class Angle(val value: Double) : Direction()
+    data class Angle(val value: Double) : Direction()
 
     enum class Keywords {
       TO_TOP_RIGHT,
@@ -28,7 +43,7 @@ internal class LinearGradient(
       TO_BOTTOM_LEFT
     }
 
-    public data class Keyword(val value: Keywords) : Direction()
+    data class Keyword(val value: Keywords) : Direction()
   }
 
   private val direction: Direction =
@@ -55,7 +70,29 @@ internal class LinearGradient(
         else -> throw IllegalArgumentException("Invalid direction type: $type")
       }
 
-  public fun getShader(width: Float, height: Float): Shader {
+  private val colorStops: ArrayList<ColorStop> = run {
+    val stops = ArrayList<ColorStop>(colorStopsArray.size())
+    for (i in 0 until colorStopsArray.size()) {
+      val colorStop = colorStopsArray.getMap(i) ?: continue
+      val color: Int? =
+          when {
+            !colorStop.hasKey("color") || colorStop.isNull("color") -> {
+              null
+            }
+            colorStop.getType("color") == ReadableType.Map -> {
+              ColorPropConverter.getColor(colorStop.getMap("color"), context)
+            }
+            else -> colorStop.getInt("color")
+          }
+
+      val position = LengthPercentage.setFromDynamic(colorStop.getDynamic("position"))
+
+      stops.add(ColorStop(color, position))
+    }
+    stops
+  }
+
+  fun getShader(width: Float, height: Float): Shader {
     val angle =
         when (direction) {
           is Direction.Angle -> direction.value
@@ -63,6 +100,21 @@ internal class LinearGradient(
               getAngleForKeyword(direction.value, width.toDouble(), height.toDouble())
         }
     val (startPoint, endPoint) = endPointsFromAngle(angle, height, width)
+    val dx = endPoint[0] - startPoint[0]
+    val dy = endPoint[1] - startPoint[1]
+    val gradientLineLength = sqrt(dx * dx + dy * dy)
+    val processedColorStops = getFixedColorStops(colorStops, gradientLineLength)
+    val finalStops = processColorTransitionHints(processedColorStops)
+    val colors = IntArray(finalStops.size)
+    val positions = FloatArray(finalStops.size)
+
+    finalStops.forEachIndexed { i, colorStop ->
+      val color = colorStop.color
+      if (color != null && colorStop.position != null) {
+        colors[i] = color
+        positions[i] = colorStop.position
+      }
+    }
     return AndroidLinearGradient(
         startPoint[0],
         startPoint[1],
@@ -134,4 +186,178 @@ internal class LinearGradient(
 
     return Pair(firstPoint, secondPoint)
   }
+
+  private fun getFixedColorStops(
+      colorStops: ArrayList<ColorStop>,
+      gradientLineLength: Float
+  ): Array<ProcessedColorStop> {
+    val fixedColorStops = Array<ProcessedColorStop>(colorStops.size) { ProcessedColorStop() }
+    var hasNullPositions = false
+    var maxPositionSoFar =
+        resolveColorStopPosition(colorStops[0].position, gradientLineLength) ?: 0f
+
+    for (i in colorStops.indices) {
+      val colorStop = colorStops[i]
+      var newPosition = resolveColorStopPosition(colorStop.position, gradientLineLength)
+
+      // Step 1:
+      // If the first color stop does not have a position,
+      // set its position to 0%. If the last color stop does not have a position,
+      // set its position to 100%.
+      newPosition =
+          newPosition
+              ?: when (i) {
+                0 -> 0f
+                colorStops.size - 1 -> 1f
+                else -> null
+              }
+
+      // Step 2:
+      // If a color stop or transition hint has a position
+      // that is less than the specified position of any color stop or transition hint
+      // before it in the list, set its position to be equal to the
+      // largest specified position of any color stop or transition hint before it.
+      if (newPosition != null) {
+        newPosition = maxOf(newPosition, maxPositionSoFar)
+        fixedColorStops[i] = ProcessedColorStop(colorStop.color, newPosition)
+        maxPositionSoFar = newPosition
+      } else {
+        hasNullPositions = true
+      }
+    }
+
+    // Step 3:
+    // If any color stop still does not have a position,
+    // then, for each run of adjacent color stops without positions,
+    // set their positions so that they are evenly spaced between the preceding and
+    // following color stops with positions.
+    if (hasNullPositions) {
+      var lastDefinedIndex = 0
+      for (i in 1 until fixedColorStops.size) {
+        val endPosition = fixedColorStops[i].position
+        if (endPosition != null) {
+          val unpositionedStops = i - lastDefinedIndex - 1
+          if (unpositionedStops > 0) {
+            val startPosition = fixedColorStops[lastDefinedIndex].position
+            if (startPosition != null) {
+              val increment = (endPosition - startPosition) / (unpositionedStops + 1)
+              for (j in 1..unpositionedStops) {
+                fixedColorStops[lastDefinedIndex + j] =
+                    ProcessedColorStop(
+                        colorStops[lastDefinedIndex + j].color, startPosition + increment * j)
+              }
+            }
+          }
+          lastDefinedIndex = i
+        }
+      }
+    }
+
+    return fixedColorStops
+  }
+
+  private fun processColorTransitionHints(
+      originalStops: Array<ProcessedColorStop>
+  ): List<ProcessedColorStop> {
+    val colorStops = originalStops.toMutableList()
+    var indexOffset = 0
+
+    for (i in 1 until originalStops.size - 1) {
+      // Skip if not a color hint
+      if (originalStops[i].color != null) {
+        continue
+      }
+
+      val x = i + indexOffset
+      if (x < 1) {
+        continue
+      }
+
+      val offsetLeft = colorStops[x - 1].position
+      val offsetRight = colorStops[x + 1].position
+      val offset = colorStops[x].position
+      if (offsetLeft == null || offsetRight == null || offset == null) {
+        continue
+      }
+      val leftDist = offset - offsetLeft
+      val rightDist = offsetRight - offset
+      val totalDist = offsetRight - offsetLeft
+      val leftColor = colorStops[x - 1].color
+      val rightColor = colorStops[x + 1].color
+
+      if (FloatUtil.floatsEqual(leftDist, rightDist)) {
+        colorStops.removeAt(x)
+        --indexOffset
+        continue
+      }
+
+      if (FloatUtil.floatsEqual(leftDist, 0f)) {
+        colorStops[x].color = rightColor
+        continue
+      }
+
+      if (FloatUtil.floatsEqual(rightDist, 0f)) {
+        colorStops[x].color = leftColor
+        continue
+      }
+
+      val newStops = ArrayList<ProcessedColorStop>(9)
+
+      // Position the new color stops
+      if (leftDist > rightDist) {
+        for (y in 0..6) {
+          newStops.add(ProcessedColorStop(null, offsetLeft + leftDist * ((7f + y) / 13f)))
+        }
+        newStops.add(ProcessedColorStop(null, offset + rightDist * (1f / 3f)))
+        newStops.add(ProcessedColorStop(null, offset + rightDist * (2f / 3f)))
+      } else {
+        newStops.add(ProcessedColorStop(null, offsetLeft + leftDist * (1f / 3f)))
+        newStops.add(ProcessedColorStop(null, offsetLeft + leftDist * (2f / 3f)))
+        for (y in 0..6) {
+          newStops.add(ProcessedColorStop(null, offset + rightDist * (y / 13f)))
+        }
+      }
+
+      // Calculate colors for the new stops
+      val hintRelativeOffset = leftDist / totalDist
+      val logRatio = ln(0.5) / ln(hintRelativeOffset)
+
+      for (newStop in newStops) {
+        if (newStop.position == null) {
+          continue
+        }
+        val pointRelativeOffset = (newStop.position - offsetLeft) / totalDist
+        val weighting = Math.pow(pointRelativeOffset.toDouble(), logRatio).toFloat()
+
+        if (!weighting.isFinite() || weighting.isNaN()) {
+          continue
+        }
+
+        // Interpolate color using the calculated weighting
+        leftColor?.let { left ->
+          rightColor?.let { right -> newStop.color = ColorUtils.blendARGB(left, right, weighting) }
+        }
+      }
+
+      // Replace the color hint with new color stops
+      colorStops.removeAt(x)
+      colorStops.addAll(x, newStops)
+      indexOffset += 8
+    }
+
+    return colorStops
+  }
+
+  private fun resolveColorStopPosition(
+      position: LengthPercentage?,
+      gradientLineLength: Float
+  ): Float? {
+    if (position == null) return null
+
+    return when (position.type) {
+      LengthPercentageType.POINT ->
+          PixelUtil.toPixelFromDIP(position.resolve(0f)) / gradientLineLength
+      LengthPercentageType.PERCENT -> position.resolve(1f)
+    }
+  }
 }

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

@@ -54,7 +54,7 @@ public enum class LogicalEdge {
   // INLINE_END,
   // INLINE;
 
-  abstract public fun toSpacingType(): Int
+  public abstract fun toSpacingType(): Int
 
   public companion object {
     @JvmStatic

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

@@ -7,14 +7,14 @@
 
 package com.facebook.react.uimanager.style
 
-public enum class Overflow {
+internal enum class Overflow {
   VISIBLE,
   HIDDEN,
   SCROLL;
 
-  public companion object {
+  companion object {
     @JvmStatic
-    public fun fromString(overflow: String): Overflow? {
+    fun fromString(overflow: String): Overflow? {
       return when (overflow.lowercase()) {
         "visible" -> VISIBLE
         "hidden" -> HIDDEN

package/ReactAndroid/src/main/java/com/facebook/react/util/ExceptionDataHelper.kt

@@ -14,12 +14,12 @@ import com.facebook.react.bridge.ReadableType
 import java.io.IOException
 import java.io.StringWriter
 
-public object ExceptionDataHelper {
+internal object ExceptionDataHelper {
 
-  public const val EXTRA_DATA_FIELD: String = "extraData"
+  const val EXTRA_DATA_FIELD: String = "extraData"
 
   @JvmStatic
-  public fun getExtraDataAsJson(metadata: ReadableMap?): String? {
+  fun getExtraDataAsJson(metadata: ReadableMap?): String? {
     if (metadata == null || metadata.getType(EXTRA_DATA_FIELD) == ReadableType.Null) {
       return null
     }

package/ReactAndroid/src/main/java/com/facebook/react/util/RCTLog.kt

@@ -14,12 +14,12 @@ import com.facebook.react.bridge.JavaScriptModule
  *
  * The RCTLog module allows for showing native logs in JavaScript.
  */
-public interface RCTLog : JavaScriptModule {
+internal interface RCTLog : JavaScriptModule {
   /**
    * Send a log to JavaScript.
    *
    * @param level The level of the log.
    * @param message The message to log.
    */
-  public fun logIfNoNativeHook(level: String?, message: String?)
+  fun logIfNoNativeHook(level: String?, message: String?)
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/DebuggingOverlay.kt

@@ -15,7 +15,7 @@ import android.view.View
 import androidx.annotation.UiThread
 import com.facebook.react.bridge.UiThreadUtil
 
-public class DebuggingOverlay(context: Context) : View(context) {
+internal class DebuggingOverlay(context: Context) : View(context) {
   private val traceUpdatePaint = Paint()
   private val traceUpdatesToDisplayMap = hashMapOf<Int, TraceUpdate>()
   private val traceUpdateIdToCleanupRunnableMap = hashMapOf<Int, Runnable>()
@@ -31,7 +31,7 @@ public class DebuggingOverlay(context: Context) : View(context) {
   }
 
   @UiThread
-  public fun setTraceUpdates(traceUpdates: List<TraceUpdate>) {
+  fun setTraceUpdates(traceUpdates: List<TraceUpdate>) {
     for (traceUpdate in traceUpdates) {
       val traceUpdateId = traceUpdate.id
       if (traceUpdateIdToCleanupRunnableMap.containsKey(traceUpdateId)) {
@@ -46,18 +46,18 @@ public class DebuggingOverlay(context: Context) : View(context) {
   }
 
   @UiThread
-  public fun setHighlightedElementsRectangles(elementsRectangles: MutableList<RectF>) {
+  fun setHighlightedElementsRectangles(elementsRectangles: MutableList<RectF>) {
     highlightedElementsRectangles = elementsRectangles
     invalidate()
   }
 
   @UiThread
-  public fun clearElementsHighlights() {
+  fun clearElementsHighlights() {
     highlightedElementsRectangles.clear()
     invalidate()
   }
 
-  public override fun onDraw(canvas: Canvas) {
+  override fun onDraw(canvas: Canvas) {
     super.onDraw(canvas)
 
     // Draw border outside of the given overlays to be aligned with web trace highlights

package/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/DebuggingOverlayManager.kt

@@ -22,13 +22,13 @@ import com.facebook.react.viewmanagers.DebuggingOverlayManagerDelegate
 import com.facebook.react.viewmanagers.DebuggingOverlayManagerInterface
 
 @ReactModule(name = DebuggingOverlayManager.REACT_CLASS)
-public class DebuggingOverlayManager :
+internal class DebuggingOverlayManager :
     SimpleViewManager<DebuggingOverlay>(), DebuggingOverlayManagerInterface<DebuggingOverlay> {
 
   private val delegate: ViewManagerDelegate<DebuggingOverlay> =
       DebuggingOverlayManagerDelegate(this)
 
-  public override fun getDelegate(): ViewManagerDelegate<DebuggingOverlay> = delegate
+  override fun getDelegate(): ViewManagerDelegate<DebuggingOverlay> = delegate
 
   override fun receiveCommand(view: DebuggingOverlay, commandId: String, args: ReadableArray?) {
     when (commandId) {
@@ -43,7 +43,7 @@ public class DebuggingOverlayManager :
     }
   }
 
-  public override fun highlightTraceUpdates(view: DebuggingOverlay, args: ReadableArray?): Unit {
+  override fun highlightTraceUpdates(view: DebuggingOverlay, args: ReadableArray?): Unit {
     val providedTraceUpdates = args?.getArray(0) ?: return
     val formattedTraceUpdates = mutableListOf<TraceUpdate>()
 
@@ -93,7 +93,7 @@ public class DebuggingOverlayManager :
     }
   }
 
-  public override fun highlightElements(view: DebuggingOverlay, args: ReadableArray?): Unit {
+  override fun highlightElements(view: DebuggingOverlay, args: ReadableArray?): Unit {
     val providedElements = args?.getArray(0) ?: return
     val elementsRectangles = mutableListOf<RectF>()
 
@@ -129,19 +129,19 @@ public class DebuggingOverlayManager :
     }
   }
 
-  public override fun clearElementsHighlights(view: DebuggingOverlay): Unit {
+  override fun clearElementsHighlights(view: DebuggingOverlay): Unit {
     view.clearElementsHighlights()
   }
 
-  public override fun createViewInstance(context: ThemedReactContext): DebuggingOverlay {
+  override fun createViewInstance(context: ThemedReactContext): DebuggingOverlay {
     return DebuggingOverlay(context)
   }
 
-  public override fun getName(): String {
+  override fun getName(): String {
     return REACT_CLASS
   }
 
-  public companion object {
-    public const val REACT_CLASS: String = "DebuggingOverlay"
+  companion object {
+    const val REACT_CLASS: String = "DebuggingOverlay"
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/TraceUpdate.kt

@@ -9,4 +9,4 @@ package com.facebook.react.views.debuggingoverlay
 
 import android.graphics.RectF
 
-public class TraceUpdate(public val id: Int, public val rectangle: RectF, public val color: Int)
+internal class TraceUpdate(val id: Int, val rectangle: RectF, val color: Int)

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

@@ -19,9 +19,9 @@ public class DrawerClosedEvent : Event<DrawerClosedEvent> {
 
   public constructor(surfaceId: Int, viewId: Int) : super(surfaceId, viewId)
 
-  override public fun getEventName(): String = EVENT_NAME
+  public override fun getEventName(): String = EVENT_NAME
 
-  override protected fun getEventData(): WritableMap? = Arguments.createMap()
+  protected override fun getEventData(): WritableMap? = Arguments.createMap()
 
   public companion object {
     public const val EVENT_NAME: String = "topDrawerClose"

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

@@ -19,9 +19,9 @@ public class DrawerOpenedEvent : Event<DrawerOpenedEvent> {
 
   public constructor(surfaceId: Int, viewId: Int) : super(surfaceId, viewId)
 
-  override public fun getEventName(): String = EVENT_NAME
+  public override fun getEventName(): String = EVENT_NAME
 
-  override protected fun getEventData(): WritableMap? = Arguments.createMap()
+  protected override fun getEventData(): WritableMap? = Arguments.createMap()
 
   public companion object {
     public const val EVENT_NAME: String = "topDrawerOpen"

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

@@ -27,9 +27,9 @@ public class DrawerSlideEvent : Event<DrawerSlideEvent> {
 
   public fun getOffset(): Float = offset
 
-  override public fun getEventName(): String = EVENT_NAME
+  public override fun getEventName(): String = EVENT_NAME
 
-  override protected fun getEventData(): WritableMap? {
+  protected override fun getEventData(): WritableMap? {
     val eventData: WritableMap = Arguments.createMap()
     eventData.putDouble("offset", getOffset().toDouble())
     return eventData

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

@@ -30,9 +30,9 @@ public class DrawerStateChangedEvent : Event<DrawerStateChangedEvent> {
 
   public fun getDrawerState(): Int = drawerState
 
-  override public fun getEventName(): String = EVENT_NAME
+  public override fun getEventName(): String = EVENT_NAME
 
-  override protected fun getEventData(): WritableMap? {
+  protected override fun getEventData(): WritableMap? {
     val eventData: WritableMap = Arguments.createMap()
     eventData.putInt("drawerState", getDrawerState())
     return eventData

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

@@ -15,7 +15,7 @@ import com.facebook.imagepipeline.bitmaps.PlatformBitmapFactory
 import com.facebook.imagepipeline.request.Postprocessor
 import java.util.LinkedList
 
-public class MultiPostprocessor private constructor(postprocessors: List<Postprocessor>) :
+internal class MultiPostprocessor private constructor(postprocessors: List<Postprocessor>) :
     Postprocessor {
 
   private val postprocessors: List<Postprocessor> = LinkedList(postprocessors)
@@ -25,7 +25,7 @@ public class MultiPostprocessor private constructor(postprocessors: List<Postpro
   override fun getPostprocessorCacheKey(): CacheKey =
       MultiCacheKey(postprocessors.map { it.postprocessorCacheKey })
 
-  public override fun process(
+  override fun process(
       sourceBitmap: Bitmap,
       bitmapFactory: PlatformBitmapFactory
   ): CloseableReference<Bitmap> {
@@ -48,9 +48,9 @@ public class MultiPostprocessor private constructor(postprocessors: List<Postpro
     }
   }
 
-  public companion object {
+  companion object {
     @JvmStatic
-    public fun from(postprocessors: List<Postprocessor>): Postprocessor? {
+    fun from(postprocessors: List<Postprocessor>): Postprocessor? {
       return when (postprocessors.size) {
         0 -> null
         1 -> postprocessors[0]

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

@@ -124,7 +124,7 @@ public constructor(
     }
   }
 
-  @ReactProp(name = "defaultSource", customType = "ImageSource")
+  @ReactProp(name = "defaultSource")
   public fun setDefaultSource(view: ReactImageView, source: String?) {
     view.setDefaultSource(source)
   }

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

@@ -22,12 +22,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewStructure
 import android.view.Window
-import android.view.WindowInsetsController
 import android.view.WindowManager
 import android.view.accessibility.AccessibilityEvent
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.FrameLayout
 import androidx.annotation.UiThread
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import com.facebook.common.logging.FLog
 import com.facebook.react.R
 import com.facebook.react.ReactActivity
@@ -391,6 +392,10 @@ public class ReactModalHostView(context: ThemedReactContext) :
     }
   }
 
+  /**
+   * Updates the system appearance of the dialog to match the activity that it is being displayed
+   * on.
+   */
   private fun updateSystemAppearance() {
     val currentActivity = getCurrentActivity() ?: return
     val dialog = checkNotNull(dialog) { "dialog must exist when we call updateProperties" }
@@ -399,19 +404,43 @@ public class ReactModalHostView(context: ThemedReactContext) :
     val activityWindow = currentActivity.window
     // Modeled after the version check in StatusBarModule.setStyle
     if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
-      val insetsController: WindowInsetsController = checkNotNull(activityWindow.insetsController)
-      val activityAppearance: Int = insetsController.systemBarsAppearance
+      val activityWindowInsetsController =
+          WindowInsetsControllerCompat(activityWindow, activityWindow.decorView)
+      val dialogWindowInsetsController =
+          WindowInsetsControllerCompat(dialogWindow, dialogWindow.decorView)
 
-      val activityLightStatusBars =
-          activityAppearance and WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
+      dialogWindowInsetsController.isAppearanceLightStatusBars =
+          activityWindowInsetsController.isAppearanceLightStatusBars
 
-      dialogWindow.insetsController?.setSystemBarsAppearance(
-          activityLightStatusBars, WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS)
+      activityWindow.decorView.rootWindowInsets?.let { insets ->
+        val activityRootWindowInsets = WindowInsetsCompat.toWindowInsetsCompat(insets)
+        syncSystemBarsVisibility(activityRootWindowInsets, dialogWindowInsetsController)
+      }
     } else {
       dialogWindow.decorView.systemUiVisibility = activityWindow.decorView.systemUiVisibility
     }
   }
 
+  /**
+   * Syncs the visibility of the system bars based on their visibility in the root window insets.
+   * This ensures consistency between the system bars visibility in the activity and the dialog.
+   */
+  private fun syncSystemBarsVisibility(
+      activityRootWindowInsets: WindowInsetsCompat,
+      dialogWindowInsetsController: WindowInsetsControllerCompat?,
+      types: List<Int> =
+          listOf(WindowInsetsCompat.Type.statusBars(), WindowInsetsCompat.Type.navigationBars()),
+  ) {
+    types.forEach { type ->
+      val isVisible = activityRootWindowInsets.isVisible(type)
+      if (isVisible) {
+        dialogWindowInsetsController?.show(type)
+      } else {
+        dialogWindowInsetsController?.hide(type)
+      }
+    }
+  }
+
   /**
    * Sets the testID on the DialogRootViewGroup. Since the accessibility events are not triggered on
    * the on the ReactModalHostView, the testID is forwarded to the DialogRootViewGroup to set the

package/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaView.kt

@@ -20,8 +20,7 @@ import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerModule
 
-internal class ReactSafeAreaView(public val reactContext: ThemedReactContext) :
-    ViewGroup(reactContext) {
+internal class ReactSafeAreaView(val reactContext: ThemedReactContext) : ViewGroup(reactContext) {
   internal var stateWrapper: StateWrapper? = null
 
   override fun onAttachedToWindow() {

package/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt

@@ -33,10 +33,10 @@ internal class ReactSafeAreaViewManager() :
 
   override fun createShadowNodeInstance(): LayoutShadowNode = ReactSafeAreaViewShadowNode()
 
-  public override fun getShadowNodeClass(): Class<out LayoutShadowNode> =
+  override fun getShadowNodeClass(): Class<out LayoutShadowNode> =
       ReactSafeAreaViewShadowNode::class.java
 
-  public override fun updateState(
+  override fun updateState(
       view: ReactSafeAreaView,
       props: ReactStylesDiffMap,
       stateWrapper: StateWrapper

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactAccessibleScrollView.kt

@@ -0,0 +1,19 @@
+/*
+ * 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.scroll
+
+import android.view.View
+
+/** Shared interface for the [ReactScrollViewAccessibilityDelegate] */
+internal interface ReactAccessibleScrollView {
+
+  val scrollEnabled: Boolean
+
+  /** Returns whether the given descendent is partially scrolled in view */
+  fun isPartiallyScrolledInView(view: View): Boolean
+}