Remove clipping check on scrollview (#54357)

Summary:
Pull Request resolved: #54357

Changelog: [Internal] - Ignore whether ScrollView enables subview clipping and just use the drawing rect for forwarding a clippingRect for VirtualView

Reviewed By: yungsters

Differential Revision: D85817030

fbshipit-source-id: e89298d106ec993ce1ca63131da002e0685c34dd

Author: lunaleaps

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<bac9e360daa589cba476d208f75ef2ca>>
+ * @generated SignedSource<<d8dc8c3a2efe8b7e870546e5749ef5ad>>
  */
 
 /**
@@ -312,6 +312,12 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun enableViewRecyclingForView(): Boolean = accessor.enableViewRecyclingForView()
 
+  /**
+   * Set clipping to drawingRect of ScrollView.
+   */
+  @JvmStatic
+  public fun enableVirtualViewClippingWithoutScrollViewClipping(): Boolean = accessor.enableVirtualViewClippingWithoutScrollViewClipping()
+
   /**
    * Enables the experimental version of `VirtualViewContainerState`.
    */

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<2003ae7fc2c782b997d21938cc7b2380>>
+ * @generated SignedSource<<447ccc7271b71b0208a2297b7eba5995>>
  */
 
 /**
@@ -67,6 +67,7 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var enableViewRecyclingForScrollViewCache: Boolean? = null
   private var enableViewRecyclingForTextCache: Boolean? = null
   private var enableViewRecyclingForViewCache: Boolean? = null
+  private var enableVirtualViewClippingWithoutScrollViewClippingCache: Boolean? = null
   private var enableVirtualViewContainerStateExperimentalCache: Boolean? = null
   private var enableVirtualViewDebugFeaturesCache: Boolean? = null
   private var enableVirtualViewRenderStateCache: Boolean? = null
@@ -526,6 +527,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
+  override fun enableVirtualViewClippingWithoutScrollViewClipping(): Boolean {
+    var cached = enableVirtualViewClippingWithoutScrollViewClippingCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.enableVirtualViewClippingWithoutScrollViewClipping()
+      enableVirtualViewClippingWithoutScrollViewClippingCache = cached
+    }
+    return cached
+  }
+
   override fun enableVirtualViewContainerStateExperimental(): Boolean {
     var cached = enableVirtualViewContainerStateExperimentalCache
     if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<986b35ba4f323ab1a65dd70a559889e9>>
+ * @generated SignedSource<<d6403b67e269ad80ef3e2389ac923c8a>>
  */
 
 /**
@@ -122,6 +122,8 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun enableViewRecyclingForView(): Boolean
 
+  @DoNotStrip @JvmStatic public external fun enableVirtualViewClippingWithoutScrollViewClipping(): Boolean
+
   @DoNotStrip @JvmStatic public external fun enableVirtualViewContainerStateExperimental(): Boolean
 
   @DoNotStrip @JvmStatic public external fun enableVirtualViewDebugFeatures(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<43f629e3be734826b241d7e596daf6f4>>
+ * @generated SignedSource<<ab48ba86a7cf3cd35ec530a216aea774>>
  */
 
 /**
@@ -117,6 +117,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun enableViewRecyclingForView(): Boolean = true
 
+  override fun enableVirtualViewClippingWithoutScrollViewClipping(): Boolean = true
+
   override fun enableVirtualViewContainerStateExperimental(): Boolean = false
 
   override fun enableVirtualViewDebugFeatures(): Boolean = false

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<806741418f4ff7e3b6dcac3d78fa27dd>>
+ * @generated SignedSource<<6f6b5abe79764b88cf3ed62fe0230786>>
  */
 
 /**
@@ -71,6 +71,7 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var enableViewRecyclingForScrollViewCache: Boolean? = null
   private var enableViewRecyclingForTextCache: Boolean? = null
   private var enableViewRecyclingForViewCache: Boolean? = null
+  private var enableVirtualViewClippingWithoutScrollViewClippingCache: Boolean? = null
   private var enableVirtualViewContainerStateExperimentalCache: Boolean? = null
   private var enableVirtualViewDebugFeaturesCache: Boolean? = null
   private var enableVirtualViewRenderStateCache: Boolean? = null
@@ -577,6 +578,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
+  override fun enableVirtualViewClippingWithoutScrollViewClipping(): Boolean {
+    var cached = enableVirtualViewClippingWithoutScrollViewClippingCache
+    if (cached == null) {
+      cached = currentProvider.enableVirtualViewClippingWithoutScrollViewClipping()
+      accessedFeatureFlags.add("enableVirtualViewClippingWithoutScrollViewClipping")
+      enableVirtualViewClippingWithoutScrollViewClippingCache = cached
+    }
+    return cached
+  }
+
   override fun enableVirtualViewContainerStateExperimental(): Boolean {
     var cached = enableVirtualViewContainerStateExperimentalCache
     if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<1a08578b36cb91a183a435b881ca272f>>
+ * @generated SignedSource<<6b61490a8d6b1df1d6264016455382f8>>
  */
 
 /**
@@ -117,6 +117,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun enableViewRecyclingForView(): Boolean
 
+  @DoNotStrip public fun enableVirtualViewClippingWithoutScrollViewClipping(): Boolean
+
   @DoNotStrip public fun enableVirtualViewContainerStateExperimental(): Boolean
 
   @DoNotStrip public fun enableVirtualViewDebugFeatures(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt

@@ -187,17 +187,28 @@ public class ReactVirtualView(context: Context) :
     }
 
     // If no ScrollView, or ScrollView has disabled removeClippedSubviews, use default behavior
-    if (
-        parentScrollView == null ||
-            !((parentScrollView as ReactClippingViewGroup).removeClippedSubviews ?: false)
-    ) {
+    if (parentScrollView == null) {
       super.updateClippingRect(excludedViews)
       return
     }
 
     val clippingRect = checkNotNull(clippingRect)
+    val parentScrollView = checkNotNull(parentScrollView) as ReactClippingViewGroup
+
+    if (ReactNativeFeatureFlags.enableVirtualViewClippingWithoutScrollViewClipping()) {
+      if (parentScrollView.removeClippedSubviews) {
+        parentScrollView.getClippingRect(clippingRect)
+      } else {
+        (parentScrollView as View).getDrawingRect(clippingRect)
+      }
+    } else {
+      if (!(parentScrollView.removeClippedSubviews ?: false)) {
+        super.updateClippingRect(excludedViews)
+        return
+      }
+      parentScrollView.getClippingRect(clippingRect)
+    }
 
-    (parentScrollView as ReactClippingViewGroup).getClippingRect(clippingRect)
     clippingRect.intersect(targetRect)
     clippingRect.offset(-targetRect.left, -targetRect.top)
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt

@@ -208,17 +208,29 @@ public class ReactVirtualViewExperimental(context: Context) :
     }
 
     // If no ScrollView, or ScrollView has disabled removeClippedSubviews, use default behavior
-    if (
-        scrollView == null ||
-            !((scrollView as ReactClippingViewGroup).removeClippedSubviews ?: false)
-    ) {
+    if (scrollView == null) {
       super.updateClippingRect(excludedViews)
       return
     }
 
     val clippingRect = checkNotNull(clippingRect)
+    val scrollView = checkNotNull(scrollView) as ReactClippingViewGroup
+
+    if (ReactNativeFeatureFlags.enableVirtualViewClippingWithoutScrollViewClipping()) {
+      if (scrollView.removeClippedSubviews) {
+        scrollView.getClippingRect(clippingRect)
+      } else {
+        (scrollView as View).getDrawingRect(clippingRect)
+      }
+    } else {
+      if (!(scrollView.removeClippedSubviews ?: false)) {
+        super.updateClippingRect(excludedViews)
+        return
+      }
+
+      scrollView.getClippingRect(clippingRect)
+    }
 
-    (scrollView as ReactClippingViewGroup).getClippingRect(clippingRect)
     clippingRect.intersect(containerRelativeRect)
     clippingRect.offset(-containerRelativeRect.left, -containerRelativeRect.top)
 

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<4c22217e5a773fd97f4041ef6e052ebc>>
+ * @generated SignedSource<<13ed11b5c260fae79048ea80745d22fe>>
  */
 
 /**
@@ -321,6 +321,12 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
+  bool enableVirtualViewClippingWithoutScrollViewClipping() override {
+    static const auto method =
+        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableVirtualViewClippingWithoutScrollViewClipping");
+    return method(javaProvider_);
+  }
+
   bool enableVirtualViewContainerStateExperimental() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableVirtualViewContainerStateExperimental");
@@ -770,6 +776,11 @@ bool JReactNativeFeatureFlagsCxxInterop::enableViewRecyclingForView(
   return ReactNativeFeatureFlags::enableViewRecyclingForView();
 }
 
+bool JReactNativeFeatureFlagsCxxInterop::enableVirtualViewClippingWithoutScrollViewClipping(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+  return ReactNativeFeatureFlags::enableVirtualViewClippingWithoutScrollViewClipping();
+}
+
 bool JReactNativeFeatureFlagsCxxInterop::enableVirtualViewContainerStateExperimental(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::enableVirtualViewContainerStateExperimental();
@@ -1117,6 +1128,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "enableViewRecyclingForView",
         JReactNativeFeatureFlagsCxxInterop::enableViewRecyclingForView),
+      makeNativeMethod(
+        "enableVirtualViewClippingWithoutScrollViewClipping",
+        JReactNativeFeatureFlagsCxxInterop::enableVirtualViewClippingWithoutScrollViewClipping),
       makeNativeMethod(
         "enableVirtualViewContainerStateExperimental",
         JReactNativeFeatureFlagsCxxInterop::enableVirtualViewContainerStateExperimental),

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<91f5bbbab5f34321687c6f6d31ca49d8>>
+ * @generated SignedSource<<1e57bf8252c16fc10bbfcae08710af85>>
  */
 
 /**
@@ -171,6 +171,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableViewRecyclingForView(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool enableVirtualViewClippingWithoutScrollViewClipping(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool enableVirtualViewContainerStateExperimental(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);