Add new method jsBundleURLForBundleRoot with fallback block to RCTBun…

…dleURLProvider Reviewed By: julian-krzeminski Differential Revision: D17336324 fbshipit-source-id: b14a08d940ec7594978d3e34f1e833f65d3bd411
facebook · Sep 23, 2019 · 034a7d1 · 034a7d1
1 parent 845cbec
commit 034a7d1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/React/Base/RCTBundleURLProvider.h b/React/Base/RCTBundleURLProvider.h
@@ -31,6 +31,13 @@ extern const NSUInteger kRCTBundleURLProviderDefaultPort;
  */
 - (void)resetToDefaults;
 
+/**
+ * Returns the jsBundleURL for a given bundle entrypoint and
+ * the fallback offline JS bundle if the packager is not running.
+ */
+- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                fallbackURLProvider:(NSURL *(^)(void))fallbackURLProvider;
+
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.

diff --git a/React/Base/RCTBundleURLProvider.m b/React/Base/RCTBundleURLProvider.m
@@ -130,11 +130,11 @@ - (NSString *)packagerServerHost
   return nil;
 }
 
-- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackResource:(NSString *)resourceName fallbackExtension:(NSString *)extension
+- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackURLProvider:(NSURL *(^)(void))fallbackURLProvider
 {
   NSString *packagerServerHost = [self packagerServerHost];
   if (!packagerServerHost) {
-    return [self jsBundleURLForFallbackResource:resourceName fallbackExtension:extension];
+    return fallbackURLProvider();
   } else {
     return [RCTBundleURLProvider jsBundleURLForBundleRoot:bundleRoot
                                              packagerHost:packagerServerHost
@@ -143,6 +143,14 @@ - (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackResource:(NSS
   }
 }
 
+- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                   fallbackResource:(NSString *)resourceName fallbackExtension:(NSString *)extension
+{
+  return [self jsBundleURLForBundleRoot:bundleRoot fallbackURLProvider:^NSURL*{
+    return [self jsBundleURLForFallbackResource:resourceName fallbackExtension:extension];
+  }];
+}
+
 - (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackResource:(NSString *)resourceName
 {
   return [self jsBundleURLForBundleRoot:bundleRoot fallbackResource:resourceName fallbackExtension:nil];