@rnmapbox/maps 10.1.42 → 10.1.43

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

@@ -3,6 +3,7 @@ package com.rnmapbox.rnmbx.components.mapview
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.rnmapbox.rnmbx.NativeMapViewModuleSpec
@@ -12,6 +13,7 @@ import com.rnmapbox.rnmbx.utils.ViewRefTag
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 import com.rnmapbox.rnmbx.utils.extensions.toCoordinate
 import com.rnmapbox.rnmbx.utils.extensions.toScreenCoordinate
+import com.rnmapbox.rnmbx.utils.extensions.toValueHashMap
 
 class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : NativeMapViewModuleSpec(context) {
     private fun withMapViewOnUIThread(
@@ -158,6 +160,44 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
         }
     }
 
+    override fun setFeatureState(
+        viewRef: ViewRefTag?,
+        featureId: String,
+        state: ReadableMap,
+        sourceId: String,
+        sourceLayerId: String?,
+        promise: Promise
+    ) {
+        withMapViewOnUIThread(viewRef, promise) {
+            it.setFeatureState(featureId, state.toValueHashMap(), sourceId, sourceLayerId, createCommandResponse(promise))
+        }
+    }
+
+    override fun getFeatureState(
+        viewRef: ViewRefTag?,
+        featureId: String,
+        sourceId: String,
+        sourceLayerId: String?,
+        promise: Promise
+    ) {
+        withMapViewOnUIThread(viewRef, promise) {
+            it.getFeatureState(featureId, sourceId, sourceLayerId, createCommandResponse(promise))
+        }
+    }
+
+    override fun removeFeatureState(
+        viewRef: ViewRefTag?,
+        featureId: String,
+        stateKey: String?,
+        sourceId: String,
+        sourceLayerId: String?,
+        promise: Promise
+    ) {
+        withMapViewOnUIThread(viewRef, promise) {
+            it.removeFeatureState(featureId, stateKey, sourceId, sourceLayerId, createCommandResponse(promise))
+        }
+    }
+
     override fun querySourceFeatures(
         viewRef: ViewRefTag?,
         sourceId: String,

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

@@ -65,6 +65,7 @@ import java.util.*
 
 import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationCoordinator
 import com.rnmapbox.rnmbx.components.images.ImageManager
+import com.rnmapbox.rnmbx.utils.extensions.toStringKeyPairs
 
 import com.rnmapbox.rnmbx.v11compat.event.*
 import com.rnmapbox.rnmbx.v11compat.feature.*
@@ -1027,6 +1028,70 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         }
     }
 
