react-native-tvos 0.81.4-0 → 0.82.0-0

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

@@ -27,9 +27,9 @@ import android.view.ViewGroup
 import android.view.ViewParent
 import android.view.ViewStructure
 import android.view.accessibility.AccessibilityNodeInfo
-import android.view.accessibility.AccessibilityManager
 import androidx.core.view.ViewCompat
 import androidx.core.view.isNotEmpty
+import android.view.accessibility.AccessibilityManager
 import com.facebook.common.logging.FLog
 import com.facebook.react.R
 import com.facebook.react.bridge.ReactContext
@@ -70,9 +70,7 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.ViewGroupDrawingOrderHelper
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.common.ViewUtil.getUIManagerType
-import com.facebook.react.uimanager.events.BlurEvent
 import com.facebook.react.uimanager.events.EventDispatcher
-import com.facebook.react.uimanager.events.FocusEvent
 import com.facebook.react.uimanager.events.PressInEvent
 import com.facebook.react.uimanager.events.PressOutEvent
 import com.facebook.react.uimanager.style.BorderRadiusProp
@@ -134,7 +132,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
         oldLeft: Int,
         oldTop: Int,
         oldRight: Int,
-        oldBottom: Int
+        oldBottom: Int,
     ) {
       if (parent?.removeClippedSubviews == true) {
         parent?.updateSubviewClipStatus(v)
@@ -158,14 +156,14 @@ public open class ReactViewGroup public constructor(context: Context?) :
    * those methods may return views that are not attached. This is risky but allows us to perform a
    * correct cleanup in `NativeViewHierarchyManager`.
    */
-  private var _removeClippedSubviews = false
+  internal var _removeClippedSubviews = false
 
   @Volatile private var inSubviewClippingLoop = false
   private var allChildren: Array<View?>? = null
   internal var allChildrenCount: Int = 0
     private set
 
-  private var clippingRect: Rect? = null
+  internal var clippingRect: Rect? = null
 
   public override var hitSlopRect: Rect? = null
   public override var pointerEvents: PointerEvents = PointerEvents.AUTO
@@ -257,7 +255,9 @@ public open class ReactViewGroup public constructor(context: Context?) :
     assertExplicitMeasureSpec(widthMeasureSpec, heightMeasureSpec)
 
     setMeasuredDimension(
-        MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec))
+        MeasureSpec.getSize(widthMeasureSpec),
+        MeasureSpec.getSize(heightMeasureSpec),
+    )
   }
 
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
@@ -284,7 +284,8 @@ public open class ReactViewGroup public constructor(context: Context?) :
   }
 
   @Deprecated(
-      "setTranslucentBackgroundDrawable is deprecated since React Native 0.76.0 and will be removed in a future version")
+      "setTranslucentBackgroundDrawable is deprecated since React Native 0.76.0 and will be removed in a future version"
+  )
   public fun setTranslucentBackgroundDrawable(background: Drawable?) {
     setFeedbackUnderlay(this, background)
   }
