Fix bridgeless support on iOS (#2223)

--------- Co-authored-by: William Candillon <wcandillon@gmail.com>
Shopify · Feb 19, 2024 · 547a861 · 547a861
1 parent f70066b
commit 547a861
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/package/ios/RNSkia-iOS/RNSkiOSPlatformContext.h b/package/ios/RNSkia-iOS/RNSkiOSPlatformContext.h
@@ -2,7 +2,6 @@
 
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
-#import <ReactCommon/RCTTurboModule.h>
 
 #include <functional>
 #include <memory>
@@ -30,8 +29,10 @@ static void handleNotification(CFNotificationCenterRef center, void *observer,
 
 class RNSkiOSPlatformContext : public RNSkPlatformContext {
 public:
-  RNSkiOSPlatformContext(jsi::Runtime *runtime, RCTBridge *bridge)
-      : RNSkPlatformContext(runtime, bridge.jsCallInvoker,
+  RNSkiOSPlatformContext(
+      jsi::Runtime *runtime, RCTBridge *bridge,
+      std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker)
+      : RNSkPlatformContext(runtime, jsCallInvoker,
                             [[UIScreen mainScreen] scale]) {
 
     // We need to make sure we invalidate when modules are freed

diff --git a/package/ios/RNSkia-iOS/SkiaManager.h b/package/ios/RNSkia-iOS/SkiaManager.h
@@ -12,6 +12,8 @@
 
 - (void)invalidate;
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge;
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                     jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)
+                                   jsInvoker;
 
 @end
diff --git a/package/ios/RNSkia-iOS/SkiaManager.mm b/package/ios/RNSkia-iOS/SkiaManager.mm
@@ -6,8 +6,6 @@
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 
-#import <ReactCommon/RCTTurboModule.h>
-
 #import "RNSkiOSPlatformContext.h"
 
 @implementation SkiaManager {
@@ -26,7 +24,9 @@ - (void)invalidate {
   _skManager = nullptr;
 }
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge {
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                     jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)
+                                   jsInvoker {
   self = [super init];
   if (self) {
     RCTCxxBridge *cxxBridge = (RCTCxxBridge *)bridge;
@@ -37,8 +37,9 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge {
 
       // Create the RNSkiaManager (cross platform)
       _skManager = std::make_shared<RNSkia::RNSkManager>(
-          jsRuntime, bridge.jsCallInvoker,
-          std::make_shared<RNSkia::RNSkiOSPlatformContext>(jsRuntime, bridge));
+          jsRuntime, jsInvoker,
+          std::make_shared<RNSkia::RNSkiOSPlatformContext>(jsRuntime, bridge,
+                                                           jsInvoker));
     }
   }
   return self;

diff --git a/package/ios/RNSkiaModule.mm b/package/ios/RNSkiaModule.mm
@@ -1,9 +1,11 @@
 
 #import "RNSkiaModule.h"
 #import <React/RCTBridge+Private.h>
+#import <ReactCommon/RCTTurboModule.h>
 
 @implementation RNSkiaModule {
   SkiaManager *skiaManager;
+  std::shared_ptr<facebook::react::CallInvoker> jsInvoker;
 }
 
 RCT_EXPORT_MODULE()
@@ -33,13 +35,17 @@ - (void)invalidate {
     return @true;
   }
   RCTBridge *bridge = [RCTBridge currentBridge];
-  skiaManager = [[SkiaManager alloc] initWithBridge:bridge];
+  if (!jsInvoker) {
+    jsInvoker = bridge.jsCallInvoker;
+  }
+  skiaManager = [[SkiaManager alloc] initWithBridge:bridge jsInvoker:jsInvoker];
   return @true;
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {
+  jsInvoker = params.jsInvoker;
   return std::make_shared<facebook::react::NativeSkiaModuleSpecJSI>(params);
 }
 #endif