+    fun setFeatureState(
+      featureId: String,
+      state: HashMap<String, Value>,
+      sourceId: String,
+      sourceLayerId: String?,
+      response: CommandResponse
+    ) {
+        mapView.getMapboxMap().setFeatureStateCompat(
+            sourceId,
+            sourceLayerId,
+            featureId,
+            Value.valueOf(state)
+        ) { expected ->
+            if (expected.isError()) {
+                response.error(expected.error!!.toString())
+            } else {
+                response.success { }
+            }
+        }
+    }
+
+    fun getFeatureState(
+      featureId: String,
+      sourceId: String,
+      sourceLayerId: String?,
+      response: CommandResponse
+    ) {
+        mapView.getMapboxMap().getFeatureState(sourceId, sourceLayerId, featureId) { expected ->
+            if (expected.isValue) {
+                response.success {
+                    val state = expected.value?.contents;
+                    if (state is Map<*,*>) {
+                        it.putMap("featureState", writableMapOf(*state.toStringKeyPairs()))
+                    } else {
+                        it.putMap("featureState", Arguments.createMap())
+                    }
+                }
+            } else {
+                response.error(expected.error ?: "Unknown error")
+            }
+        }
+    }
+
+    fun removeFeatureState(
+      featureId: String,
+      stateKey: String?,
+      sourceId: String,
+      sourceLayerId: String?,
+      response: CommandResponse
+    ) {
+        mapView.getMapboxMap().removeFeatureStateCompat(
+            sourceId,
+            sourceLayerId,
+            featureId,
+            stateKey
+        ) { expected ->
+            if (expected.isError()) {
+                response.error(expected.error?.toString() ?: "Unknown error")
+            } else {
+                response.success { }
+            }
+        }
+    }
+
     fun match(layer: Layer, sourceId:String, sourceLayerId: String?) : Boolean {
         fun match(actSourceId: String, actSourceLayerId: String?) : Boolean {
             return (actSourceId == sourceId && ((sourceLayerId == null) || (sourceLayerId == actSourceLayerId)))

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

@@ -0,0 +1,11 @@
+package com.rnmapbox.rnmbx.utils.extensions
+
+fun  Map<*, *>.toStringKeyPairs(): Array<Pair<String, *>> {
+    return this.entries.fold(mutableListOf<Pair<String, *>>()) { acc, (key, value) ->
+        acc.apply {
+            if (key is String) {
+                add(key to value)
+            }
+        }
+    }.toTypedArray()
+}

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

@@ -3,6 +3,9 @@ package com.rnmapbox.rnmbx.utils
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
+import com.mapbox.bindgen.Value
+import com.rnmapbox.rnmbx.utils.extensions.toStringKeyPairs
+
 
 fun writableMapOf(vararg values: Pair<String, *>): WritableMap {
     val map = Arguments.createMap()
@@ -14,8 +17,23 @@ fun writableMapOf(vararg values: Pair<String, *>): WritableMap {
             is Int -> map.putInt(key, value)
             is Long -> map.putInt(key, value.toInt())
             is String -> map.putString(key, value)
+            is Map<*,*> -> map.putMap(key, writableMapOf(*value.toStringKeyPairs()))
+            is Array<*> -> map.putArray(key, writableArrayOf(*value.map{ it as Any }.toTypedArray()))
             is WritableMap -> map.putMap(key, value)
             is WritableArray -> map.putArray(key, value)
+            is Value -> {
+                val contents = value.contents
+                when (contents) {
+                    null -> map.putNull(key)
+                    is Boolean -> map.putBoolean(key, contents)
+                    is Double -> map.putDouble(key, contents)
+                    is Int -> map.putInt(key, contents)
+                    is Long -> map.putInt(key, contents.toInt())
+                    is String -> map.putString(key, contents)
+                    is WritableMap -> map.putMap(key, contents)
+                    is WritableArray -> map.putArray(key, contents)
+                }
+            }
             else -> throw IllegalArgumentException("Unsupported value type ${value::class.java.name} for key [$key]")
         }
     }
@@ -32,8 +50,25 @@ fun writableArrayOf(vararg values: Any): WritableArray {
             is Int -> array.pushInt(value)
             is Long -> array.pushInt(value.toInt())
             is String -> array.pushString(value)
+            is Map<*,*> -> array.pushMap(writableMapOf(*value.toStringKeyPairs()))
+            is Array<*> -> array.pushArray(writableArrayOf(*value.map{ it as Any }.toTypedArray()))
             is WritableMap -> array.pushMap(value)
             is WritableArray -> array.pushArray(value)
+            is Value -> {
+                val contents = value.contents
+                when (contents) {
+                    null -> array.pushNull()
+                    is Boolean -> array.pushBoolean(contents)
+                    is Double -> array.pushDouble(contents)
+                    is Int -> array.pushInt(contents)
+                    is Long -> array.pushInt(contents.toInt())
+                    is String -> array.pushString(contents)
+                    is Map<*,*> -> array.pushMap(writableMapOf(*contents.toStringKeyPairs()))
+                    is Array<*> -> array.pushArray(writableArrayOf(*contents.map{ it as Any }.toTypedArray()))
+                    is WritableMap -> array.pushMap(contents)
+                    is WritableArray -> array.pushArray(contents)
+                }
+            }
             else -> throw IllegalArgumentException("Unsupported value type ${value::class.java.name}")
         }
     }

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt

@@ -1,4 +1,5 @@
-package com.rnmapbox.rnmbx.v11compat.mapboxmap;
+
+package com.rnmapbox.rnmbx.v11compat.mapboxmap
 
 import android.animation.Animator
 import android.app.Activity
@@ -6,7 +7,9 @@ import android.content.Context
 import android.content.ContextWrapper
 import androidx.activity.result.contract.ActivityResultContracts
 import com.mapbox.bindgen.Expected
+import com.mapbox.bindgen.ExpectedFactory
 import com.mapbox.bindgen.None
+import com.mapbox.bindgen.Value
 import com.mapbox.maps.CameraOptions
 import com.mapbox.maps.MapView
 import com.mapbox.maps.MapboxMap
@@ -14,6 +17,28 @@ import com.mapbox.maps.plugin.animation.MapAnimationOptions
 import com.mapbox.maps.plugin.animation.easeTo
 import com.mapbox.maps.plugin.animation.flyTo
 
+fun MapboxMap.setFeatureStateCompat(
+    sourceId: String,
+    sourceLayerId: String?,
+    featureId: String,
+    state: Value,
+    callback: (Expected<String, None>) -> Unit
+) {
+    this.setFeatureState(sourceId, sourceLayerId, featureId, state)
+    callback(ExpectedFactory.createNone<String>())
+}
+
+fun MapboxMap.removeFeatureStateCompat(
+    sourceId: String,
+    sourceLayerId: String?,
+    featureId: String,
+    stateKey: String?,
+    callback: (Expected<String, None>) -> Unit
+) {
+    this.removeFeatureState(sourceId, sourceLayerId, featureId, stateKey)
+    callback(ExpectedFactory.createNone<String>())
+}
+
 fun MapboxMap.flyToV11(
     cameraOptions: CameraOptions,
     animationOptions: MapAnimationOptions.Builder,

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt

@@ -2,6 +2,9 @@ package com.rnmapbox.rnmbx.v11compat.mapboxmap
 
 import android.animation.Animator
 import android.content.Context
+import com.mapbox.bindgen.Value
+import com.mapbox.bindgen.Expected
+import com.mapbox.bindgen.None
 import com.mapbox.maps.AsyncOperationResultCallback
 import com.mapbox.maps.CameraOptions
 import com.mapbox.maps.MapboxMap
@@ -9,6 +12,30 @@ import com.mapbox.maps.plugin.animation.MapAnimationOptions
 import com.mapbox.maps.plugin.animation.easeTo
 import com.mapbox.maps.plugin.animation.flyTo
 
+fun MapboxMap.setFeatureStateCompat(
+    sourceId: String,
+    sourceLayerId: String?,
+    featureId: String,
+    state: Value,
+    callback: (Expected<String, None>) -> Unit
+) {
+    this.setFeatureState(sourceId, sourceLayerId, featureId, state) { _ ->
+        callback(com.mapbox.bindgen.ExpectedFactory.createNone<String>())
+    }
+}
+
+fun MapboxMap.removeFeatureStateCompat(
+    sourceId: String,
+    sourceLayerId: String?,
+    featureId: String,
+    stateKey: String?,
+    callback: (Expected<String, None>) -> Unit
+) {
+    this.removeFeatureState(sourceId, sourceLayerId, featureId, stateKey) { _ ->
+        callback(com.mapbox.bindgen.ExpectedFactory.createNone<String>())
+    }
+}
+
 fun MapboxMap.flyToV11(
     cameraOptions: CameraOptions,
     animationOptions: MapAnimationOptions.Builder,
@@ -39,4 +66,4 @@ fun MapboxMap.clearData(callback: AsyncOperationResultCallback) {
 
 fun MapboxMap.Companion.clearData(context: Context, callback: AsyncOperationResultCallback) {
     this.clearData(callback)
-}
+}

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

@@ -19,6 +19,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReactModuleWithSpec;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -86,4 +87,16 @@ public abstract class NativeMapViewModuleSpec extends ReactContextBaseJavaModule
   @ReactMethod
   @DoNotStrip
   public abstract void querySourceFeatures(@Nullable Double viewRef, String sourceId, ReadableArray withFilter, ReadableArray withSourceLayerIDs, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setFeatureState(@Nullable Double viewRef, String featureId, ReadableMap state, String sourceId, @Nullable String sourceLayerId, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getFeatureState(@Nullable Double viewRef, String featureId, String sourceId, @Nullable String sourceLayerId, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void removeFeatureState(@Nullable Double viewRef, String featureId, @Nullable String stateKey, String sourceId, @Nullable String sourceLayerId, Promise promise);
 }

package/ios/RNMBX/RNMBXCameraViewManager.m

@@ -1,3 +1,5 @@
+#if !RCT_NEW_ARCH_ENABLED
+
 #import "React/RCTBridgeModule.h"
 #import <React/RCTViewManager.h>
 #import <Foundation/Foundation.h>
@@ -22,3 +24,4 @@ RCT_EXPORT_VIEW_PROPERTY(onUserTrackingModeChange, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(stop, NSDictionary)
 
 @end
+#endif

package/ios/RNMBX/RNMBXCameraViewManager.swift

@@ -1,14 +1,16 @@
-import Foundation
-import MapboxMaps
+#if !RCT_NEW_ARCH_ENABLED
+  import Foundation
+  import MapboxMaps
 
-@objc(RNMBXCameraViewManager)
-class RNMBXCameraViewManager  : RCTViewManager {
+  @objc(RNMBXCameraViewManager)
+  class RNMBXCameraViewManager: RCTViewManager {
     @objc
     override static func requiresMainQueueSetup() -> Bool {
-        return false
+      return false
     }
-    
+
     override func view() -> UIView! {
-        return RNMBXCamera()
+      return RNMBXCamera()
     }
-}
+  }
+#endif

package/ios/RNMBX/RNMBXCircleLayerComponentView.mm

@@ -32,7 +32,7 @@ using namespace facebook::react;
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const RNMBXCircleLayerProps>();
     _props = defaultProps;
-      [self prepareView];
+    [self prepareView];
   }
 
   return self;

package/ios/RNMBX/RNMBXCircleLayerViewManager.m

@@ -1,3 +1,4 @@
+#if !RCT_NEW_ARCH_ENABLED
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
@@ -10,3 +11,4 @@ RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString)
 #include "CommonLayerProperties.H"
 
 @end
+#endif

package/ios/RNMBX/RNMBXCircleLayerViewManager.swift

@@ -1,3 +1,4 @@
+#if !RCT_NEW_ARCH_ENABLED
 @objc(RNMBXCircleLayerViewManager)
 class RNMBXCircleLayerViewManager: RCTViewManager {
     @objc
@@ -11,3 +12,4 @@ class RNMBXCircleLayerViewManager: RCTViewManager {
       return layer
     }
 }
+#endif

package/ios/RNMBX/RNMBXMapViewManager.m

@@ -1,3 +1,4 @@
+#if !RCT_NEW_ARCH_ENABLED
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
@@ -41,3 +42,4 @@ RCT_REMAP_VIEW_PROPERTY(onMapChange, reactOnMapChange, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(mapViewImpl, NSString)
 
 @end
+#endif