@@ -356,7 +357,8 @@ public open class ReactViewGroup public constructor(context: Context?) :
 
   @Deprecated(
       message = "setBorderRadius(Float) is deprecated and will be removed in the future.",
-      replaceWith = ReplaceWith("setBorderRadius(Float,LengthPercentage)"))
+      replaceWith = ReplaceWith("setBorderRadius(Float,LengthPercentage)"),
+  )
   public fun setBorderRadius(borderRadius: Float) {
     val radius =
         if (borderRadius.isNaN()) null
@@ -366,7 +368,8 @@ public open class ReactViewGroup public constructor(context: Context?) :
 
   @Deprecated(
       message = "setBorderRadius(Float) is deprecated and will be removed in the future.",
-      replaceWith = ReplaceWith("setBorderRadius(Float,LengthPercentage)"))
+      replaceWith = ReplaceWith("setBorderRadius(Float,LengthPercentage)"),
+  )
   public fun setBorderRadius(borderRadius: Float, position: Int) {
     val radius =
         if (borderRadius.isNaN()) null
@@ -456,7 +459,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
   private fun isChildRemovedWhileTransitioning(child: View): Boolean =
       childrenRemovedWhileTransitioning?.contains(child.id) == true
 
-  private fun updateClippingToRect(clippingRect: Rect, excludedViewsSet: Set<Int>? = null) {
+  internal fun updateClippingToRect(clippingRect: Rect, excludedViewsSet: Set<Int>? = null) {
     val childArray = checkNotNull(allChildren)
     inSubviewClippingLoop = true
     var clippedSoFar = 0
@@ -475,14 +478,16 @@ public open class ReactViewGroup public constructor(context: Context?) :
 
         throw IllegalStateException(
             "Invalid clipping state. i=$i clippedSoFar=$clippedSoFar count=$childCount allChildrenCount=$allChildrenCount recycleCount=$recycleCount realClippedSoFar=$realClippedSoFar uniqueViewsCount=${uniqueViews.size} excludedViews=${excludedViewsSet?.size ?: 0}",
-            ex)
+            ex,
+        )
       }
       if (isViewClipped(childArray[i], i)) {
         clippedSoFar++
       }
       if (i - clippedSoFar > childCount) {
         throw IllegalStateException(
-            "Invalid clipping state. i=$i clippedSoFar=$clippedSoFar count=$childCount allChildrenCount=$allChildrenCount recycleCount=$recycleCount  excludedViews=${excludedViewsSet?.size ?: 0}")
+            "Invalid clipping state. i=$i clippedSoFar=$clippedSoFar count=$childCount allChildrenCount=$allChildrenCount recycleCount=$recycleCount  excludedViews=${excludedViewsSet?.size ?: 0}"
+        )
       }
     }
     inSubviewClippingLoop = false
@@ -492,7 +497,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
       clippingRect: Rect,
       idx: Int,
       clippedSoFar: Int,
-      excludedViewsSet: Set<Int>? = null
+      excludedViewsSet: Set<Int>? = null,
   ) {
     assertOnUiThread()
 
@@ -513,11 +518,13 @@ public open class ReactViewGroup public constructor(context: Context?) :
       needUpdateClippingRecursive = true
     }
     // We don't want to clip a view that is currently focused at that might break focus navigation
-    if (!intersects &&
-        !isViewClipped(child, idx) &&
-        !isAnimating &&
-        child !== focusedChild &&
-        !shouldSkipView) {
+    if (
+        !intersects &&
+            !isViewClipped(child, idx) &&
+            !isAnimating &&
+            child !== focusedChild &&
+            !shouldSkipView
+    ) {
       setViewClipped(child, true)
       recoverFocus(child)
       // We can try saving on invalidate call here as the view that we remove is out of visible area
@@ -763,7 +770,8 @@ public open class ReactViewGroup public constructor(context: Context?) :
       if (expectedTag != tag) {
         logSoftException(
             ReactSoftExceptionLogger.Categories.RVG_ON_VIEW_REMOVED,
-            ReactNoCrashSoftException("View clipping tag mismatch: tag=$tag expected=$expectedTag"))
+            ReactNoCrashSoftException("View clipping tag mismatch: tag=$tag expected=$expectedTag"),
+        )
       }
     }
     if (_removeClippedSubviews) {
@@ -847,10 +855,13 @@ public open class ReactViewGroup public constructor(context: Context?) :
                 logSoftException(
                     ReactSoftExceptionLogger.Categories.CLIPPING_PROHIBITED_VIEW,
                     ReactNoCrashSoftException(
-                        "Child view has been added to Parent view in which it is clipped and not visible. This is not legal for this particular child view. Child: [${child.id}] $child Parent: [$id] ${toString()}"))
+                        "Child view has been added to Parent view in which it is clipped and not visible. This is not legal for this particular child view. Child: [${child.id}] $child Parent: [$id] ${toString()}"
+                    ),
+                )
               }
             }
-          })
+          }
+      )
     }
   }
 
