From fa3697bd9e086d7a6869b04b7429d40ea82b34d6 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Wed, 23 Jun 2021 02:00:57 -0700
Subject: [PATCH] Back out "Add option to disable sending scroll events to
 Paper"

Summary:
Changelog: [internal]

Original commit changeset: fa4d8944ad6b

Not sending onScroll events events to Paper has no effect.

Reviewed By: mdvacca

Differential Revision: D29229662

fbshipit-source-id: b84a2614bfd42c64ca67ca6a1cd9d0a815c11ad0
---
 React/Base/RCTConstants.h                         |  6 ------
 React/Base/RCTConstants.m                         | 15 ---------------
 .../ScrollView/RCTScrollViewComponentView.mm      |  6 +-----
 React/Fabric/RCTSurfacePresenter.mm               |  4 ----
 4 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/React/Base/RCTConstants.h b/React/Base/RCTConstants.h
index d2ced08a2b1..daaac3cb47c 100644
--- a/React/Base/RCTConstants.h
+++ b/React/Base/RCTConstants.h
@@ -17,12 +17,6 @@ RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollec
 RCT_EXTERN BOOL RCTExperimentGetOnDemandViewMounting(void);
 RCT_EXTERN void RCTExperimentSetOnDemandViewMounting(BOOL value);
 
-/*
- * Allows sending scroll events to Paper.
- */
-RCT_EXTERN BOOL RCTExperimentGetSendScrollEventToPaper(void);
-RCT_EXTERN void RCTExperimentSetSendScrollEventToPaper(BOOL value);
-
 /*
  * Enables a fix for data race between state and scroll event.
  */
diff --git a/React/Base/RCTConstants.m b/React/Base/RCTConstants.m
index 7ae08e18c31..34c1b3cb4c4 100644
--- a/React/Base/RCTConstants.m
+++ b/React/Base/RCTConstants.m
@@ -25,21 +25,6 @@ void RCTExperimentSetOnDemandViewMounting(BOOL value)
   RCTExperimentOnDemandViewMounting = value;
 }
 
-/*
- * Send scroll events to Paper.
- */
-static BOOL RCTExperimentSendScrollEventToPaper = YES;
-
-BOOL RCTExperimentGetSendScrollEventToPaper()
-{
-  return RCTExperimentSendScrollEventToPaper;
-}
-
-void RCTExperimentSetSendScrollEventToPaper(BOOL value)
-{
-  RCTExperimentSendScrollEventToPaper = value;
-}
-
 /*
  * Enable fix for data race between state and scroll event.
  */
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
index bbd855bdecb..c06a20825ce 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -87,7 +87,6 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
   BOOL _isUserTriggeredScrolling;
 
   BOOL _isOnDemandViewMountingEnabled;
-  BOOL _sendScrollEventToPaper;
   BOOL _enableScrollViewEventRaceFix;
   CGPoint _contentOffsetWhenClipped;
   NSMutableArray<UIView<RCTComponentViewProtocol> *> *_childComponentViews;
@@ -108,7 +107,6 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
     _props = defaultProps;
 
     _isOnDemandViewMountingEnabled = RCTExperimentGetOnDemandViewMounting();
-    _sendScrollEventToPaper = RCTExperimentGetSendScrollEventToPaper();
     _enableScrollViewEventRaceFix = RCTExperimentGetScrollViewEventRaceFix();
     _childComponentViews = [[NSMutableArray alloc] init];
 
@@ -426,9 +424,7 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
     }
     // Once Fabric implements proper NativeAnimationDriver, this should be removed.
     // This is just a workaround to allow animations based on onScroll event.
-    if (_sendScrollEventToPaper) {
-      RCTSendPaperScrollEvent_DEPRECATED(scrollView, self.tag);
-    }
+    RCTSendPaperScrollEvent_DEPRECATED(scrollView, self.tag);
   }
 
   [self _remountChildrenIfNeeded];
diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
index d1bf8fb3c8d..8c75d4b7d54 100644
--- a/React/Fabric/RCTSurfacePresenter.mm
+++ b/React/Fabric/RCTSurfacePresenter.mm
@@ -256,10 +256,6 @@ static BackgroundExecutor RCTGetBackgroundExecutor()
     RCTExperimentSetOnDemandViewMounting(YES);
   }
 
-  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:disable_sending_scroll_events_to_paper")) {
-    RCTExperimentSetSendScrollEventToPaper(NO);
-  }
-
   if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:enable_state_scroll_data_race_ios")) {
     RCTExperimentSetScrollViewEventRaceFix(YES);
   }