fix: use bridge proxy from TurboModule for image loading in bridgeless mode

mfazekas · mfazekas · commit 64041ea4c9b8 · 2026-05-11T08:18:20.000+02:00
In RN 0.84+ with RCT_REMOVE_LEGACY_ARCH, [RCTBridge currentBridge] returns
nil but TurboModules receive an RCTBridgeProxy via their bridge property.

Add RNMBXBridgeManager to capture and share this bridge proxy so that
ComponentViews can fall back to it for image loading.
diff --git a/ios/RNMBX/RNMBXAtmosphereComponentView.mm b/ios/RNMBX/RNMBXAtmosphereComponentView.mm
@@ -3,6 +3,7 @@
 #import "RNMBXFabricHelpers.h"
 
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
     _view =  [[RNMBXAtmosphere alloc] init];
-    _view.bridge = [RCTBridge currentBridge];
+    _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
 
     self.contentView = _view;
 }
diff --git a/ios/RNMBX/RNMBXBackgroundLayerComponentView.mm b/ios/RNMBX/RNMBXBackgroundLayerComponentView.mm
@@ -3,6 +3,7 @@
 #import "RNMBXFabricHelpers.h"
 
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXBackgroundLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXCircleLayerComponentView.mm b/ios/RNMBX/RNMBXCircleLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXCircleLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.mm b/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXFillExtrusionLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
  self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXFillLayerComponentView.mm b/ios/RNMBX/RNMBXFillLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXFillLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXHeatmapLayerComponentView.mm b/ios/RNMBX/RNMBXHeatmapLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXHeatmapLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 #pragma mark - RCTComponentViewProtocol
diff --git a/ios/RNMBX/RNMBXHillshadeLayerComponentView.mm b/ios/RNMBX/RNMBXHillshadeLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXHillshadeLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXImageModule.h b/ios/RNMBX/RNMBXImageModule.h
@@ -14,3 +14,8 @@
 @end
 
 #endif
+
+@interface RNMBXBridgeManager : NSObject
++ (void)setSharedBridge:(id)bridge;
++ (id)sharedBridge;
+@end
diff --git a/ios/RNMBX/RNMBXImageModule.mm b/ios/RNMBX/RNMBXImageModule.mm
@@ -7,12 +7,35 @@
 
 #import "rnmapbox_maps-Swift.pre.h"
 
-@implementation RNMBXImageModule
+static __weak id _rnmbxSharedBridge = nil;
+
+@implementation RNMBXBridgeManager
++ (void)setSharedBridge:(id)bridge {
+    _rnmbxSharedBridge = bridge;
+}
++ (id)sharedBridge {
+    return _rnmbxSharedBridge;
+}
+@end
+
+@implementation RNMBXImageModule {
+    id _bridgeBacking;
+}
 
 RCT_EXPORT_MODULE();
 
 @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
-@synthesize bridge = _bridge;
+
+- (void)setBridge:(RCTBridge *)bridge {
+    _bridgeBacking = bridge;
+    if (bridge != nil) {
+        [RNMBXBridgeManager setSharedBridge:bridge];
+    }
+}
+
+- (RCTBridge *)bridge {
+    return _bridgeBacking;
+}
 
 - (dispatch_queue_t)methodQueue
 {
diff --git a/ios/RNMBX/RNMBXImagesComponentView.mm b/ios/RNMBX/RNMBXImagesComponentView.mm
@@ -5,6 +5,7 @@
 #include "RNMBXImageComponentView.h"
 
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -42,7 +43,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
     _view = [[RNMBXImages alloc] init];
-    _view.bridge = [RCTBridge currentBridge];
+    _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
 
       // capture weak self reference to prevent retain cycle
       __weak __typeof__(self) weakSelf = self;
diff --git a/ios/RNMBX/RNMBXLightComponentView.mm b/ios/RNMBX/RNMBXLightComponentView.mm
@@ -3,6 +3,7 @@
 #import "RNMBXFabricHelpers.h"
 
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view = [[RNMBXLight alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXLineLayerComponentView.mm b/ios/RNMBX/RNMBXLineLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXLineLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXModelLayerComponentView.mm b/ios/RNMBX/RNMBXModelLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXModelLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXRainComponentView.mm b/ios/RNMBX/RNMBXRainComponentView.mm
@@ -3,6 +3,7 @@
 #import "RNMBXFabricHelpers.h"
 
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
     _view =  [[RNMBXRain alloc] init];
-    _view.bridge = [RCTBridge currentBridge];
+    _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
 
     self.contentView = _view;
 }
diff --git a/ios/RNMBX/RNMBXRasterLayerComponentView.mm b/ios/RNMBX/RNMBXRasterLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXRasterLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXRasterParticleLayerComponentView.mm b/ios/RNMBX/RNMBXRasterParticleLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXRasterParticleLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXSkyLayerComponentView.mm b/ios/RNMBX/RNMBXSkyLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXSkyLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXSnowComponentView.mm b/ios/RNMBX/RNMBXSnowComponentView.mm
@@ -3,6 +3,7 @@
 #import "RNMBXFabricHelpers.h"
 
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
     _view =  [[RNMBXSnow alloc] init];
-    _view.bridge = [RCTBridge currentBridge];
+    _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
 
     self.contentView = _view;
 }
diff --git a/ios/RNMBX/RNMBXSymbolLayerComponentView.mm b/ios/RNMBX/RNMBXSymbolLayerComponentView.mm
@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXSymbolLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXTerrainComponentView.mm b/ios/RNMBX/RNMBXTerrainComponentView.mm
@@ -3,6 +3,7 @@
 #import "RNMBXFabricHelpers.h"
 
 #import <React/RCTBridge+Private.h>
+#import "RNMBXImageModule.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)prepareView
 {
   _view =  [[RNMBXTerrain alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];
   self.contentView = _view;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#import "RNMBXFabricHelpers.h"`
`4`	`4`
`5`	`5`	`#import <React/RCTBridge+Private.h>`
	`6`	`+#import "RNMBXImageModule.h"`
`6`	`7`	`#import <React/RCTConversions.h>`
`7`	`8`	`#import <React/RCTFabricComponentsPlugins.h>`
`8`	`9`
`@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame`
`40`	`41`	`- (void)prepareView`
`41`	`42`	`{`
`42`	`43`	`_view = [[RNMBXAtmosphere alloc] init];`
`43`		`- _view.bridge = [RCTBridge currentBridge];`
	`44`	`+ _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];`
`44`	`45`
`45`	`46`	`self.contentView = _view;`
`46`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#import <React/RCTConversions.h>`
`6`	`6`	`#import <React/RCTFabricComponentsPlugins.h>`
`7`	`7`	`#import <React/RCTBridge+Private.h>`
	`8`	`+#import "RNMBXImageModule.h"`
`8`	`9`
`9`	`10`	`#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>`
`10`	`11`	`#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>`
`@@ -40,7 +41,7 @@ - (instancetype)initWithFrame:(CGRect)frame`
`40`	`41`	`- (void)prepareView`
`41`	`42`	`{`
`42`	`43`	`_view = [[RNMBXCircleLayer alloc] init];`
`43`		`- _view.bridge = [RCTBridge currentBridge];`
	`44`	`+ _view.bridge = [RCTBridge currentBridge] ?: [RNMBXBridgeManager sharedBridge];`
`44`	`45`	`self.contentView = _view;`
`45`	`46`	`}`
`46`	`47`