@@ -901,7 +912,9 @@ public open class ReactViewGroup public constructor(context: Context?) :
       logSoftException(
           ReactSoftExceptionLogger.Categories.RVG_IS_VIEW_CLIPPED,
           ReactNoCrashSoftException(
-              "View missing clipping tag: index=$index parentNull=${parent == null} parentThis=${parent === this} transitioning=$transitioning"))
+              "View missing clipping tag: index=$index parentNull=${parent == null} parentThis=${parent === this} transitioning=$transitioning"
+          ),
+      )
     }
     // fallback - should be transitioning or have no parent if the view was removed
     if (parent == null || transitioning) {
@@ -985,11 +998,13 @@ public open class ReactViewGroup public constructor(context: Context?) :
     }
 
   override fun setOverflowInset(left: Int, top: Int, right: Int, bottom: Int) {
-    if (needsIsolatedLayer(this) &&
-        (overflowInset.left != left ||
-            overflowInset.top != top ||
-            overflowInset.right != right ||
-            overflowInset.bottom != bottom)) {
+    if (
+        needsIsolatedLayer(this) &&
+            (overflowInset.left != left ||
+                overflowInset.top != top ||
+                overflowInset.right != right ||
+                overflowInset.bottom != bottom)
+    ) {
       invalidate()
     }
     overflowInset[left, top, right] = bottom
@@ -1005,9 +1020,11 @@ public open class ReactViewGroup public constructor(context: Context?) :
   }
 
   override fun draw(canvas: Canvas) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
-        getUIManagerType(this) == UIManagerType.FABRIC &&
-        needsIsolatedLayer(this)) {
+    if (
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
+            getUIManagerType(this) == UIManagerType.FABRIC &&
+            needsIsolatedLayer(this)
+    ) {
       // Check if the view is a stacking context and has children, if it does, do the rendering
       // offscreen and then composite back. This follows the idea of group isolation on blending
       // https://www.w3.org/TR/compositing-1/#isolationblending
@@ -1018,7 +1035,8 @@ public open class ReactViewGroup public constructor(context: Context?) :
           overflowInset.top.toFloat(),
           (width + -overflowInset.right).toFloat(),
           (height + -overflowInset.bottom).toFloat(),
-          null)
+          null,
+      )
       super.draw(canvas)
       canvas.restore()
     } else {
@@ -1041,9 +1059,11 @@ public open class ReactViewGroup public constructor(context: Context?) :
     }
 
     var mixBlendMode: BlendMode? = null
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
-        getUIManagerType(this) == UIManagerType.FABRIC &&
-        needsIsolatedLayer(this)) {
+    if (
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
+            getUIManagerType(this) == UIManagerType.FABRIC &&
+            needsIsolatedLayer(this)
+    ) {
       mixBlendMode = child.getTag(R.id.mix_blend_mode) as? BlendMode
       if (mixBlendMode != null) {
         val p = Paint()
@@ -1054,7 +1074,8 @@ public open class ReactViewGroup public constructor(context: Context?) :
             overflowInset.top.toFloat(),
             (width + -overflowInset.right).toFloat(),
             (height + -overflowInset.bottom).toFloat(),
-            p)
+            p,
+        )
       }
     }
 
