@rnmapbox/maps 10.0.10-rc.1 → 10.0.10-rc.2

package/android/rctmgl/build.gradle

@@ -1,5 +1,5 @@
 def defaultMapboxMapsImpl = "maplibre"
-def defaultMapboxMapsVersion = "10.14.0"
+def defaultMapboxMapsVersion = "10.14.1"
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback

package/ios/RCTMGL-v10/RCTMGLStyleValue.swift

@@ -362,11 +362,30 @@ class RCTMGLStyleValue {
   func mglStyleValueLineCap() -> Value<LineCap> {
     return mglStyleValueEnum()
   }
+    
+  func parseExpression(_ expression: [Any]) throws -> Expression {
+    let data = try JSONSerialization.data(withJSONObject: expression, options: .prettyPrinted)
+    let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+    return decodedExpression
+  }
   
   func mglStyleValueEnum<Enum : RawRepresentable>() -> Value<Enum> where Enum.RawValue == String {
     if let value = value as? Dictionary<String,Any> {
       let value = RCTMGLStyleValue.convert(value["stylevalue"] as! [String:Any])
-      return Value.constant(Enum(rawValue: value as! String)!)
+        if let value = value as? String {
+            return Value.constant(Enum(rawValue: value )!)
+        } else if let value = value as? [Any] {
+            if let parsedExpression = (logged("mglStyleValueEnum: failed to parse expression") {
+                try parseExpression(value)
+            }) {
+                return .expression(parsedExpression)
+            } else {
+                return Value.constant(Enum(rawValue: value[0] as! String)!)
+            }
+        } else {
+            Logger.log(level: .error, message:"Invalid value for enum (nor string, not array): \(value) returning something")
+            return Value.constant(Enum(rawValue: value as! String)!)
+        }
     } else {
       Logger.log(level: .error, message:"Invalid value for enum: \(value) returning something")
       return Value.constant(Enum(rawValue: value as! String)!)

package/package.json

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