@rnmapbox/maps 10.1.27 → 10.1.28

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/NativeMapViewModule.kt

@@ -152,14 +152,6 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
         }
     }
 
-    public fun setHandledMapChangedEvents(
-        viewRef: Double?,
-        events: ReadableArray,
-        promise: Promise
-    ) {
-        setHandledMapChangedEvents(viewRef?.toInt(), events, promise)
-    }
-
     override fun clearData(viewRef: ViewRefTag?, promise: Promise) {
         withMapViewOnUIThread(viewRef, promise) {
             it.clearData(createCommandResponse(promise))

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceModule.kt

@@ -44,8 +44,8 @@ class RNMBXShapeSourceModule(reactContext: ReactApplicationContext?, private val
     override fun getClusterLeaves(
         viewRef: ViewRefTag?,
         featureJSON: String,
-        number: Int,
-        offset: Int,
+        number: Double,
+        offset: Double,
         promise: Promise
     ) {
         withShapeSourceOnUIThread(viewRef, promise) {

package/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt

@@ -16,7 +16,7 @@ data class ViewTagWaiter<V>(
 
 const val LOG_TAG = "ViewTagResolver"
 
-typealias ViewRefTag = Int
+typealias ViewRefTag = Double
 // see https://github.com/rnmapbox/maps/pull/3074
 open class ViewTagResolver(val context: ReactApplicationContext) {
     private val createdViews: HashSet<Int> = hashSetOf<Int>()

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeMapViewModuleSpec.java

@@ -37,53 +37,53 @@ public abstract class NativeMapViewModuleSpec extends ReactContextBaseJavaModule
 
   @ReactMethod
   @DoNotStrip
-  public abstract void takeSnap(@Nullable Integer viewRef, boolean writeToDisk, Promise promise);
+  public abstract void takeSnap(@Nullable Double viewRef, boolean writeToDisk, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void queryTerrainElevation(@Nullable Integer viewRef, ReadableArray coordinates, Promise promise);
+  public abstract void queryTerrainElevation(@Nullable Double viewRef, ReadableArray coordinates, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setSourceVisibility(@Nullable Integer viewRef, boolean visible, String sourceId, String sourceLayerId, Promise promise);
+  public abstract void setSourceVisibility(@Nullable Double viewRef, boolean visible, String sourceId, String sourceLayerId, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getCenter(@Nullable Integer viewRef, Promise promise);
+  public abstract void getCenter(@Nullable Double viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getCoordinateFromView(@Nullable Integer viewRef, ReadableArray atPoint, Promise promise);
+  public abstract void getCoordinateFromView(@Nullable Double viewRef, ReadableArray atPoint, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getPointInView(@Nullable Integer viewRef, ReadableArray atCoordinate, Promise promise);
+  public abstract void getPointInView(@Nullable Double viewRef, ReadableArray atCoordinate, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getZoom(@Nullable Integer viewRef, Promise promise);
+  public abstract void getZoom(@Nullable Double viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getVisibleBounds(@Nullable Integer viewRef, Promise promise);
+  public abstract void getVisibleBounds(@Nullable Double viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void queryRenderedFeaturesAtPoint(@Nullable Integer viewRef, ReadableArray atPoint, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
+  public abstract void queryRenderedFeaturesAtPoint(@Nullable Double viewRef, ReadableArray atPoint, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void queryRenderedFeaturesInRect(@Nullable Integer viewRef, ReadableArray withBBox, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
+  public abstract void queryRenderedFeaturesInRect(@Nullable Double viewRef, ReadableArray withBBox, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setHandledMapChangedEvents(@Nullable Integer viewRef, ReadableArray events, Promise promise);
+  public abstract void setHandledMapChangedEvents(@Nullable Double viewRef, ReadableArray events, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void clearData(@Nullable Integer viewRef, Promise promise);
+  public abstract void clearData(@Nullable Double viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void querySourceFeatures(@Nullable Integer viewRef, String sourceId, ReadableArray withFilter, ReadableArray withSourceLayerIDs, Promise promise);
+  public abstract void querySourceFeatures(@Nullable Double viewRef, String sourceId, ReadableArray withFilter, ReadableArray withSourceLayerIDs, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXCameraModuleSpec.java

@@ -37,5 +37,5 @@ public abstract class NativeRNMBXCameraModuleSpec extends ReactContextBaseJavaMo
 
   @ReactMethod
   @DoNotStrip
-  public abstract void updateCameraStop(@Nullable Integer viewRef, ReadableMap stop, Promise promise);
+  public abstract void updateCameraStop(@Nullable Double viewRef, ReadableMap stop, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec.java

@@ -36,17 +36,17 @@ public abstract class NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec extend
 
   @ReactMethod
   @DoNotStrip
-  public abstract void create(int tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
+  public abstract void create(double tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setLineString(int tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
+  public abstract void setLineString(double tag, ReadableArray coordinates, double startOffset, double endOffset, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setStartOffset(int tag, double offset, double duration, Promise promise);
+  public abstract void setStartOffset(double tag, double offset, double duration, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setEndOffset(int tag, double offset, double duration, Promise promise);
+  public abstract void setEndOffset(double tag, double offset, double duration, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXImageModuleSpec.java

@@ -36,5 +36,5 @@ public abstract class NativeRNMBXImageModuleSpec extends ReactContextBaseJavaMod
 
   @ReactMethod
   @DoNotStrip
-  public abstract void refresh(@Nullable Integer viewRef, Promise promise);
+  public abstract void refresh(@Nullable Double viewRef, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXMovePointShapeAnimatorModuleSpec.java

@@ -36,9 +36,9 @@ public abstract class NativeRNMBXMovePointShapeAnimatorModuleSpec extends ReactC
 
   @ReactMethod
   @DoNotStrip
-  public abstract void create(int tag, ReadableArray coordinate, Promise promise);
+  public abstract void create(double tag, ReadableArray coordinate, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void moveTo(int tag, ReadableArray coordinate, double duration, Promise promise);
+  public abstract void moveTo(double tag, ReadableArray coordinate, double duration, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXPointAnnotationModuleSpec.java

@@ -36,5 +36,5 @@ public abstract class NativeRNMBXPointAnnotationModuleSpec extends ReactContextB
 
   @ReactMethod
   @DoNotStrip
-  public abstract void refresh(@Nullable Integer viewRef, Promise promise);
+  public abstract void refresh(@Nullable Double viewRef, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXShapeSourceModuleSpec.java

@@ -36,13 +36,13 @@ public abstract class NativeRNMBXShapeSourceModuleSpec extends ReactContextBaseJ
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getClusterExpansionZoom(@Nullable Integer viewRef, String featureJSON, Promise promise);
+  public abstract void getClusterExpansionZoom(@Nullable Double viewRef, String featureJSON, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getClusterLeaves(@Nullable Integer viewRef, String featureJSON, int number, int offset, Promise promise);
+  public abstract void getClusterLeaves(@Nullable Double viewRef, String featureJSON, double number, double offset, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getClusterChildren(@Nullable Integer viewRef, String featureJSON, Promise promise);
+  public abstract void getClusterChildren(@Nullable Double viewRef, String featureJSON, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXTileStoreModuleSpec.java

@@ -41,5 +41,5 @@ public abstract class NativeRNMBXTileStoreModuleSpec extends ReactContextBaseJav
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setOption(int tag, String key, String domain, ReadableMap value, Promise promise);
+  public abstract void setOption(double tag, String key, String domain, ReadableMap value, Promise promise);
 }

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXViewportModuleSpec.java

@@ -37,13 +37,13 @@ public abstract class NativeRNMBXViewportModuleSpec extends ReactContextBaseJava
 
   @ReactMethod
   @DoNotStrip
-  public abstract void getState(@Nullable Integer viewRef, Promise promise);
+  public abstract void getState(@Nullable Double viewRef, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void transitionTo(@Nullable Integer viewRef, ReadableMap state, ReadableMap transition, Promise promise);
+  public abstract void transitionTo(@Nullable Double viewRef, ReadableMap state, ReadableMap transition, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void idle(@Nullable Integer viewRef, Promise promise);
+  public abstract void idle(@Nullable Double viewRef, Promise promise);
 }

package/ios/RNMBX/Extensions/Array+asExpressions.swift

@@ -1,7 +1,7 @@
 import MapboxMaps
 
 internal extension Array where Element == Any {
-  func asExpression() throws -> Expression? {
+  func asExpression() throws -> MapboxMaps.Expression? {
     let filter = self
     if filter.count > 0 {
       let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)

package/ios/RNMBX/RNMBXFabricPropConvert.h

@@ -2,7 +2,7 @@
 
 /**
  *
- * 1. Requirest the following prelude
+ * 1. Requires the following prelude
  * const auto &oldViewProps = static_cast<const RNMBXNativeUserLocationProps &>(*oldProps);
  * const auto &newViewProps = static_cast<const RNMBXNativeUserLocationProps &>(*props);
  *
@@ -12,6 +12,7 @@
 NSNumber* RNMBXPropConvert_Optional_BOOL_NSNumber(const folly::dynamic &dyn, NSString* propertyName);
 BOOL RNMBXPropConvert_Optional_BOOL(const folly::dynamic &dyn, NSString* propertyName);
 NSString* RNMBXPropConvert_Optional_NSString(const folly::dynamic &dyn, NSString* propertyName);
+NSNumber* RNMBXPropConvert_Optional_NSNumber(const folly::dynamic &dyn, NSString* propertyName);
 id RNMBXPropConvert_Optional_ExpressionDouble(const folly::dynamic &dyn, NSString* propertyName);
 BOOL RNMBXPropConvert_BOOL(const folly::dynamic &dyn, NSString* propertyName);
 NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn, NSString* propertyName);
@@ -21,16 +22,23 @@ NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn,
     _view.name = RNMBXPropConvert_Optional_BOOL_NSNumber(newViewProps.name, @#name); \
   }
 
-#define RNMBX_OPTIONAL_PROP_BOOL(name) \
+#define RNMBX_REMAP_OPTIONAL_PROP_BOOL(name, viewName) \
   if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
-    _view.name = RNMBXPropConvert_Optional_BOOL(newViewProps.name, @#name); \
+    _view.viewName = RNMBXPropConvert_Optional_BOOL(newViewProps.name, @#name); \
   }
 
+#define RNMBX_OPTIONAL_PROP_BOOL(name) RNMBX_REMAP_OPTIONAL_PROP_BOOL(name, name)
+
 #define RNMBX_OPTIONAL_PROP_NSString(name) \
   if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
     _view.name = RNMBXPropConvert_Optional_NSString(newViewProps.name, @#name); \
   }
 
+#define RNMBX_OPTIONAL_PROP_NSNumber(name) \
+  if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
+    _view.name = RNMBXPropConvert_Optional_NSNumber(newViewProps.name, @#name); \
+  }
+
 #define RNMBX_OPTIONAL_PROP_ExpressionDouble(name) \
   if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
     _view.name = RNMBXPropConvert_Optional_ExpressionDouble(newViewProps.name, @#name); \

package/ios/RNMBX/RNMBXFabricPropConvert.mm

@@ -55,7 +55,7 @@ BOOL RNMBXPropConvert_Optional_BOOL(const folly::dynamic &dyn, NSString* propert
 }
 
 NSString* RNMBXPropConvert_Optional_NSString(const folly::dynamic &dyn, NSString* propertyName) {
-    switch (dyn.type()) {
+  switch (dyn.type()) {
     case folly::dynamic::STRING:
       return [NSString stringWithCString:dyn.getString().c_str() encoding:NSUTF8StringEncoding];
     case folly::dynamic::NULLT:
@@ -71,6 +71,26 @@ NSString* RNMBXPropConvert_Optional_NSString(const folly::dynamic &dyn, NSString
   }
 }
 
+NSNumber* RNMBXPropConvert_Optional_NSNumber(const folly::dynamic &dyn, NSString* propertyName) {
+  switch (dyn.type()) {
+    case folly::dynamic::INT64:
+      return @(dyn.getInt());
+    case folly::dynamic::DOUBLE:
+      return @(dyn.getDouble());
+    case folly::dynamic::NULLT:
+      return nil;
+    default:
+      std::stringstream ss;
+      ss << dyn;
+      [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be a number or nil but was: %s",
+                          propertyName,
+                          ss.str().c_str()
+                         ]];
+      return nil;
+  }
+}
+
+
 
 id RNMBXPropConvert_ID(const folly::dynamic &dyn)
 {

package/ios/RNMBX/RNMBXLayer.swift

@@ -34,13 +34,13 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       }
     }
   }
-  
+
   var style: Style? = nil
 
   @objc public var filter : Array<Any>? = nil {
     didSet { optionsChanged() }
   }
-  
+
   @objc public var id: String! = nil {
     willSet {
       if id != nil && newValue != id {
@@ -58,7 +58,7 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
   @objc public var sourceID: String? = nil {
     didSet { optionsChanged() }
   }
-  
+
   @objc public var minZoomLevel : NSNumber? = nil {
     didSet { optionsChanged() }
   }
@@ -85,7 +85,7 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       }
     }
   }
-  
+
   @objc public var layerIndex : NSNumber? = nil {
     didSet {
       if let layerIndex = layerIndex {
@@ -95,13 +95,13 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       }
     }
   }
-  
+
   @objc public var slot: String? = nil {
     didSet {
       optionsChanged()
     }
   }
-  
+
   @objc weak var map: RNMBXMapView? = nil
 
   deinit {
@@ -110,9 +110,9 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       self.waitingForID = nil
     }
   }
-  
+
   var styleLayer: Layer? = nil
-  
+
   /// wearther we inserted the layer or we're referring to an existing layer
   var existingLayer = false
 
@@ -120,21 +120,21 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
   public func waitForStyleLoad() -> Bool {
     return true
   }
-  
+
   func removeAndReaddLayer() {
     if let map = map, let style = style {
       self.removeFromMap(style)
       self.addToMap(map, style:style)
     }
   }
-   
+
   /**
     addStyles - adds the styles defined by reactStyle to the current layer, but does not apply to the style to the map style
    */
   func addStyles() {
     fatalError("Subclasses need to implement the `addStyles()` method.")
   }
-  
+
   func addStylesAndUpdate() {
     guard styleLayer != nil else {
       return
@@ -148,15 +148,15 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       }
     }
   }
-  
+
   func makeLayer(style: Style) throws -> Layer {
     fatalError("Subclasses need to implement the `makeLayer(style:)` method.")
   }
-  
+
   func findLayer(style: Style, id: String) throws -> Layer {
     return try style.layer(withId: id)
   }
-  
+
   func layerType() -> Layer.Type {
     fatalError("Subclasses need to implement the `layerType` method. \(self)")
   }
@@ -188,7 +188,7 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       return .default
     }
   }
-  
+
   func inserLayer(_ map: RNMBXMapView) {
     if self.style == nil {
       print("inserLayer but style is nil")
@@ -205,7 +205,7 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       loggedApply(style: style)
     }
   }
-  
+
   func layerWithSourceID<T : Source>(in style: Style) throws -> T  {
     let result = try style.source(withId: self.sourceID!, type: T.self)
     return result
@@ -217,9 +217,9 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
   }
 
   func addedToMap() {
-    
+
   }
-  
+
   public func addToMap(_ map: RNMBXMapView, style: Style) {
     self.map = map
     self.style = style
@@ -239,7 +239,7 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     } catch {
       Logger.log(level: .error, message: "find/makeLayer failed for layer id=\(id)", error: error)
     }
-    
+
     guard self.styleLayer != nil else {
       Logger.log(level: .error, message: "find/makeLayer retuned nil for layer id=\(id)")
       return
@@ -253,11 +253,11 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     }
     addedToMap()
   }
-  
+
   func removeFromMap(_ map: RNMBXMapView, style: Style) {
     removeFromMap(style)
   }
-  
+
   #if RNMBX_11
   func _toSlot(_ slot: String) -> Slot? {
     switch slot {
@@ -272,36 +272,36 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     }
   }
   #endif
-  
+
   func setBaseOptions<T: Layer>(_ layer: inout T) {
     if let minZoom = minZoomLevel {
       layer.minZoom = minZoom.doubleValue
     }
-    
+
     if let maxZoom = maxZoomLevel {
       layer.maxZoom = maxZoom.doubleValue
     }
-    
+
     #if RNMBX_11
     if let slot = slot {
       layer.slot = _toSlot(slot)
     }
     #endif
   }
-  
+
   func setOptions(_ layer: inout Layer) {
     setBaseOptions(&layer)
     #if !RNMBX_11
     if let sourceLayerID = sourceLayerID {
       layer.sourceLayer = sourceLayerID
     }
-    
+
     if let sourceID = sourceID {
       if !(existingLayer && sourceID == DEFAULT_SOURCE_ID) && hasSource() {
         layer.source = sourceID
       }
     }
-    
+
     if let filter = filter, filter.count > 0 {
       do {
         let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)
@@ -313,7 +313,7 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     }
     #endif
   }
-  
+
   private func optionsChanged() {
     if let style = self.style, self.styleLayer != nil {
       self.setOptions(&self.styleLayer!)
@@ -325,7 +325,7 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     removeFromMap(map.mapboxMap.style)
     return true
   }
-  
+
   private func removeFromMap(_ style: Style) {
     if let waitingForID = waitingForID {
       Logger.log(level:.warn, message: "RNMBXLayer.removeFromMap - unmetPositionDependency: layer: \(optional: id) was waiting for layer: \(optional: waitingForID) but it hasn't added to map")
@@ -337,7 +337,7 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       Logger.log(level: .error, message: "RNMBXLayer.removeFromMap: removing layer failed for layer \(optional: id): \(error.localizedDescription)")
     }
   }
-  
+
   func insert(_ style: Style, layerPosition: LayerPosition, onInsert: (() -> Void)? = nil) {
     var idToWaitFor: String?
     switch layerPosition {
@@ -350,8 +350,8 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     default:
       idToWaitFor = nil
     }
-    
-    
+
+
     if let idToWaitFor = idToWaitFor {
       self.waitingForID = idToWaitFor
       map!.waitForLayerWithID(idToWaitFor) { _ in
@@ -362,12 +362,12 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       self.attemptInsert(style, layerPosition: layerPosition, onInsert: onInsert)
     }
   }
-  
+
   private func attemptInsert(_ style: Style, layerPosition: LayerPosition, onInsert: (() -> Void)? = nil) {
     guard let styleLayer = self.styleLayer else {
       return
     }
-    
+
     do {
       try style.addLayer(styleLayer, layerPosition: layerPosition)
       onInsert?()
@@ -375,7 +375,7 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       Logger.log(level: .error, message: "inserting layer failed at position \(layerPosition): \(error.localizedDescription)")
     }
   }
-  
+
   internal func hasSource() -> Bool {
     return true
   }
@@ -385,10 +385,10 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
 protocol LayerWithSource : Layer {
   var source: String? { get set }
   var sourceLayer: String? { get set }
-  var filter: Expression? { get set}
+  var filter: MapboxMaps.Expression? { get set}
 }
 #else
 protocol LayerWithSource : Layer {
-  
+
 }
 #endif

package/ios/RNMBX/RNMBXMapViewComponentView.mm

@@ -181,10 +181,7 @@ using namespace facebook::react;
         _view.reactCompassImage = compassImage;
     }
 
-    id scaleBarEnabled = RNMBXConvertFollyDynamicToId(newViewProps.scaleBarEnabled);
-    if (scaleBarEnabled != nil) {
-        _view.reactScaleBarEnabled = scaleBarEnabled;
-    }
+    RNMBX_REMAP_OPTIONAL_PROP_BOOL(scaleBarEnabled, reactScaleBarEnabled)
 
     id scaleBarPosition = RNMBXConvertFollyDynamicToId(newViewProps.scaleBarPosition);
     if (scaleBarPosition != nil) {

package/ios/RNMBX/RNMBXShapeSourceComponentView.mm

@@ -2,6 +2,7 @@
 
 #import "RNMBXShapeSourceComponentView.h"
 #import "RNMBXFabricHelpers.h"
+#import "RNMBXFabricPropConvert.h"
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
@@ -85,59 +86,23 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = static_cast<const RNMBXShapeSourceProps &>(*props);
-    id idx = RNMBXConvertFollyDynamicToId(newProps.id);
-    if (idx != nil) {
-        _view.id = idx;
-    }
-    id existing = RNMBXConvertFollyDynamicToId(newProps.existing);
-    if (existing != nil) {
-        _view.existing = existing;
-    }
-    id shape = RNMBXConvertFollyDynamicToId(newProps.shape);
-    if (shape != nil) {
-        _view.shape = shape;
-    }
-    id cluster = RNMBXConvertFollyDynamicToId(newProps.cluster);
-    if (cluster != nil) {
-        _view.cluster = cluster;
-    }
-    id clusterRadius = RNMBXConvertFollyDynamicToId(newProps.clusterRadius);
-    if (clusterRadius != nil) {
-        _view.clusterRadius = clusterRadius;
-    }
-    id clusterMaxZoomLevel = RNMBXConvertFollyDynamicToId(newProps.clusterMaxZoomLevel);
-    if (clusterMaxZoomLevel != nil) {
-        _view.clusterMaxZoomLevel = clusterMaxZoomLevel;
-    }
-    id clusterProperties = RNMBXConvertFollyDynamicToId(newProps.clusterProperties);
-    if (clusterProperties != nil) {
-        _view.clusterProperties = clusterProperties;
-    }
-    id maxZoomLevel = RNMBXConvertFollyDynamicToId(newProps.maxZoomLevel);
-    if (maxZoomLevel != nil) {
-        _view.maxZoomLevel = maxZoomLevel;
-    }
-    id buffer = RNMBXConvertFollyDynamicToId(newProps.buffer);
-    if (buffer != nil) {
-        _view.buffer = buffer;
-    }
-    id tolerance = RNMBXConvertFollyDynamicToId(newProps.tolerance);
-    if (tolerance != nil) {
-        _view.tolerance = tolerance;
-    }
-    id lineMetrics = RNMBXConvertFollyDynamicToId(newProps.lineMetrics);
-    if (lineMetrics != nil) {
-        _view.lineMetrics = lineMetrics;
-    }
-    id hasPressListener = RNMBXConvertFollyDynamicToId(newProps.hasPressListener);
-    if (hasPressListener != nil) {
-        _view.hasPressListener = hasPressListener;
-    }
-    id hitbox = RNMBXConvertFollyDynamicToId(newProps.hitbox);
-    if (hitbox != nil) {
-        _view.hitbox = hitbox;
-    }
+  const auto &oldViewProps = static_cast<const RNMBXShapeSourceProps &>(*_props);
+  const auto &newViewProps = static_cast<const RNMBXShapeSourceProps &>(*props);
+
+  RNMBX_OPTIONAL_PROP_NSString(id)
+  RNMBX_OPTIONAL_PROP_BOOL(existing)
+  RNMBX_OPTIONAL_PROP_NSString(shape)
+  RNMBX_OPTIONAL_PROP_NSNumber(cluster)
+  RNMBX_OPTIONAL_PROP_NSNumber(clusterRadius)
+  RNMBX_OPTIONAL_PROP_NSNumber(clusterMaxZoomLevel)
+  RNMBX_OPTIONAL_PROP_NSDictionary(clusterProperties)
+  RNMBX_OPTIONAL_PROP_NSNumber(maxZoomLevel)
+  RNMBX_OPTIONAL_PROP_NSNumber(buffer)
+  RNMBX_OPTIONAL_PROP_NSNumber(tolerance)
+  RNMBX_OPTIONAL_PROP_NSNumber(lineMetrics)
+  RNMBX_OPTIONAL_PROP_BOOL(hasPressListener)
+  RNMBX_OPTIONAL_PROP_NSDictionary(hitbox)
+  
   [super updateProps:props oldProps:oldProps];
 }