@rnmapbox/maps 10.1.0-beta.11 → 10.1.0-beta.14

package/ios/RNMBX/RNMBXShapeSourceViewManager.m

@@ -0,0 +1,26 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface
+RCT_EXTERN_REMAP_MODULE(RNMBXShapeSource, RNMBXShapeSourceViewManager, RCTViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(id, NSString)
+RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(url, NSString)
+RCT_EXPORT_VIEW_PROPERTY(shape, NSString)
+
+RCT_EXPORT_VIEW_PROPERTY(cluster, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(clusterRadius, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(clusterMaxZoomLevel, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(clusterProperties, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(buffer, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(tolerance, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(lineMetrics, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(images, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(nativeImages, NSArray)
+RCT_EXPORT_VIEW_PROPERTY(hasPressListener, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(hitbox, NSDictionary)
+RCT_REMAP_VIEW_PROPERTY(onMapboxShapeSourcePress, onPress, RCTBubblingEventBlock)
+
+@end

package/ios/RNMBX/{RNMBXShapeSourceManager.swift → RNMBXShapeSourceViewManager.swift}

@@ -1,48 +1,23 @@
-@objc(RNMBXShapeSourceManager)
-class RNMBXShapeSourceManager: RCTViewManager {
+@objc(RNMBXShapeSourceViewManager)
+public class RNMBXShapeSourceViewManager: RCTViewManager {
   @objc
-  override static func requiresMainQueueSetup() -> Bool {
+  override public static func requiresMainQueueSetup() -> Bool {
     return true
   }
 
-  @objc override func view() -> UIView {
+  @objc override public func view() -> UIView {
     return RNMBXShapeSource()
   }
 }
-
-// MARK: - helpers
-
-extension RNMBXShapeSourceManager {
-  func withShapeSource(
-      _ reactTag: NSNumber,
-      name: String,
-      rejecter: @escaping RCTPromiseRejectBlock,
-      fn: @escaping (_: RNMBXShapeSource) -> Void) -> Void
-  {
-    self.bridge.uiManager.addUIBlock { (manager, viewRegistry) in
-      let view = viewRegistry![reactTag]
-
-      guard let shapeSource = view! as? RNMBXShapeSource else {
-        RNMBXLogError("Invalid react tag, could not find RNMBXShapeSource");
-        rejecter(name, "Unknown find reactTag: \(reactTag)", nil)
-        return;
-      }
-
-      fn(shapeSource)
-    }
-  }
-}
-
 // MARK: - react methods
 
-extension RNMBXShapeSourceManager {
-  @objc func getClusterExpansionZoom(
-    _ reactTag: NSNumber,
+extension RNMBXShapeSourceViewManager {
+  @objc public static func getClusterExpansionZoom(
+    shapeSource: RNMBXShapeSource,
     featureJSON: String,
     resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) -> Void
   {
-    self.withShapeSource(reactTag, name:"getCluster   ExpansionZoom", rejecter: rejecter) { shapeSource in
       shapeSource.getClusterExpansionZoom(featureJSON) { result in
         switch result {
         case .success(let zoom):
@@ -53,19 +28,17 @@ extension RNMBXShapeSourceManager {
           rejecter(error.localizedDescription, "Error.getClusterExpansionZoom", error)
         }
       }
-    }
   }
   
-  @objc func getClusterLeaves(
-    _ reactTag: NSNumber,
+  @objc public static func getClusterLeaves(
+    shapeSource: RNMBXShapeSource,
     featureJSON: String,
     number: uint,
     offset: uint,
     resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) -> Void
   {
-    self.withShapeSource(reactTag, name:"getClusterLeaves", rejecter: rejecter) { shapeSource in
-      shapeSource.getClusterLeaves(featureJSON, number: number, offset: offset) { result in
+    shapeSource.getClusterLeaves(featureJSON, number: number, offset: offset) { result in
         switch result {
         case .success(let features):
           logged("getClusterLeaves", rejecter: rejecter) {
@@ -77,16 +50,14 @@ extension RNMBXShapeSourceManager {
         case .failure(let error):
           rejecter(error.localizedDescription, "Error.getClusterLeaves", error)
         }
-      }
     }
   }
   
-  @objc func getClusterChildren(
-    _ reactTag: NSNumber,
+  @objc public static func getClusterChildren(
+    shapeSource: RNMBXShapeSource,
     featureJSON: String,
     resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-      self.withShapeSource(reactTag, name:"getClusterChildren", rejecter: rejecter) { shapeSource in
       shapeSource.getClusterChildren(featureJSON) { result in
         switch result {
         case .success(let features):
@@ -101,6 +72,5 @@ extension RNMBXShapeSourceManager {
         }
       }
     }
-  }
 }
 

package/ios/RNMBX/RNMBXSkyLayerComponentView.mm

@@ -5,6 +5,7 @@
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTBridge+Private.h>
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -34,6 +35,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
   _view =  [[RNMBXSkyLayer alloc] init];
+  _view.bridge = [RCTBridge currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXSource.swift

@@ -1,7 +1,7 @@
 @_spi(Experimental) import MapboxMaps
 
 @objc
-class RNMBXSource : RNMBXInteractiveElement {
+public class RNMBXSource : RNMBXInteractiveElement {
   var layers: [RNMBXSourceConsumer] = []
   var components: [RNMBXMapComponent] = []
 
@@ -9,7 +9,7 @@ class RNMBXSource : RNMBXInteractiveElement {
 
   var ownsSource : Bool = false
 
-  @objc var existing: Bool = false
+  @objc public var existing: Bool = false
   
   override func getLayerIDs() -> [String] {
     layers.compactMap {
@@ -31,37 +31,46 @@ class RNMBXSource : RNMBXInteractiveElement {
   
   // MARK: - UIView+React
 
-  @objc override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
-    if let layer = subview as? RNMBXSourceConsumer {
-      if let map = map {
-        layer.addToMap(map, style: map.mapboxMap.style)
-      }
-      layers.append(layer)
-    } else if let component = subview as? RNMBXMapComponent {
-      if let map = map {
-        component.addToMap(map, style: map.mapboxMap.style)
-      }
-      components.append(component)
-    }
+  @objc public override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
+    insertReactSubviewInternal(subview, at: atIndex)
     super.insertReactSubview(subview, at: atIndex)
   }
-  
-  @objc override func removeReactSubview(_ subview: UIView!) {
-    if let layer : RNMBXSourceConsumer = subview as? RNMBXSourceConsumer {
-      if let map = map {
-        layer.removeFromMap(map, style: map.mapboxMap.style)
-      }
-      layers.removeAll { $0 as AnyObject === layer }
-    } else if let component = subview as? RNMBXMapComponent {
-      if let map = map {
-        component.removeFromMap(map, reason: .ViewRemoval)
-      }
-      layers.removeAll { $0 as AnyObject === component }
+    
+    @objc public func insertReactSubviewInternal(_ subview: UIView!, at atIndex: Int) {
+        if let layer = subview as? RNMBXSourceConsumer {
+          if let map = map {
+            layer.addToMap(map, style: map.mapboxMap.style)
+          }
+          layers.append(layer)
+        } else if let component = subview as? RNMBXMapComponent {
+          if let map = map {
+            component.addToMap(map, style: map.mapboxMap.style)
+          }
+          components.append(component)
+        }
     }
+  
+  @objc public override func removeReactSubview(_ subview: UIView!) {
+    removeReactSubviewInternal(subview)
     super.removeReactSubview(subview)
   }
+    
+    @objc public func removeReactSubviewInternal(_ subview: UIView!) {
+        if let layer : RNMBXSourceConsumer = subview as? RNMBXSourceConsumer {
+          if let map = map {
+            layer.removeFromMap(map, style: map.mapboxMap.style)
+          }
+          layers.removeAll { $0 as AnyObject === layer }
+        } else if let component = subview as? RNMBXMapComponent {
+          if let map = map {
+            component.removeFromMap(map, reason: .ViewRemoval)
+          }
+          layers.removeAll { $0 as AnyObject === component }
+        }
+    }
+
   
-  @objc override func didUpdateReactSubviews() {
+  @objc public override func didUpdateReactSubviews() {
     // do nothing to prevent inserting layers to UIView hierarchy
   }
   

package/ios/RNMBX/RNMBXSymbolLayerComponentView.mm

@@ -5,6 +5,7 @@
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTBridge+Private.h>
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -34,6 +35,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
   _view =  [[RNMBXSymbolLayer alloc] init];
+  _view.bridge = [RCTBridge currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXTileSource.swift

@@ -1,5 +1,5 @@
 @objc
-class RNMBXTileSource : RNMBXSource {
-  @objc var url: String? = nil
+public class RNMBXTileSource : RNMBXSource {
+  @objc public var url: String? = nil
   
 }

package/ios/RNMBX/RNMBXVectorSource.swift

@@ -1,13 +1,13 @@
 import MapboxMaps
 
 @objc
-class RNMBXVectorSource : RNMBXTileSource {
+public class RNMBXVectorSource : RNMBXTileSource {
   
-  @objc var attribution: String?
-  @objc var maxZoomLevel: NSNumber?
-  @objc var minZoomLevel: NSNumber?
-  @objc var tileUrlTemplates: [String] = []
-  @objc var tms: Bool = false
+  @objc public var attribution: String?
+  @objc public var maxZoomLevel: NSNumber?
+  @objc public var minZoomLevel: NSNumber?
+  @objc public var tileUrlTemplates: [String] = []
+  @objc public var tms: Bool = false
   
   override func sourceType() -> Source.Type {
     return VectorSource.self

package/ios/RNMBX/RNMBXVectorSourceComponentView.h

@@ -0,0 +1,17 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTUIManager.h>
+#import <React/RCTViewComponentView.h>
+
+#import "RNMBXMapFeatureView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMBXVectorSourceComponentView : RCTViewComponentView <RNMBXMapFeatureView>
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXVectorSourceComponentView.mm

@@ -0,0 +1,141 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXVectorSourceComponentView.h"
+#import "RNMBXFabricHelpers.h"
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+
+#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
+#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
+#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
+#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
+
+using namespace facebook::react;
+
+@interface RNMBXVectorSourceComponentView () <RCTRNMBXVectorSourceViewProtocol>
+@end
+
+@implementation RNMBXVectorSourceComponentView {
+    RNMBXVectorSource *_view;
+}
+
+@synthesize mapFeature;
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXVectorSourceProps>();
+    _props = defaultProps;
+    [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+    _view = [[RNMBXVectorSource alloc] init];
+      
+    // capture weak self reference to prevent retain cycle
+    __weak __typeof__(self) weakSelf = self;
+
+    [_view setOnPress:^(NSDictionary* event) {
+        __typeof__(self) strongSelf = weakSelf;
+
+        if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+            const auto [type, json] = RNMBXStringifyEventData(event);
+            std::dynamic_pointer_cast<const facebook::react::RNMBXVectorSourceEventEmitter>(strongSelf->_eventEmitter)->onMapboxVectorSourcePress({type, json});
+          }
+    }];
+
+    self.contentView = _view;
+    self.mapFeature = _view;
+}
+
+- (void)prepareForRecycle
+{
+  [super prepareForRecycle];
+  [self prepareView];
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    if ([childComponentView isKindOfClass:[RCTViewComponentView class]]) {
+        [_view insertReactSubviewInternal:((RCTViewComponentView *)childComponentView).contentView at:index];
+    } else {
+        RCTLogError(@"Tried to add view that is not RCTViewComponentView: %@", childComponentView);
+    }
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    if ([childComponentView isKindOfClass:[RCTViewComponentView class]]) {
+        [_view removeReactSubviewInternal:((RCTViewComponentView *)childComponentView).contentView];
+    } else {
+        RCTLogError(@"Tried to remove view that is not RCTViewComponentView: %@", childComponentView);
+    }
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXVectorSourceComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = *std::static_pointer_cast<const RNMBXVectorSourceProps>(props);
+    id idx = RNMBXConvertFollyDynamicToId(newProps.id);
+    if (idx != nil) {
+        _view.id = idx;
+    }
+    id existing = RNMBXConvertFollyDynamicToId(newProps.existing);
+    if (existing != nil) {
+        _view.existing = existing;
+    }
+    id url = RNMBXConvertFollyDynamicToId(newProps.url);
+    if (url != nil) {
+        _view.url = url;
+    }
+    id tileUrlTemplates = RNMBXConvertFollyDynamicToId(newProps.tileUrlTemplates);
+    if (tileUrlTemplates != nil) {
+        _view.tileUrlTemplates = tileUrlTemplates;
+    }
+    id minZoomLevel = RNMBXConvertFollyDynamicToId(newProps.minZoomLevel);
+    if (minZoomLevel != nil) {
+        _view.minZoomLevel = minZoomLevel;
+    }
+    id maxZoomLevel = RNMBXConvertFollyDynamicToId(newProps.maxZoomLevel);
+    if (maxZoomLevel != nil) {
+        _view.maxZoomLevel = maxZoomLevel;
+    }
+    id tms = RNMBXConvertFollyDynamicToId(newProps.tms);
+    if (tms != nil) {
+        _view.tms = tms;
+    }
+    id attribution = RNMBXConvertFollyDynamicToId(newProps.attribution);
+    if (attribution != nil) {
+        _view.attribution = attribution;
+    }
+    id hasPressListener = RNMBXConvertFollyDynamicToId(newProps.hasPressListener);
+    if (hasPressListener != nil) {
+        _view.hasPressListener = hasPressListener;
+    }
+    id hitbox = RNMBXConvertFollyDynamicToId(newProps.hitbox);
+    if (hitbox != nil) {
+        _view.hitbox = hitbox;
+    }
+    
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXVectorSourceCls(void)
+{
+  return RNMBXVectorSourceComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/{RNMBXVectorSourceManager.m → RNMBXVectorSourceViewManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RNMBXVectorSourceManager, RCTViewManager)
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXVectorSource, RNMBXVectorSourceViewManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)

package/ios/RNMBX/{RNMBXVectorSourceManager.swift → RNMBXVectorSourceViewManager.swift}

@@ -1,5 +1,5 @@
-@objc(RNMBXVectorSourceManager)
-class RNMBXVectorSourceManager: RCTViewManager {
+@objc(RNMBXVectorSourceViewManager)
+class RNMBXVectorSourceViewManager: RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true

package/ios/install.md

@@ -90,9 +90,10 @@ Add the following to your Podfile:
 
 ```ruby
 $RNMapboxMapsUseV11 = true # use 11 version
-$RNMapboxMapsVersion = '= 11.0.0-beta.3'
+$RNMapboxMapsVersion = '= 11.0.0-beta.5'
 ```
 
+If using expo managed workflow, set the "RNMapboxMapsVersion" variable and the "RNMapboxMapsUseV11" variable to `true`. See the [expo guide](/plugin/install.md)
 
 ## Troubleshooting
 

package/lib/commonjs/components/AbstractLayer.js

@@ -41,7 +41,6 @@ class AbstractLayer extends _react.default.PureComponent {
   }
   setNativeProps(props) {
     if (this.nativeLayer) {
-      var _this$nativeLayer;
       let propsToPass = props;
       if (props.style) {
         propsToPass = {
@@ -49,7 +48,7 @@ class AbstractLayer extends _react.default.PureComponent {
           reactStyle: this.getStyle(props.style)
         };
       }
-      (_this$nativeLayer = this.nativeLayer) === null || _this$nativeLayer === void 0 || _this$nativeLayer.setNativeProps(propsToPass);
+      this.nativeLayer?.setNativeProps(propsToPass);
     }
   }
 }

package/lib/commonjs/components/AbstractLayer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_filterUtils","_StyleValue","obj","__esModule","default","AbstractLayer","React","PureComponent","baseProps","props","id","existing","sourceID","reactStyle","getStyle","style","minZoomLevel","maxZoomLevel","aboveLayerID","belowLayerID","layerIndex","filter","getFilter","undefined","nativeLayer","setNativeLayer","instance","getStyleTypeFormatter","styleType","processColor","transformStyle","setNativeProps","_this$nativeLayer","propsToPass","_default","exports"],"sourceRoot":"../../../src","sources":["components/AbstractLayer.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,YAAA,GAAAF,OAAA;AAEA,IAAAG,WAAA,GAAAH,OAAA;AAAqD,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAgBrD,MAAMG,aAAa,SAGTC,cAAK,CAACC,aAAa,CAAY;EACvC,IAAIC,SAASA,CAAA,EAAc;IACzB,OAAO;MACL,GAAG,IAAI,CAACC,KAAK;MACbC,EAAE,EAAE,IAAI,CAACD,KAAK,CAACC,EAAE;MACjBC,QAAQ,EAAE,IAAI,CAACF,KAAK,CAACE,QAAQ;MAC7BC,QAAQ,EAAE,IAAI,CAACH,KAAK,CAACG,QAAQ;MAC7BC,UAAU,EAAE,IAAI,CAACC,QAAQ,CAAC,IAAI,CAACL,KAAK,CAACM,KAAK,CAAC;MAC3CC,YAAY,EAAE,IAAI,CAACP,KAAK,CAACO,YAAY;MACrCC,YAAY,EAAE,IAAI,CAACR,KAAK,CAACQ,YAAY;MACrCC,YAAY,EAAE,IAAI,CAACT,KAAK,CAACS,YAAY;MACrCC,YAAY,EAAE,IAAI,CAACV,KAAK,CAACU,YAAY;MACrCC,UAAU,EAAE,IAAI,CAACX,KAAK,CAACW,UAAU;MACjCC,MAAM,EAAE,IAAAC,sBAAS,EAAC,IAAI,CAACb,KAAK,CAACY,MAAM,CAAC;MACpCN,KAAK,EAAEQ;IACT,CAAC;EACH;EAEAC,WAAW,GAEKD,SAAS;EAEzBE,cAAc,GACZC,QAAoE,IACjE;IACH,IAAI,CAACF,WAAW,GAAGE,QAAQ;EAC7B,CAAC;EAEDC,qBAAqBA,CAACC,SAAiB,EAAE;IACvC,IAAIA,SAAS,KAAK,OAAO,EAAE;MACzB,OAAOC,yBAAY;IACrB;IACA,OAAON,SAAS;EAClB;EAEAT,QAAQA,CAACC,KAAqC,EAAE;IAC9C,OAAO,IAAAe,0BAAc,EAACf,KAAK,CAAC;EAC9B;EAEAgB,cAAcA,CAACtB,KAAiC,EAAE;IAChD,IAAI,IAAI,CAACe,WAAW,EAAE;MAAA,IAAAQ,iBAAA;MACpB,IAAIC,WAAW,GAAGxB,KAAK;MACvB,IAAIA,KAAK,CAACM,KAAK,EAAE;QACfkB,WAAW,GAAG;UACZ,GAAGxB,KAAK;UACRI,UAAU,EAAE,IAAI,CAACC,QAAQ,CAACL,KAAK,CAACM,KAA2B;QAC7D,CAAC;MACH;MACA,CAAAiB,iBAAA,OAAI,CAACR,WAAW,cAAAQ,iBAAA,eAAhBA,iBAAA,CAAkBD,cAAc,CAACE,WAAW,CAAC;IAC/C;EACF;AACF;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAA/B,OAAA,GAEcC,aAAa"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_filterUtils","_StyleValue","obj","__esModule","default","AbstractLayer","React","PureComponent","baseProps","props","id","existing","sourceID","reactStyle","getStyle","style","minZoomLevel","maxZoomLevel","aboveLayerID","belowLayerID","layerIndex","filter","getFilter","undefined","nativeLayer","setNativeLayer","instance","getStyleTypeFormatter","styleType","processColor","transformStyle","setNativeProps","propsToPass","_default","exports"],"sourceRoot":"../../../src","sources":["components/AbstractLayer.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,YAAA,GAAAF,OAAA;AAEA,IAAAG,WAAA,GAAAH,OAAA;AAAqD,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAgBrD,MAAMG,aAAa,SAGTC,cAAK,CAACC,aAAa,CAAY;EACvC,IAAIC,SAASA,CAAA,EAAc;IACzB,OAAO;MACL,GAAG,IAAI,CAACC,KAAK;MACbC,EAAE,EAAE,IAAI,CAACD,KAAK,CAACC,EAAE;MACjBC,QAAQ,EAAE,IAAI,CAACF,KAAK,CAACE,QAAQ;MAC7BC,QAAQ,EAAE,IAAI,CAACH,KAAK,CAACG,QAAQ;MAC7BC,UAAU,EAAE,IAAI,CAACC,QAAQ,CAAC,IAAI,CAACL,KAAK,CAACM,KAAK,CAAC;MAC3CC,YAAY,EAAE,IAAI,CAACP,KAAK,CAACO,YAAY;MACrCC,YAAY,EAAE,IAAI,CAACR,KAAK,CAACQ,YAAY;MACrCC,YAAY,EAAE,IAAI,CAACT,KAAK,CAACS,YAAY;MACrCC,YAAY,EAAE,IAAI,CAACV,KAAK,CAACU,YAAY;MACrCC,UAAU,EAAE,IAAI,CAACX,KAAK,CAACW,UAAU;MACjCC,MAAM,EAAE,IAAAC,sBAAS,EAAC,IAAI,CAACb,KAAK,CAACY,MAAM,CAAC;MACpCN,KAAK,EAAEQ;IACT,CAAC;EACH;EAEAC,WAAW,GAEKD,SAAS;EAEzBE,cAAc,GACZC,QAAoE,IACjE;IACH,IAAI,CAACF,WAAW,GAAGE,QAAQ;EAC7B,CAAC;EAEDC,qBAAqBA,CAACC,SAAiB,EAAE;IACvC,IAAIA,SAAS,KAAK,OAAO,EAAE;MACzB,OAAOC,yBAAY;IACrB;IACA,OAAON,SAAS;EAClB;EAEAT,QAAQA,CAACC,KAAqC,EAAE;IAC9C,OAAO,IAAAe,0BAAc,EAACf,KAAK,CAAC;EAC9B;EAEAgB,cAAcA,CAACtB,KAAiC,EAAE;IAChD,IAAI,IAAI,CAACe,WAAW,EAAE;MACpB,IAAIQ,WAAW,GAAGvB,KAAK;MACvB,IAAIA,KAAK,CAACM,KAAK,EAAE;QACfiB,WAAW,GAAG;UACZ,GAAGvB,KAAK;UACRI,UAAU,EAAE,IAAI,CAACC,QAAQ,CAACL,KAAK,CAACM,KAA2B;QAC7D,CAAC;MACH;MACA,IAAI,CAACS,WAAW,EAAEO,cAAc,CAACC,WAAW,CAAC;IAC/C;EACF;AACF;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAA9B,OAAA,GAEcC,aAAa"}

package/lib/commonjs/components/Annotation.js

@@ -53,10 +53,9 @@ class Annotation extends _react.default.Component {
     }
   }
   _getShapeFromProps() {
-    var _props$coordinates, _props$coordinates2;
     let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const lng = ((_props$coordinates = props.coordinates) === null || _props$coordinates === void 0 ? void 0 : _props$coordinates[0]) || 0;
-    const lat = ((_props$coordinates2 = props.coordinates) === null || _props$coordinates2 === void 0 ? void 0 : _props$coordinates2[1]) || 0;
+    const lng = props.coordinates?.[0] || 0;
+    const lat = props.coordinates?.[1] || 0;
     return {
       type: 'Point',
       coordinates: [lng, lat]

package/lib/commonjs/components/Annotation.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_Animated","_classes","_SymbolLayer","obj","__esModule","default","Annotation","React","Component","defaultProps","animated","animationDuration","animationEasingFunction","Easing","linear","constructor","props","shape","_getShapeFromProps","state","AnimatedPoint","onPress","bind","componentDidUpdate","prevProps","Array","isArray","coordinates","setState","haveCoordinatesChanged","stopAnimation","timing","easing","duration","start","event","_props$coordinates","_props$coordinates2","arguments","length","undefined","lng","lat","type","symbolStyle","icon","Object","assign","style","iconImage","render","children","push","createElement","SymbolLayer","id","ShapeSource","_default","exports"],"sourceRoot":"../../../src","sources":["components/Annotation.tsx"],"mappings":"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"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_Animated","_classes","_SymbolLayer","obj","__esModule","default","Annotation","React","Component","defaultProps","animated","animationDuration","animationEasingFunction","Easing","linear","constructor","props","shape","_getShapeFromProps","state","AnimatedPoint","onPress","bind","componentDidUpdate","prevProps","Array","isArray","coordinates","setState","haveCoordinatesChanged","stopAnimation","timing","easing","duration","start","event","arguments","length","undefined","lng","lat","type","symbolStyle","icon","Object","assign","style","iconImage","render","children","push","createElement","SymbolLayer","id","ShapeSource","_default","exports"],"sourceRoot":"../../../src","sources":["components/Annotation.tsx"],"mappings":"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"}

package/lib/commonjs/components/Camera.js

@@ -85,7 +85,6 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0,
   } = props;
   const nativeCamera = (0, _react.useRef)(null);
   const buildNativeStop = (0, _react.useCallback)(function (stop) {
-    var _stop$padding, _stop$bounds, _stop$padding2, _stop$bounds2, _stop$padding3, _stop$bounds3, _stop$padding4, _stop$bounds4;
     let ignoreFollowUserLocation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     stop = {
       ...stop,
@@ -110,19 +109,19 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0,
       } = stop.bounds;
       _nativeStop.bounds = JSON.stringify((0, _geoUtils.makeLatLngBounds)(ne, sw));
     }
-    const paddingTop = ((_stop$padding = stop.padding) === null || _stop$padding === void 0 ? void 0 : _stop$padding.paddingTop) ?? ((_stop$bounds = stop.bounds) === null || _stop$bounds === void 0 ? void 0 : _stop$bounds.paddingTop);
+    const paddingTop = stop.padding?.paddingTop ?? stop.bounds?.paddingTop;
     if (paddingTop !== undefined) {
       _nativeStop.paddingTop = paddingTop;
     }
-    const paddingRight = ((_stop$padding2 = stop.padding) === null || _stop$padding2 === void 0 ? void 0 : _stop$padding2.paddingRight) ?? ((_stop$bounds2 = stop.bounds) === null || _stop$bounds2 === void 0 ? void 0 : _stop$bounds2.paddingRight);
+    const paddingRight = stop.padding?.paddingRight ?? stop.bounds?.paddingRight;
     if (paddingRight !== undefined) {
       _nativeStop.paddingRight = paddingRight;
     }
-    const paddingBottom = ((_stop$padding3 = stop.padding) === null || _stop$padding3 === void 0 ? void 0 : _stop$padding3.paddingBottom) ?? ((_stop$bounds3 = stop.bounds) === null || _stop$bounds3 === void 0 ? void 0 : _stop$bounds3.paddingBottom);
+    const paddingBottom = stop.padding?.paddingBottom ?? stop.bounds?.paddingBottom;
     if (paddingBottom != undefined) {
       _nativeStop.paddingBottom = paddingBottom;
     }
-    const paddingLeft = ((_stop$padding4 = stop.padding) === null || _stop$padding4 === void 0 ? void 0 : _stop$padding4.paddingLeft) ?? ((_stop$bounds4 = stop.bounds) === null || _stop$bounds4 === void 0 ? void 0 : _stop$bounds4.paddingLeft);
+    const paddingLeft = stop.padding?.paddingLeft ?? stop.bounds?.paddingLeft;
     if (paddingLeft !== undefined) {
       _nativeStop.paddingLeft = paddingLeft;
     }
@@ -160,7 +159,7 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0,
     });
   }, [centerCoordinate, bounds, heading, pitch, zoomLevel, padding, animationDuration, animationMode, buildNativeStop]);
   const nativeMaxBounds = (0, _react.useMemo)(() => {
-    if (!(maxBounds !== null && maxBounds !== void 0 && maxBounds.ne) || !(maxBounds !== null && maxBounds !== void 0 && maxBounds.sw)) {
+    if (!maxBounds?.ne || !maxBounds?.sw) {
       return null;
     }
     return JSON.stringify((0, _geoUtils.makeLatLngBounds)(maxBounds.ne, maxBounds.sw));
@@ -180,13 +179,12 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0,
       };
     if (config.type === 'CameraStops') {
       for (const _stop of config.stops) {
-        var _nativeCamera$current;
         let _nativeStops = [];
         const _nativeStop = buildNativeStop(_stop);
         if (_nativeStop) {
           _nativeStops = [..._nativeStops, _nativeStop];
         }
-        (_nativeCamera$current = nativeCamera.current) === null || _nativeCamera$current === void 0 || _nativeCamera$current.setNativeProps({
+        nativeCamera.current?.setNativeProps({
           stop: {
             stops: _nativeStops
           }
@@ -195,8 +193,7 @@ const Camera = exports.Camera = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0,
     } else if (config.type === 'CameraStop') {
       const _nativeStop = buildNativeStop(config);
       if (_nativeStop) {
-        var _nativeCamera$current2;
-        (_nativeCamera$current2 = nativeCamera.current) === null || _nativeCamera$current2 === void 0 || _nativeCamera$current2.setNativeProps({
+        nativeCamera.current?.setNativeProps({
           stop: _nativeStop
         });
       }