@@ -1108,7 +1129,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
     this.originalIsFocusable = this.isFocusable
 
     val viewAccessibilityDelegate: ReactAccessibilityDelegate = object : ReactAccessibilityDelegate(
-      this, originalIsFocusable, this.importantForAccessibility
+      this@ReactViewGroup, originalIsFocusable, this@ReactViewGroup.importantForAccessibility
     ) {
       override fun performAccessibilityAction(host: View, action: Int, args: Bundle?): Boolean {
         if (host !is ReactViewGroup) {
@@ -1338,29 +1359,6 @@ public open class ReactViewGroup public constructor(context: Context?) :
 
   override fun onFocusChanged(gainFocus: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
     super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
-
-    val mEventDispatcher: EventDispatcher? =
-      UIManagerHelper.getEventDispatcherForReactTag(
-        this.context as ReactContext, this.id
-      )
-
-    if (mEventDispatcher == null) {
-      return
-    }
-
-    if (gainFocus) {
-      mEventDispatcher.dispatchEvent(
-        FocusEvent(
-          UIManagerHelper.getSurfaceId(this.context), this.id
-        )
-      )
-    } else {
-      mEventDispatcher.dispatchEvent(
-        BlurEvent(
-          UIManagerHelper.getSurfaceId(this.context), this.id
-        )
-      )
-    }
   }
 
   override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
@@ -1496,18 +1494,24 @@ public open class ReactViewGroup public constructor(context: Context?) :
   }
 
   override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {
-    val axOrderParentOrderList =
-        (getTag(R.id.accessibility_order_parent) as ReactViewGroup?)?.axOrderList
+    val axOrderParent = getTag(R.id.accessibility_order_parent)
+    var axOrderParentOrderList: MutableList<String>? = null
+    if (axOrderParent is ReactViewGroup) {
+      axOrderParentOrderList = (axOrderParent as ReactViewGroup?)?.axOrderList
+    }
+
     val axOrder: MutableList<*>? = axOrderList
     if (axOrder != null) {
 
       val am: AccessibilityManager? =
-          this.getContext().getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager?
+          this.context.getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager?
       if (accessibilityStateChangeListener == null && am != null) {
         val newAccessibilityStateChangeListener =
             AccessibilityManager.AccessibilityStateChangeListener { enabled ->
               if (!enabled) {
-                ReactAxOrderHelper.restoreFocusability(this)
+                for (i in 0..<childCount) {
+                  ReactAxOrderHelper.restoreFocusability(getChildAt(i))
+                }
               }
             }
 
@@ -1518,7 +1522,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
       val result = arrayOfNulls<View?>(axOrder.size)
 
       for (i in 0..<childCount) {
-        ReactAxOrderHelper.buildAxOrderList(getChildAt(i), axOrder, result)
+        ReactAxOrderHelper.buildAxOrderList(getChildAt(i), this, axOrder, result)
       }
 
       for (i in result.indices) {
@@ -1540,7 +1544,9 @@ public open class ReactViewGroup public constructor(context: Context?) :
         // If this view can coopt, turn the focusability off its children but add them to the tree
       } else if (isFocusable && (contentDescription == null || contentDescription == "")) {
         super.addChildrenForAccessibility(outChildren)
-        ReactAxOrderHelper.disableFocusForSubtree(this, axOrderParentOrderList)
+        for (i in 0..<childCount) {
+          ReactAxOrderHelper.disableFocusForSubtree(getChildAt(i), axOrderParentOrderList)
+        }
         // if this view is focusable and has a contentDescription then we don't care about its
         // descendants for accessibility
       } else if (isFocusable && !(contentDescription == null || contentDescription == "")) {

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

@@ -79,7 +79,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
 
   override fun prepareToRecycleView(
       reactContext: ThemedReactContext,
-      view: ReactViewGroup
+      view: ReactViewGroup,
   ): ReactViewGroup? {
     // We don't want to run the view clipping when the view is being prepared for recycling to avoid
     // have size changes iterate over child view that should be removed anyway
@@ -98,16 +98,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
 
   @ReactProp(name = "accessible")
   public open fun setAccessible(view: ReactViewGroup, accessible: Boolean) {
-    view.isFocusable = accessible
-    // This is required to handle Android TV/ Fire TV Devices that are Touch Enabled as well as LeanBack
-    // https://developer.android.com/reference/android/view/View#requestFocus(int,%20android.graphics.Rect)
-    // ** A view will not actually take focus if it is not focusable (isFocusable() returns false), **
-    // ** or if it is focusable and it is not focusable in touch mode (isFocusableInTouchMode()) **
-    // ** while the device is in touch mode.  **
-    if (hasTouchScreen(view.context)) {
-      view.isFocusableInTouchMode = accessible
-    }
-
+    // TODO: determine if any AxOrder changes should be put here
   }
 
   @ReactProp(name = "tvFocusable")
@@ -127,7 +118,9 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
       return
     }
 
-    ReactAxOrderHelper.cleanUpAxOrder(view)
+    for (i in 0 until view.childCount) {
+      ReactAxOrderHelper.cleanUpAxOrder(view.getChildAt(i))
+    }
 
     if (nativeIds == null) {
       view.axOrderList = null
@@ -252,15 +245,18 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
               ViewProps.BORDER_END_START_RADIUS,
               ViewProps.BORDER_START_END_RADIUS,
               ViewProps.BORDER_START_START_RADIUS,
-          ])
+          ]
+  )
   public open fun setBorderRadius(view: ReactViewGroup, index: Int, rawBorderRadius: Dynamic) {
     var borderRadius = LengthPercentage.setFromDynamic(rawBorderRadius)
 
     // We do not support percentage border radii on Paper in order to be consistent with iOS (to
     // avoid developer surprise if it works on one platform but not another).
-    if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC &&
-        borderRadius != null &&
-        borderRadius.type == LengthPercentageType.PERCENT) {
+    if (
+        ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC &&
+            borderRadius != null &&
+            borderRadius.type == LengthPercentageType.PERCENT
+    ) {
       borderRadius = null
     }
 
@@ -269,7 +265,8 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
 
   @Deprecated(
       "Don't use setBorderRadius(view, int, Float) as it was deprecated in React Native 0.75.0.",
-      ReplaceWith("setBorderRadius(view, index, DynamicFromObject(borderRadius)"))
+      ReplaceWith("setBorderRadius(view, index, DynamicFromObject(borderRadius)"),
+  )
   public open fun setBorderRadius(view: ReactViewGroup, index: Int, borderRadius: Float) {
     setBorderRadius(view, index, DynamicFromObject(borderRadius))
   }
@@ -334,7 +331,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   @ReactProp(name = ViewProps.NEEDS_OFFSCREEN_ALPHA_COMPOSITING)
   public open fun setNeedsOffscreenAlphaCompositing(
       view: ReactViewGroup,
-      needsOffscreenAlphaCompositing: Boolean
+      needsOffscreenAlphaCompositing: Boolean,
   ) {
     view.setNeedsOffscreenAlphaCompositing(needsOffscreenAlphaCompositing)
   }
@@ -350,7 +347,8 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
               ViewProps.BORDER_START_WIDTH,
               ViewProps.BORDER_END_WIDTH,
           ],
-      defaultFloat = Float.NaN)
+      defaultFloat = Float.NaN,
+  )
   public open fun setBorderWidth(view: ReactViewGroup, index: Int, width: Float) {
     BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width)
   }
