@rnmapbox/maps 10.1.31 → 10.1.32-rc.0

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

@@ -5,6 +5,8 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXRasterSourceManagerInterface
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.eventMapOf
 import javax.annotation.Nonnull
 
 class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext) :
@@ -26,7 +28,10 @@ class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext)
     }
 
     override fun customEvents(): Map<String, String>? {
-        return null
+        return eventMapOf(
+            EventKeys.RASTER_SOURCE_LAYER_CLICK to "onMapboxRasterSourcePress",
+            EventKeys.MAP_ANDROID_CALLBACK to "onAndroidCallback"
+        )
     }
 
     companion object {

package/android/src/main/java/com/rnmapbox/rnmbx/events/constants/EventKeys.kt

@@ -4,35 +4,37 @@ private fun ns(name: String): String {
     val namespace = "rct.mapbox"
     return String.format("%s.%s", namespace, name)
 }
+
 enum class EventKeys(val value: String) {
     // map events
-    MAP_CLICK(ns("map.press")),
-    MAP_LONG_CLICK(ns("map.longpress")),
-    MAP_ONCHANGE(ns("map.change")),
-    MAP_ON_LOCATION_CHANGE(ns("map.location.change")),
-    MAP_ANDROID_CALLBACK(ns("map.androidcallback")),
-    MAP_USER_TRACKING_MODE_CHANGE(ns("map.usertrackingmodechange")),
+    MAP_CLICK("topPress"),
+    MAP_LONG_CLICK("topLongPress"),
+    MAP_ONCHANGE("topMapChange"),
+    MAP_ON_LOCATION_CHANGE("topLocationChange"),
+    MAP_ANDROID_CALLBACK("topAndroidCallback"),
+    MAP_USER_TRACKING_MODE_CHANGE("topUserTrackingModeChange"),
 
     // point annotation events
-    POINT_ANNOTATION_SELECTED(ns("pointannotation.selected")),
-    POINT_ANNOTATION_DESELECTED(ns("pointannotation.deselected")),
-    POINT_ANNOTATION_DRAG_START(ns("pointannotation.dragstart")),
-    POINT_ANNOTATION_DRAG(ns("pointannotation.drag")),
-    POINT_ANNOTATION_DRAG_END(ns("pointannotation.dragend")),
+    POINT_ANNOTATION_SELECTED("topMapboxPointAnnotationSelected"),
+    POINT_ANNOTATION_DESELECTED("topMapboxPointAnnotationDeselected"),
+    POINT_ANNOTATION_DRAG_START("topMapboxPointAnnotationDragStart"),
+    POINT_ANNOTATION_DRAG("topMapboxPointAnnotationDrag"),
+    POINT_ANNOTATION_DRAG_END("topMapboxPointAnnotationDragEnd"),
 
     // source events
-    SHAPE_SOURCE_LAYER_CLICK(ns("shapesource.layer.pressed")),
-    VECTOR_SOURCE_LAYER_CLICK(ns("vectorsource.layer.pressed")),
-    RASTER_SOURCE_LAYER_CLICK(ns("rastersource.layer.pressed")),
+    SHAPE_SOURCE_LAYER_CLICK("topMapboxShapeSourcePress"),
+    VECTOR_SOURCE_LAYER_CLICK("topMapboxVectorSourcePress"),
+    RASTER_SOURCE_LAYER_CLICK("topMapboxRasterSourcePress"),
 
     // images event
-    IMAGES_MISSING(ns("images.missing")),
+    IMAGES_MISSING("topImageMissing"),
 
     // location events
+    // TODO: not sure about this one since it is not registered anywhere
     USER_LOCATION_UPDATE(ns("user.location.update")),
 
     // viewport events
-    VIEWPORT_STATUS_CHANGE(ns("viewport.statuschange"))
+    VIEWPORT_STATUS_CHANGE("topStatusChanged")
 }
 
 fun eventMapOf(vararg values: Pair<EventKeys, String>): Map<String, String> {

package/ios/RNMBX/RNMBXMapView.swift

@@ -1416,6 +1416,32 @@ extension RNMBXMapView {
   }
 }
 
+typealias LayerSourceDetails = (source: String?, sourceLayer: String?)
+
+#if RNMBX_11
+func getLayerSourceDetails(layer: (any Layer)?) -> LayerSourceDetails? {
+    if let circleLayer = layer as? CircleLayer {
+        return (circleLayer.source, circleLayer.sourceLayer)
+    } else if let fillExtrusionLayer = layer as? FillExtrusionLayer {
+        return (fillExtrusionLayer.source, fillExtrusionLayer.sourceLayer)
+    } else if let fillLayer = layer as? FillLayer {
+        return (fillLayer.source, fillLayer.sourceLayer)
+    } else if let heatmapLayer = layer as? HeatmapLayer {
+        return (heatmapLayer.source, heatmapLayer.sourceLayer)
+    } else if let hillshadeLayer = layer as? HillshadeLayer {
+        return (hillshadeLayer.source, hillshadeLayer.sourceLayer)
+    } else if let lineLayer = layer as? LineLayer {
+        return (lineLayer.source, lineLayer.sourceLayer)
+    } else if let rasterLayer = layer as? RasterLayer {
+        return (rasterLayer.source, rasterLayer.sourceLayer)
+    } else if let symbolLayer = layer as? SymbolLayer {
+        return (symbolLayer.source, symbolLayer.sourceLayer)
+    } else {
+        return nil
+    }
+}
+#endif
+
 extension RNMBXMapView {
   func setSourceVisibility(_ visible: Bool, sourceId: String, sourceLayerId: String?) -> Void {
     let style = self.mapboxMap.style
@@ -1424,14 +1450,18 @@ extension RNMBXMapView {
       let layer = logged("setSourceVisibility.layer", info: { "\(layerInfo.id)" }) {
         try style.layer(withId: layerInfo.id)
       }
+
       #if RNMBX_11
-      // RNMBX_11_TODO
+        let sourceDetails = getLayerSourceDetails(layer: layer)
       #else
-      if let layer = layer {
-        if layer.source == sourceId {
+        let sourceDetails: LayerSourceDetails? = (source: layer?.source, sourceLayer: layer?.sourceLayer)
+      #endif
+
+      if let layer = layer, let sourceDetails = sourceDetails {
+        if sourceDetails.source == sourceId {
           var good = true
           if let sourceLayerId = sourceLayerId {
-            if sourceLayerId != layer.sourceLayer {
+            if sourceLayerId != sourceDetails.sourceLayer {
               good = false
             }
           }
@@ -1444,7 +1474,6 @@ extension RNMBXMapView {
           }
         }
       }
-      #endif
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.1.31",
+  "version": "10.1.32-rc.0",
   "publishConfig": {
     "access": "public"
   },