@rnmapbox/maps 10.2.3 → 10.2.5

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewContent.kt

@@ -2,11 +2,28 @@ package com.rnmapbox.rnmbx.components.annotation
 
 import android.content.Context
 import android.view.View.MeasureSpec
+import android.view.ViewGroup
 import com.facebook.react.views.view.ReactViewGroup
 
 class RNMBXMarkerViewContent(context: Context): ReactViewGroup(context) {
-
     var inAdd: Boolean = false
+
+    init {
+        allowRenderingOutside()
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        configureParentClipping()
+    }
+
+    private fun configureParentClipping() {
+        val parent = parent
+        if (parent is android.view.ViewGroup) {
+            parent.allowRenderingOutside()
+        }
+    }
+
     // see https://github.com/rnmapbox/maps/pull/3235
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         if (inAdd) {
@@ -25,6 +42,10 @@ class RNMBXMarkerViewContent(context: Context): ReactViewGroup(context) {
             super.onMeasure(widthMeasureSpec, heightMeasureSpec)
         }
     }
+}
 
+private fun ViewGroup.allowRenderingOutside() {
+    this.clipChildren = false
+    this.clipToPadding = false
 }
 

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

@@ -83,6 +83,10 @@ class RNMBXStyleValue(config: ReadableMap) {
         for (i in 0 until arr.size()) {
             val item = arr.getMap(i)
             if (item != null) {
+                if (item.getString("type") != "number") {
+                    Logger.e("RNMBXStyleValue", "getFloatArray: invalid type for item: $i ${item.getString("type")} expected to be number")
+                    continue
+                }
                 result.add(item.getDouble("value"))
             } else {
                 Logger.e("RNMBXStyleValue", "getFloatArray: null value for item: $i")
@@ -110,6 +114,10 @@ class RNMBXStyleValue(config: ReadableMap) {
             val item = arr.getMap(i)
             val value = item?.getString("value")
             if (value != null) {
+                if (item.getString("type") != "string") {
+                    Logger.e("RNMBXStyleValue", "getStringArray: invalid type for item: $i ${item.getString("type")} expected to be string")
+                    continue
+                }
                 result.add(value)
             } else {
                 Logger.e("RNMBXStyleValue", "getStringArray: null value for item: $i")
@@ -221,20 +229,44 @@ class RNMBXStyleValue(config: ReadableMap) {
         }
         if (!isAddImage) {
             val dynamic = mPayload!!.getDynamic("value")
-            if (dynamic.type == ReadableType.Array) {
-                val array = dynamic.asArray()
-                if (array == null) {
-                    Logger.e("RNMBXStyleValue", "value array is null")
-                } else {
-                    if (array.size() > 0 && mPayload.getString("type") == "array") {
-                        val map = array.getMap(0)
-                        if (map != null && map.getString("type") == "string") {
-                            isExpression = true
-                            mExpression = ExpressionParser.fromTyped(mPayload)
-                        }
-                    }
-                }
+            if (isExpression(dynamic)) {
+                isExpression = true
+                mExpression = ExpressionParser.fromTyped(mPayload)
+            }
+        }
+    }
+
+    private fun isExpression(payload: Dynamic): Boolean {
+        if (payload.type != ReadableType.Array) {
+            return false
+        }
+
+        var potentialExpression = payload.asArray()
+            ?: return false
+
+        while (
+            potentialExpression.size() > 0 &&
+            potentialExpression.getType(0) == ReadableType.Map
+        ) {
+            val firstElementMap = potentialExpression.getMap(0)
+                ?: return false
+
+            if (firstElementMap.getString("type") == "array") {
+                potentialExpression = firstElementMap.getArray("value")
+                    ?: return false
+            } else {
+                break
             }
         }
+
+        if (potentialExpression.size() == 0 || potentialExpression.getType(0) != ReadableType.Map) {
+            return false
+        }
+
+        val firstElementMap = potentialExpression.getMap(0)
+            ?: return false
+
+        // A valid expression starts with an operator, which is identified by its type being "string".
+        return firstElementMap.getString("type") == "string"
     }
-}
+}

package/ios/RNMBX/RNMBXPointAnnotationComponentView.mm

@@ -11,6 +11,8 @@
 #import <react/renderer/components/rnmapbox_maps_specs/Props.h>
 #import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
 
+#import "RNMBXFabricPropConvert.h"
+
 using namespace facebook::react;
 
 @interface RNMBXPointAnnotationComponentView () <RCTRNMBXPointAnnotationViewProtocol>
@@ -40,9 +42,9 @@ using namespace facebook::react;
 - (void)prepareView
 {
     _view = [[RNMBXPointAnnotation alloc] init];
-      
+
     self.contentView = _view;
-      
+
     // capture weak self reference to prevent retain cycle
     __weak __typeof__(self) weakSelf = self;
 
@@ -122,24 +124,14 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = static_cast<const RNMBXPointAnnotationProps &>(*props);
-    id coordinate = RNMBXConvertFollyDynamicToId(newProps.coordinate);
-    if (coordinate != nil) {
-        _view.coordinate = coordinate;
-    }
-    id draggable = RNMBXConvertFollyDynamicToId(newProps.draggable);
-    if (draggable != nil) {
-        _view.draggable = draggable;
-    }
-    id idx = RNMBXConvertFollyDynamicToId(newProps.id);
-    if (idx != nil) {
-        _view.id = idx;
-    }
-    id anchor = RNMBXConvertFollyDynamicToId(newProps.anchor);
-    if (anchor != nil) {
-        _view.anchor = anchor;
-    }
-    
+  const auto &oldViewProps = static_cast<const RNMBXPointAnnotationProps &>(*oldProps);
+  const auto &newViewProps = static_cast<const RNMBXPointAnnotationProps &>(*props);
+
+  RNMBX_OPTIONAL_PROP_NSString(coordinate)
+  RNMBX_OPTIONAL_PROP_BOOL(draggable)
+  RNMBX_OPTIONAL_PROP_NSString(id)
+  RNMBX_OPTIONAL_PROP_NSDictionary(anchor)
+
   [super updateProps:props oldProps:oldProps];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnmapbox/maps",
-  "version": "10.2.3",
+  "version": "10.2.5",
   "description": "Community-supported, open-source React Native library for building maps using Mapbox native maps SDK for iOS and Android",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.native.d.ts",