@@ -369,10 +367,14 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
               ViewProps.BORDER_BLOCK_END_COLOR,
               ViewProps.BORDER_BLOCK_START_COLOR,
           ],
-      customType = "Color")
+      customType = "Color",
+  )
   public open fun setBorderColor(view: ReactViewGroup, index: Int, color: Int?) {
     BackgroundStyleApplicator.setBorderColor(
-        view, LogicalEdge.fromSpacingType(SPACING_TYPES[index]), color)
+        view,
+        LogicalEdge.fromSpacingType(SPACING_TYPES[index]),
+        color,
+    )
   }
 
   @ReactProp(name = ViewProps.COLLAPSABLE)
@@ -395,7 +397,8 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
         val eventDispatcher =
             UIManagerHelper.getEventDispatcherForReactTag((view.context as ReactContext), view.id)
         eventDispatcher?.dispatchEvent(
-            ViewGroupClickEvent(UIManagerHelper.getSurfaceId(view.context), view.id))
+            ViewGroupClickEvent(UIManagerHelper.getSurfaceId(view.context), view.id)
+        )
       }
 
       // Clickable elements are focusable. On API 26, this is taken care by setClickable.
@@ -407,6 +410,14 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
       // Don't set view.setFocusable(false) because we might still want it to be focusable for
       // accessibility reasons
     }
