Pass "blockNativeResponder" param to RCTMountingManager

Summary: From looking at other implementations of setJSResponder, we need the MountingManager to have access to "blocksNativeResponder" param, but do not need to pass that through to individual views (see also Android implementation). Changelog: [Internal] Reviewed By: sammy-SC, mdvacca Differential Revision: D28066257 fbshipit-source-id: e1420431478fd27d2e1463e291a0bbc600d3f0a6
facebook · Apr 29, 2021 · a249065 · a249065
1 parent 8eeb016
commit a249065
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/React/Fabric/Mounting/RCTMountingManager.h b/React/Fabric/Mounting/RCTMountingManager.h
@@ -58,7 +58,9 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)sendAccessibilityEvent:(ReactTag)reactTag eventType:(NSString *)eventType;
 
-- (void)setIsJSResponder:(BOOL)isJSResponder forShadowView:(facebook::react::ShadowView)shadowView;
+- (void)setIsJSResponder:(BOOL)isJSResponder
+    blockNativeResponder:(BOOL)blockNativeResponder
+           forShadowView:(facebook::react::ShadowView)shadowView;
 
 - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
                              changedProps:(NSDictionary *)props

diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm
@@ -259,7 +259,9 @@ - (void)performTransaction:(MountingCoordinator::Shared const &)mountingCoordina
       });
 }
 
-- (void)setIsJSResponder:(BOOL)isJSResponder forShadowView:(facebook::react::ShadowView)shadowView
+- (void)setIsJSResponder:(BOOL)isJSResponder
+    blockNativeResponder:(BOOL)blockNativeResponder
+           forShadowView:(facebook::react::ShadowView)shadowView
 {
   RCTExecuteOnMainQueue(^{
     UIView<RCTComponentViewProtocol> *componentView =

diff --git a/React/Fabric/RCTScheduler.h b/React/Fabric/RCTScheduler.h
@@ -35,7 +35,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)schedulerDidSendAccessibilityEvent:(facebook::react::ShadowView const &)shadowView
                                  eventType:(std::string const &)eventType;
 
-- (void)schedulerDidSetIsJSResponder:(BOOL)isJSResponder forShadowView:(facebook::react::ShadowView const &)shadowView;
+- (void)schedulerDidSetIsJSResponder:(BOOL)isJSResponder
+                blockNativeResponder:(BOOL)blockNativeResponder
+                       forShadowView:(facebook::react::ShadowView const &)shadowView;
 
 @end
 

diff --git a/React/Fabric/RCTScheduler.mm b/React/Fabric/RCTScheduler.mm
@@ -49,7 +49,9 @@ void schedulerDidSetIsJSResponder(ShadowView const &shadowView, bool isJSRespond
       override
   {
     RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
-    [scheduler.delegate schedulerDidSetIsJSResponder:isJSResponder forShadowView:shadowView];
+    [scheduler.delegate schedulerDidSetIsJSResponder:isJSResponder
+                                blockNativeResponder:blockNativeResponder
+                                       forShadowView:shadowView];
   }
 
   void schedulerDidSendAccessibilityEvent(const ShadowView &shadowView, std::string const &eventType) override

diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
@@ -373,9 +373,13 @@ - (void)schedulerDidSendAccessibilityEvent:(const facebook::react::ShadowView &)
   [self->_mountingManager sendAccessibilityEvent:tag eventType:eventTypeStr];
 }
 
-- (void)schedulerDidSetIsJSResponder:(BOOL)isJSResponder forShadowView:(facebook::react::ShadowView const &)shadowView;
+- (void)schedulerDidSetIsJSResponder:(BOOL)isJSResponder
+                blockNativeResponder:(BOOL)blockNativeResponder
+                       forShadowView:(facebook::react::ShadowView const &)shadowView;
 {
-  [self->_mountingManager setIsJSResponder:isJSResponder forShadowView:shadowView];
+  [self->_mountingManager setIsJSResponder:isJSResponder
+                      blockNativeResponder:blockNativeResponder
+                             forShadowView:shadowView];
 }
 
 - (void)addObserver:(id<RCTSurfacePresenterObserver>)observer