fix: remove bridge! force-unwrap that crashes on RN 0.84+ bridgeless mode (#4200)

mfazekas · web-flow · commit 7c8894b1276e · 2026-05-11T10:49:28.000+02:00
* fix: remove bridge! force-unwrap that crashes on RN 0.84+ bridgeless mode Fixes #4195 * fix: resolve bridge proxy for image loading in bridgeless mode In RN 0.84+ with RCT_REMOVE_LEGACY_ARCH, [RCTBridge currentBridge] returns nil but TurboModules receive an RCTBridgeProxy via their bridge property. Add RNMBXBridgeManager that captures the bridge proxy from TurboModules and provides a currentBridge method that falls back to it. All ComponentViews now use [RNMBXBridgeManager currentBridge] instead of [RCTBridge currentBridge].
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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
 
     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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXBridgeManager.h b/ios/RNMBX/RNMBXBridgeManager.h
@@ -0,0 +1,8 @@
+#import <React/RCTBridge.h>
+
+@interface RNMBXBridgeManager : NSObject
+
++ (void)setBridge:(RCTBridge *)bridge;
++ (RCTBridge *)currentBridge;
+
+@end
diff --git a/ios/RNMBX/RNMBXBridgeManager.m b/ios/RNMBX/RNMBXBridgeManager.m
@@ -0,0 +1,16 @@
+#import "RNMBXBridgeManager.h"
+#import <React/RCTBridge+Private.h>
+
+static __weak RCTBridge *_rnmbxBridge = nil;
+
+@implementation RNMBXBridgeManager
+
++ (void)setBridge:(RCTBridge *)bridge {
+    _rnmbxBridge = bridge;
+}
+
++ (RCTBridge *)currentBridge {
+    return [RCTBridge currentBridge] ?: _rnmbxBridge;
+}
+
+@end
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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
  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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   self.contentView = _view;
 }
 
diff --git a/ios/RNMBX/RNMBXImageModule.h b/ios/RNMBX/RNMBXImageModule.h
@@ -14,3 +14,4 @@
 @end
 
 #endif
+
diff --git a/ios/RNMBX/RNMBXImageModule.mm b/ios/RNMBX/RNMBXImageModule.mm
@@ -4,15 +4,28 @@
 
 #import "RNMBXImageModule.h"
 #import "RNMBXImageComponentView.h"
+#import "RNMBXBridgeManager.h"
 
 #import "rnmapbox_maps-Swift.pre.h"
 
-@implementation RNMBXImageModule
+@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 setBridge:bridge];
+    }
+}
+
+- (RCTBridge *)bridge {
+    return _bridgeBacking;
+}
 
 - (dispatch_queue_t)methodQueue
 {
diff --git a/ios/RNMBX/RNMBXImageQueue.swift b/ios/RNMBX/RNMBXImageQueue.swift
@@ -67,7 +67,15 @@ class RNMBXImageQueueOperation : Operation {
     
     DispatchQueue.global(qos: .default).async {
       if let weakSelf = weakSelf {
-        let loader : RCTImageLoaderProtocol = weakSelf.bridge!.module(forName: "ImageLoader", lazilyLoadIfNecessary: true) as! RCTImageLoaderProtocol
+        guard let bridge = weakSelf.bridge else {
+          Logger.log(level: .error, message: "RNMBXImageQueue: bridge is nil, cannot load image")
+          if let completionHandler = weakSelf.completionHandler {
+            completionHandler(NSError(domain: "RNMBXImageQueue", code: 1, userInfo: [NSLocalizedDescriptionKey: "bridge is nil"]), nil)
+          }
+          _ = weakSelf.setState(state:.Finished, except:.Finished)
+          return
+        }
+        let loader : RCTImageLoaderProtocol = bridge.module(forName: "ImageLoader", lazilyLoadIfNecessary: true) as! RCTImageLoaderProtocol
         
         let cancellationBlock = loader.loadImage(with: weakSelf.urlRequest, size: .zero, scale: CGFloat(weakSelf.scale), clipped: true, resizeMode: .stretch, progressBlock: { _,_  in }, partialLoad: { _ in }) { error, image in
           if let completionHandler = weakSelf.completionHandler {
diff --git a/ios/RNMBX/RNMBXImages.swift b/ios/RNMBX/RNMBXImages.swift
@@ -130,6 +130,10 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
     }
     
     if missingImages.count > 0 {
+      guard let bridge = bridge else {
+        Logger.log(level: .error, message: "RNMBXImages: bridge is nil, cannot fetch images. Use nativeAssetImages instead.")
+        return
+      }
       RNMBXUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true) { name, image in
         self.loadedImages.insert(name)
         self.imageManager?.resolve(name: name, image: image)
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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
 
       // 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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
 
     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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
   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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];
 
     self.contentView = _view;
 }
diff --git a/ios/RNMBX/RNMBXStyle.swift b/ios/RNMBX/RNMBXStyle.swift
diff --git a/ios/RNMBX/RNMBXStyleValue.swift b/ios/RNMBX/RNMBXStyleValue.swift
diff --git a/ios/RNMBX/RNMBXSymbolLayerComponentView.mm b/ios/RNMBX/RNMBXSymbolLayerComponentView.mm
diff --git a/ios/RNMBX/RNMBXTerrainComponentView.mm b/ios/RNMBX/RNMBXTerrainComponentView.mm
diff --git a/scripts/templates/RNMBXStyle.swift.ejs b/scripts/templates/RNMBXStyle.swift.ejs

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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];`
`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 "RNMBXBridgeManager.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 = [RNMBXBridgeManager currentBridge];`
`44`	`45`	`self.contentView = _view;`
`45`	`46`	`}`
`46`	`47`
Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@`
`14`	`14`	`@end`
`15`	`15`
`16`	`16`	`#endif`
	`17`	`+`