+    // This is required to handle Android TV/ Fire TV Devices that are Touch Enabled as well as LeanBack
+    // https://developer.android.com/reference/android/view/View#requestFocus(int,%20android.graphics.Rect)
+    // ** A view will not actually take focus if it is not focusable (isFocusable() returns false), **
+    // ** or if it is focusable and it is not focusable in touch mode (isFocusableInTouchMode()) **
+    // ** while the device is in touch mode.  **
+    if (hasTouchScreen(view.context)) {
+      view.isFocusableInTouchMode = focusable
+    }
   }
 
   @ReactProp(name = ViewProps.OVERFLOW)
@@ -426,7 +437,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   override fun setTransformProperty(
       view: ReactViewGroup,
       transforms: ReadableArray?,
-      transformOrigin: ReadableArray?
+      transformOrigin: ReadableArray?,
   ) {
     super.setTransformProperty(view, transforms, transformOrigin)
     view.setBackfaceVisibilityDependantOpacity()
@@ -445,7 +456,8 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
 
   @Deprecated(
       "Use receiveCommand(View, String, ReadableArray)",
-      ReplaceWith("receiveCommand(root, commandIdString, args)"))
+      ReplaceWith("receiveCommand(root, commandIdString, args)"),
+  )
   override fun receiveCommand(root: ReactViewGroup, commandId: Int, args: ReadableArray?) {
     when (commandId) {
       CMD_HOTSPOT_UPDATE -> handleHotspotUpdate(root, args)
@@ -473,7 +485,8 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   private fun handleSetPressed(root: ReactViewGroup, args: ReadableArray?) {
     if (args == null || args.size() != 1) {
       throw JSApplicationIllegalArgumentException(
-          "Illegal number of arguments for 'setPressed' command")
+          "Illegal number of arguments for 'setPressed' command"
+      )
     }
     root.isPressed = args.getBoolean(0)
   }
@@ -481,7 +494,8 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
   private fun handleHotspotUpdate(root: ReactViewGroup, args: ReadableArray?) {
     if (args == null || args.size() != 2) {
       throw JSApplicationIllegalArgumentException(
-          "Illegal number of arguments for 'updateHotspot' command")
+          "Illegal number of arguments for 'updateHotspot' command"
+      )
     }
 
     val x = args.getDouble(0).dpToPx()

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

@@ -48,7 +48,8 @@ internal fun Window.setStatusBarTranslucency(isTranslucent: Boolean) {
           defaultInsets.systemWindowInsetLeft,
           0,
           defaultInsets.systemWindowInsetRight,
-          defaultInsets.systemWindowInsetBottom)
+          defaultInsets.systemWindowInsetBottom,
+      )
     }
   } else {
     decorView.setOnApplyWindowInsetsListener(null)

package/ReactAndroid/src/main/java/com/facebook/react/views/{virtualview → virtual}/VirtualViewMode.kt

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.virtualview
+package com.facebook.react.views.virtual
 
-internal enum class VirtualViewMode(val value: Int) {
+public enum class VirtualViewMode(public val value: Int) {
   Visible(0),
   Prerender(1),
   Hidden(2),

package/ReactAndroid/src/main/java/com/facebook/react/views/virtual/VirtualViewModeChangeEmitter.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.virtual
+
+import android.graphics.Rect
+
+internal fun interface VirtualViewModeChangeEmitter {
+  public fun emitModeChange(
+      mode: VirtualViewMode,
+      targetRect: Rect,
+      thresholdRect: Rect,
+      synchronous: Boolean,
+  )
+}

package/ReactAndroid/src/main/java/com/facebook/react/views/{virtualview → virtual}/VirtualViewModeChangeEvent.kt

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.virtualview
+package com.facebook.react.views.virtual
 
 import android.graphics.Rect
 import androidx.annotation.VisibleForTesting

package/ReactAndroid/src/main/java/com/facebook/react/views/{virtualview → virtual}/VirtualViewRenderState.kt

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.virtualview
+package com.facebook.react.views.virtual
 
 /**
  * Represents the the render state of children in the most recent commit.