Back out "Forward ACTION_SCROLL events to SwipeRefreshLayout children" (#55194)

Summary:
Pull Request resolved: #55194

Reverts #55097
Original Phabricator Diff: D90209679

Reverting this behavior and feature flag as the experiment that used it is no longer needed

Changelog: [Internal]

Reviewed By: cortinico

Differential Revision: D90791564

fbshipit-source-id: 362399c435a0c5addba5734e333bc2c1747f7293

Author: Abbondanzo

packages/react-native/ReactAndroid/api/ReactAndroid.api

@@ -6025,7 +6025,6 @@ public abstract interface class com/facebook/react/views/scroll/VirtualView {
 public final class com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout : androidx/swiperefreshlayout/widget/SwipeRefreshLayout {
 	public fun <init> (Lcom/facebook/react/bridge/ReactContext;)V
 	public fun canChildScrollUp ()Z
-	public fun dispatchGenericMotionEvent (Landroid/view/MotionEvent;)Z
 	public fun onInterceptTouchEvent (Landroid/view/MotionEvent;)Z
 	public fun onLayout (ZIIII)V
 	public fun onTouchEvent (Landroid/view/MotionEvent;)Z

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<<2329e4100b9b70dce294c618d0616e98>>
+ * @generated SignedSource<<27dfa9832869aa05987fa7cb9740f7ba>>
  */
 
 /**
@@ -384,12 +384,6 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun overrideBySynchronousMountPropsAtMountingAndroid(): Boolean = accessor.overrideBySynchronousMountPropsAtMountingAndroid()
 
-  /**
-   * When enabled, ReactSwipeRefreshLayout will forward ACTION_SCROLL events to its child for proper handling.
-   */
-  @JvmStatic
-  public fun passScrollToSwipeRefreshChild(): Boolean = accessor.passScrollToSwipeRefreshChild()
-
   /**
    * Enable reporting Performance Issues (`detail.devtools.performanceIssue`). Displayed in the V2 Performance Monitor and the "Performance Issues" sub-panel in DevTools.
    */

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<<ddaac394d5d58b2dd3416f5155d4df03>>
+ * @generated SignedSource<<6fb19235ba5049e07952cfa1b564e9e2>>
  */
 
 /**
@@ -79,7 +79,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var fuseboxNetworkInspectionEnabledCache: Boolean? = null
   private var hideOffscreenVirtualViewsOnIOSCache: Boolean? = null
   private var overrideBySynchronousMountPropsAtMountingAndroidCache: Boolean? = null
-  private var passScrollToSwipeRefreshChildCache: Boolean? = null
   private var perfIssuesEnabledCache: Boolean? = null
   private var perfMonitorV2EnabledCache: Boolean? = null
   private var preparedTextCacheSizeCache: Double? = null
@@ -630,15 +629,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
-  override fun passScrollToSwipeRefreshChild(): Boolean {
-    var cached = passScrollToSwipeRefreshChildCache
-    if (cached == null) {
-      cached = ReactNativeFeatureFlagsCxxInterop.passScrollToSwipeRefreshChild()
-      passScrollToSwipeRefreshChildCache = cached
-    }
-    return cached
-  }
-
   override fun perfIssuesEnabled(): Boolean {
     var cached = perfIssuesEnabledCache
     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<<d39b29af72f9e1830af35d856952e317>>
+ * @generated SignedSource<<6410500cbf5a05b1f34efd12d1e83bdf>>
  */
 
 /**
@@ -146,8 +146,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun overrideBySynchronousMountPropsAtMountingAndroid(): Boolean
 
-  @DoNotStrip @JvmStatic public external fun passScrollToSwipeRefreshChild(): Boolean
-
   @DoNotStrip @JvmStatic public external fun perfIssuesEnabled(): Boolean
 
   @DoNotStrip @JvmStatic public external fun perfMonitorV2Enabled(): 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<<293c71559a8101698003f517a98af514>>
+ * @generated SignedSource<<6c664176cf41ffb9f2bf820f15ed7463>>
  */
 
 /**
@@ -141,8 +141,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun overrideBySynchronousMountPropsAtMountingAndroid(): Boolean = false
 
-  override fun passScrollToSwipeRefreshChild(): Boolean = false
-
   override fun perfIssuesEnabled(): Boolean = false
 
   override fun perfMonitorV2Enabled(): 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<<0f1bedf79aaaddc0ff69155ad4593ad3>>
+ * @generated SignedSource<<1403b30f4dc3d18f39303d91d6824bda>>
  */
 
 /**
@@ -83,7 +83,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var fuseboxNetworkInspectionEnabledCache: Boolean? = null
   private var hideOffscreenVirtualViewsOnIOSCache: Boolean? = null
   private var overrideBySynchronousMountPropsAtMountingAndroidCache: Boolean? = null
-  private var passScrollToSwipeRefreshChildCache: Boolean? = null
   private var perfIssuesEnabledCache: Boolean? = null
   private var perfMonitorV2EnabledCache: Boolean? = null
   private var preparedTextCacheSizeCache: Double? = null
@@ -693,16 +692,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun passScrollToSwipeRefreshChild(): Boolean {
-    var cached = passScrollToSwipeRefreshChildCache
-    if (cached == null) {
-      cached = currentProvider.passScrollToSwipeRefreshChild()
-      accessedFeatureFlags.add("passScrollToSwipeRefreshChild")
-      passScrollToSwipeRefreshChildCache = cached
-    }
-    return cached
-  }
-
   override fun perfIssuesEnabled(): Boolean {
     var cached = perfIssuesEnabledCache
     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<<85087ed95d67c12c6ac8dbf433284d1d>>
+ * @generated SignedSource<<ad478388cb9a64690c71fe8fa06c1c79>>
  */
 
 /**
@@ -141,8 +141,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun overrideBySynchronousMountPropsAtMountingAndroid(): Boolean
 
-  @DoNotStrip public fun passScrollToSwipeRefreshChild(): Boolean
-
   @DoNotStrip public fun perfIssuesEnabled(): Boolean
 
   @DoNotStrip public fun perfMonitorV2Enabled(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.kt

@@ -12,18 +12,11 @@ import android.view.ViewConfiguration
 import android.view.ViewGroup
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.facebook.react.bridge.ReactContext
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.events.NativeGestureUtil
 import kotlin.math.abs
 
-/**
- * Basic extension of [SwipeRefreshLayout] with ReactNative-specific functionality.
- *
- * This component wraps a scrollable child (typically a ScrollView or RecyclerView) and provides
- * pull-to-refresh functionality. It handles touch event interception for the refresh gesture while
- * properly forwarding other events to its children.
- */
+/** Basic extension of [SwipeRefreshLayout] with ReactNative-specific functionality. */
 public class ReactSwipeRefreshLayout(reactContext: ReactContext) :
     SwipeRefreshLayout(reactContext) {
 
@@ -134,31 +127,6 @@ public class ReactSwipeRefreshLayout(reactContext: ReactContext) :
     return true
   }
 
-  /**
-   * Dispatches generic motion events to children.
-   *
-   * This override ensures that [MotionEvent.ACTION_SCROLL] events (from joystick, scrollwheel, or
-   * other pointing devices) are properly forwarded to child views.
-   */
-  public override fun dispatchGenericMotionEvent(ev: MotionEvent): Boolean {
-    // For ACTION_SCROLL events, dispatch to child for handling
-    // The child ScrollView will use nested scrolling APIs to communicate with this
-    // SwipeRefreshLayout
-    if (
-        ReactNativeFeatureFlags.passScrollToSwipeRefreshChild() &&
-            ev.actionMasked == MotionEvent.ACTION_SCROLL
-    ) {
-      val child = getChildAt(0)
-      if (child != null) {
-        val handled = child.dispatchGenericMotionEvent(ev)
-        if (handled) {
-          return true
-        }
-      }
-    }
-    return super.dispatchGenericMotionEvent(ev)
-  }
-
   private companion object {
     private const val DEFAULT_CIRCLE_TARGET = 64f
   }

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<<131ba2b067fb63576bbc94cfb2521d06>>
+ * @generated SignedSource<<288cffd334fdaebf18b1bede7bb907c8>>
  */
 
 /**
@@ -393,12 +393,6 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
-  bool passScrollToSwipeRefreshChild() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("passScrollToSwipeRefreshChild");
-    return method(javaProvider_);
-  }
-
   bool perfIssuesEnabled() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("perfIssuesEnabled");
@@ -806,11 +800,6 @@ bool JReactNativeFeatureFlagsCxxInterop::overrideBySynchronousMountPropsAtMounti
   return ReactNativeFeatureFlags::overrideBySynchronousMountPropsAtMountingAndroid();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::passScrollToSwipeRefreshChild(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::passScrollToSwipeRefreshChild();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::perfIssuesEnabled(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::perfIssuesEnabled();
@@ -1109,9 +1098,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "overrideBySynchronousMountPropsAtMountingAndroid",
         JReactNativeFeatureFlagsCxxInterop::overrideBySynchronousMountPropsAtMountingAndroid),
-      makeNativeMethod(
-        "passScrollToSwipeRefreshChild",
-        JReactNativeFeatureFlagsCxxInterop::passScrollToSwipeRefreshChild),
       makeNativeMethod(
         "perfIssuesEnabled",
         JReactNativeFeatureFlagsCxxInterop::perfIssuesEnabled),

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<<c08164df224d384271a3808d8117afb5>>
+ * @generated SignedSource<<b1325a7991f212671b02bd4072d8b555>>
  */
 
 /**
@@ -207,9 +207,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool overrideBySynchronousMountPropsAtMountingAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool passScrollToSwipeRefreshChild(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool perfIssuesEnabled(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);