fix: start work on custom request handlers on new arch

facebook · Feb 6, 2023 · 222dd96 · 222dd96
1 parent 011ea33
commit 222dd96
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/React/AppSetup/RCTAppSetupUtils.mm b/React/AppSetup/RCTAppSetupUtils.mm
@@ -83,11 +83,13 @@ void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled)
   } else if (moduleClass == RCTNetworking.class) {
     return [[moduleClass alloc]
         initWithHandlersProvider:^NSArray<id<RCTURLRequestHandler>> *(RCTModuleRegistry *moduleRegistry) {
-          return @[
-            [RCTHTTPRequestHandler new],
-            [RCTDataRequestHandler new],
-            [RCTFileRequestHandler new],
-          ];
+          NSArray *handlers = [moduleRegistry modulesConformingToProtocol:@protocol(RCTURLRequestHandler)];
+          NSArray *handlersWithDefaultOnes = [handlers arrayByAddingObjectsFromArray: @[
+                        [RCTHTTPRequestHandler new],
+                        [RCTDataRequestHandler new],
+                        [RCTFileRequestHandler new],
+          ]];
+          return handlersWithDefaultOnes;
         }];
   }
   // No custom initializer here.

diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h
@@ -390,6 +390,7 @@ RCT_EXTERN_C_END
 
 - (id)moduleForName:(const char *)moduleName;
 - (id)moduleForName:(const char *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyLoad;
+- (NSArray *)modulesConformingToProtocol:(Protocol *)protocol;
 @end
 
 typedef UIView * (^RCTBridgelessComponentViewProvider)(NSNumber *);

diff --git a/React/Base/RCTModuleRegistry.m b/React/Base/RCTModuleRegistry.m
@@ -47,4 +47,16 @@ - (id)moduleForName:(const char *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyL
   return module;
 }
 
+- (NSArray *)modulesConformingToProtocol:(Protocol *)protocol
+{
+  NSMutableArray *modules = [NSMutableArray new];
+  RCTBridge *bridge = _bridge;
+  if (bridge) {
+    [modules addObjectsFromArray:[bridge modulesConformingToProtocol:protocol]];
+  }
+
+  // TODO: find a way to get the same information of turboModules
+  return [modules copy];
+}
+
 @end