react-native 0.83.0-nightly-20250914-09a7e0a0f → 0.83.0-nightly-20250915-56e5dff73

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 83;
   static patch: number = 0;
-  static prerelease: string | null = 'nightly-20250914-09a7e0a0f';
+  static prerelease: string | null = 'nightly-20250915-56e5dff73';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(83),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"nightly-20250914-09a7e0a0f",
+                  RCTVersionPrerelease: @"nightly-20250915-56e5dff73",
                   };
   });
   return __rnVersion;

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/Props.cpp

@@ -22,7 +22,8 @@ VirtualViewExperimentalProps::VirtualViewExperimentalProps(
     const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
     initialHidden(convertRawProp(context, rawProps, "initialHidden", sourceProps.initialHidden, {false})),
-    renderState(convertRawProp(context, rawProps, "renderState", sourceProps.renderState, {0})) {}
+    renderState(convertRawProp(context, rawProps, "renderState", sourceProps.renderState, {0})),
+    removeClippedSubviews(convertRawProp(context, rawProps, "removeClippedSubviews", sourceProps.removeClippedSubviews, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
 ComponentName VirtualViewExperimentalProps::getDiffPropsImplementationTarget() const {
@@ -47,6 +48,10 @@ folly::dynamic VirtualViewExperimentalProps::getDiffProps(
   if (renderState != oldProps->renderState) {
     result["renderState"] = renderState;
   }
+    
+  if (removeClippedSubviews != oldProps->removeClippedSubviews) {
+    result["removeClippedSubviews"] = removeClippedSubviews;
+  }
   return result;
 }
 #endif
@@ -55,7 +60,8 @@ SharedDebugStringConvertibleList VirtualViewExperimentalProps::getDebugProps() c
   return ViewProps::getDebugProps() +
 		SharedDebugStringConvertibleList{
 			debugStringConvertibleItem("initialHidden", initialHidden, false),
-			debugStringConvertibleItem("renderState", renderState, 0)
+			debugStringConvertibleItem("renderState", renderState, 0),
+			debugStringConvertibleItem("removeClippedSubviews", removeClippedSubviews, false)
 	};
 }
 #endif

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/Props.h

@@ -27,6 +27,7 @@ class VirtualViewExperimentalProps final : public ViewProps {
 
   bool initialHidden{false};
   int renderState{0};
+  bool removeClippedSubviews{false};
 
   #ifdef RN_SERIALIZABLE_STATE
   ComponentName getDiffPropsImplementationTarget() const override;

package/ReactAndroid/api/ReactAndroid.api

@@ -5246,6 +5246,7 @@ public class com/facebook/react/viewmanagers/VirtualViewExperimentalManagerDeleg
 
 public abstract interface class com/facebook/react/viewmanagers/VirtualViewExperimentalManagerInterface : com/facebook/react/uimanager/ViewManagerWithGeneratedInterface {
 	public abstract fun setInitialHidden (Landroid/view/View;Z)V
+	public abstract fun setRemoveClippedSubviews (Landroid/view/View;Z)V
 	public abstract fun setRenderState (Landroid/view/View;I)V
 }
 
@@ -6725,9 +6726,10 @@ public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtua
 	public fun onLayoutChange (Landroid/view/View;IIIIIIII)V
 	public fun onModeChange (Lcom/facebook/react/views/virtual/VirtualViewMode;Landroid/graphics/Rect;)V
 	public synthetic fun recycleView$xplat_js_react_native_github_packages_react_native_ReactAndroid_src_main_java_com_facebook_react_views_view_viewAndroid ()V
+	public fun updateClippingRect (Ljava/util/Set;)V
 }
 
-public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager : com/facebook/react/uimanager/ViewGroupManager, com/facebook/react/viewmanagers/VirtualViewExperimentalManagerInterface {
+public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager : com/facebook/react/views/view/ReactClippingViewManager, com/facebook/react/viewmanagers/VirtualViewExperimentalManagerInterface {
 	public static final field Companion Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager$Companion;
 	public static final field REACT_CLASS Ljava/lang/String;
 	public fun <init> ()V
@@ -6739,6 +6741,7 @@ public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtua
 	public fun setInitialHidden (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;Z)V
 	public synthetic fun setNativeId (Landroid/view/View;Ljava/lang/String;)V
 	public fun setNativeId (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;Ljava/lang/String;)V
+	public synthetic fun setRemoveClippedSubviews (Landroid/view/View;Z)V
 	public synthetic fun setRenderState (Landroid/view/View;I)V
 	public fun setRenderState (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;I)V
 }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.83.0-nightly-20250914-09a7e0a0f
+VERSION_NAME=0.83.0-nightly-20250915-56e5dff73
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 83,
     "patch" to 0,
-    "prerelease" to "nightly-20250914-09a7e0a0f"
+    "prerelease" to "nightly-20250915-56e5dff73"
   )
 }

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

@@ -50,11 +50,13 @@ private fun rectsOverlap(rect1: Rect, rect2: Rect): Boolean {
 internal class VirtualViewContainerState {
 
   private val prerenderRatio: Double = ReactNativeFeatureFlags.virtualViewPrerenderRatio()
+  private val hysteresisRatio: Double = ReactNativeFeatureFlags.virtualViewHysteresisRatio()
 
   private val virtualViews: MutableSet<VirtualView> = mutableSetOf()
   private val emptyRect: Rect = Rect()
   private val visibleRect: Rect = Rect()
   private val prerenderRect: Rect = Rect()
+  private val hysteresisRect: Rect = Rect()
   private val onWindowFocusChangeListener =
       if (ReactNativeFeatureFlags.enableVirtualViewWindowFocusDetection()) {
         ViewTreeObserver.OnWindowFocusChangeListener {
@@ -119,11 +121,12 @@ internal class VirtualViewContainerState {
         (-prerenderRect.height() * prerenderRatio).toInt(),
     )
 
-    val virtualViewsIt = if (virtualView != null) listOf(virtualView) else virtualViews
+    val virtualViewsIt =
+        if (virtualView != null) listOf(virtualView) else virtualViews.toMutableSet()
     virtualViewsIt.forEach { vv ->
       val rect = vv.containerRelativeRect
 
-      var mode = VirtualViewMode.Hidden
+      var mode: VirtualViewMode? = VirtualViewMode.Hidden
       var thresholdRect = emptyRect
       when {
         rectsOverlap(rect, visibleRect) -> {
@@ -142,14 +145,29 @@ internal class VirtualViewContainerState {
           mode = VirtualViewMode.Prerender
           thresholdRect = prerenderRect
         }
-        else -> {}
+        else -> {
+          if (hysteresisRatio > 0.0) {
+            hysteresisRect.set(prerenderRect)
+            hysteresisRect.inset(
+                (-visibleRect.width() * hysteresisRatio).toInt(),
+                (-visibleRect.height() * hysteresisRatio).toInt(),
+            )
+            if (rectsOverlap(rect, hysteresisRect)) {
+              mode = null
+            }
+          }
+        }
       }
 
-      debugLog(
-          "updateModes",
-          { "virtualView=${vv.virtualViewID} mode=$mode  rect=$rect thresholdRect=$thresholdRect" },
-      )
-      vv.onModeChange(mode, thresholdRect)
+      if (mode != null) {
+        vv.onModeChange(mode, thresholdRect)
+        debugLog(
+            "updateModes",
+            {
+              "virtualView=${vv.virtualViewID} mode=$mode  rect=$rect thresholdRect=$thresholdRect"
+            },
+        )
+      }
     }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt

@@ -16,9 +16,11 @@ import com.facebook.common.logging.FLog
 import com.facebook.react.R
 import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
+import com.facebook.react.uimanager.ReactClippingViewGroup
 import com.facebook.react.uimanager.ReactRoot
 import com.facebook.react.views.scroll.VirtualView
 import com.facebook.react.views.scroll.VirtualViewContainer
+import com.facebook.react.views.scroll.debugLog
 import com.facebook.react.views.view.ReactViewGroup
 import com.facebook.react.views.virtual.VirtualViewMode
 import com.facebook.react.views.virtual.VirtualViewModeChangeEmitter
@@ -34,6 +36,7 @@ public class ReactVirtualViewExperimental(context: Context) :
   private var scrollView: VirtualViewContainer? = null
 
   private val lastContainerRelativeRect: Rect = Rect()
+  private val lastClippingRect: Rect = Rect()
   override val containerRelativeRect: Rect = Rect()
   private var offsetX: Int = 0
   private var offsetY: Int = 0
@@ -120,6 +123,7 @@ public class ReactVirtualViewExperimental(context: Context) :
     modeChangeEmitter = null
     hadLayout = false
     lastContainerRelativeRect.setEmpty()
+    lastClippingRect.setEmpty()
     containerRelativeRect.setEmpty()
   }
 
@@ -132,7 +136,12 @@ public class ReactVirtualViewExperimental(context: Context) :
     modeChangeEmitter ?: return
     scrollView ?: return
 
+    if (newMode == VirtualViewMode.Visible) {
+      updateClippingRect(null)
+    }
+
     if (newMode == mode) {
+      debugLog("onModeChange") { "no change $newMode" }
       return
     }
 
@@ -141,6 +150,10 @@ public class ReactVirtualViewExperimental(context: Context) :
 
     debugLog("onModeChange") { "$oldMode->$newMode" }
 
+    if (oldMode == VirtualViewMode.Visible) {
+      updateClippingRect(null)
+    }
+
     when (newMode) {
       VirtualViewMode.Visible -> {
         if (renderState == VirtualViewRenderState.Unknown) {
@@ -187,6 +200,37 @@ public class ReactVirtualViewExperimental(context: Context) :
     }
   }
 
+  // Note: We co-opt subview clipping on ReactVirtualView by returning the
+  // clipping rect of the ScrollView. This means we clip the children of ReactVirtualView
+  // when they are out of the viewport, but not ReactVirtualView itself.
+  override fun updateClippingRect(excludedViews: Set<Int>?) {
+    if (!_removeClippedSubviews) {
+      return
+    }
+
+    // If no ScrollView, or ScrollView has disabled removeClippedSubviews, use default behavior
+    if (
+        scrollView == null ||
+            !((scrollView as ReactClippingViewGroup)?.removeClippedSubviews ?: false)
+    ) {
+      super.updateClippingRect(excludedViews)
+      return
+    }
+
+    val clippingRect = checkNotNull(clippingRect)
+
+    (scrollView as ReactClippingViewGroup).getClippingRect(clippingRect)
+    clippingRect.intersect(containerRelativeRect)
+    clippingRect.offset(-containerRelativeRect.left, -containerRelativeRect.top)
+
+    if (lastClippingRect == clippingRect) {
+      return
+    }
+
+    updateClippingToRect(clippingRect, excludedViews)
+    lastClippingRect.set(clippingRect)
+  }
+
   private fun updateParentOffset() {
     val virtualViewScrollView = scrollView ?: return
     offsetX = 0
@@ -212,8 +256,11 @@ public class ReactVirtualViewExperimental(context: Context) :
       debugLog("reportRectChangeToContainer") { "no rect change $containerRelativeRect" }
       return
     }
-    scrollView?.virtualViewContainerState?.onChange(this)
-    lastContainerRelativeRect.set(containerRelativeRect)
+
+    if (scrollView != null) {
+      scrollView?.virtualViewContainerState?.onChange(this)
+      lastContainerRelativeRect.set(containerRelativeRect)
+    }
   }
 
   private fun getScrollView(): VirtualViewContainer? = traverseParentStack(true)

package/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt

@@ -13,12 +13,12 @@ import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.viewmanagers.VirtualViewExperimentalManagerDelegate
 import com.facebook.react.viewmanagers.VirtualViewExperimentalManagerInterface
+import com.facebook.react.views.view.ReactClippingViewManager
 import com.facebook.react.views.virtual.VirtualViewMode
 import com.facebook.react.views.virtual.VirtualViewModeChangeEmitter
 import com.facebook.react.views.virtual.VirtualViewModeChangeEvent
@@ -26,7 +26,7 @@ import com.facebook.react.views.virtual.VirtualViewRenderState
 
 @ReactModule(name = ReactVirtualViewExperimentalManager.REACT_CLASS)
 public class ReactVirtualViewExperimentalManager :
-    ViewGroupManager<ReactVirtualViewExperimental>(),
+    ReactClippingViewManager<ReactVirtualViewExperimental>(),
     VirtualViewExperimentalManagerInterface<ReactVirtualViewExperimental> {
 
   private val _delegate = VirtualViewExperimentalManagerDelegate(this)

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 83;
   int32_t Patch = 0;
-  std::string_view Prerelease = "nightly-20250914-09a7e0a0f";
+  std::string_view Prerelease = "nightly-20250915-56e5dff73";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.83.0-nightly-20250914-09a7e0a0f",
+  "version": "0.83.0-nightly-20250915-56e5dff73",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -159,13 +159,13 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.83.0-nightly-20250914-09a7e0a0f",
-    "@react-native/codegen": "0.83.0-nightly-20250914-09a7e0a0f",
-    "@react-native/community-cli-plugin": "0.83.0-nightly-20250914-09a7e0a0f",
-    "@react-native/gradle-plugin": "0.83.0-nightly-20250914-09a7e0a0f",
-    "@react-native/js-polyfills": "0.83.0-nightly-20250914-09a7e0a0f",
-    "@react-native/normalize-colors": "0.83.0-nightly-20250914-09a7e0a0f",
-    "@react-native/virtualized-lists": "0.83.0-nightly-20250914-09a7e0a0f",
+    "@react-native/assets-registry": "0.83.0-nightly-20250915-56e5dff73",
+    "@react-native/codegen": "0.83.0-nightly-20250915-56e5dff73",
+    "@react-native/community-cli-plugin": "0.83.0-nightly-20250915-56e5dff73",
+    "@react-native/gradle-plugin": "0.83.0-nightly-20250915-56e5dff73",
+    "@react-native/js-polyfills": "0.83.0-nightly-20250915-56e5dff73",
+    "@react-native/normalize-colors": "0.83.0-nightly-20250915-56e5dff73",
+    "@react-native/virtualized-lists": "0.83.0-nightly-20250915-56e5dff73",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",

package/src/private/components/virtualview/VirtualViewExperimentalNativeComponent.js

@@ -79,6 +79,12 @@ type VirtualViewExperimentalNativeProps = $ReadOnly<{
    */
   renderState: Int32,
 
+  /**
+   * This was needed to get VirtualViewManagerDelegate to set this property.
+   * TODO: Investigate why spread ViewProps doesn't call setter
+   */
+  removeClippedSubviews?: boolean,
+
   /**
    * See `NativeModeChangeEvent`.
    */