feat: add slot prop to PointAnnotation

Author: mfazekas

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

@@ -27,6 +27,7 @@ import com.rnmapbox.rnmbx.v11compat.annotation.*;
 class RNMBXPointAnnotation(private val mContext: Context, private val mManager: RNMBXPointAnnotationManager) : AbstractMapFeature(mContext), View.OnLayoutChangeListener {
 
     var pointAnnotations: RNMBXPointAnnotationCoordinator? = null
+    var slot: String? = null
     var annotation: PointAnnotation? = null
         private set
     private var mMap: MapboxMap? = null
@@ -98,6 +99,7 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
         super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         pointAnnotations = mapView.pointAnnotations
+        slot?.let { pointAnnotations?.manager?.slot = it }
         makeMarker()
         if (mChildView != null) {
             if (!mChildView!!.isAttachedToWindow) {

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

@@ -94,6 +94,14 @@ class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationConte
         annotation.setDraggable(draggable.asBoolean())
     }
 
+    @ReactProp(name = "slot")
+    override fun setSlot(annotation: RNMBXPointAnnotation, slot: Dynamic) {
+        if (!slot.isNull) {
+            annotation.slot = slot.asString()
+            annotation.pointAnnotations?.manager?.slot = slot.asString()
+        }
+    }
+
     companion object {
         const val REACT_CLASS = "RNMBXPointAnnotation"
     }

docs/PointAnnotation.md

@@ -144,6 +144,16 @@ This callback is fired while this annotation is being dragged.
 
 
 
+### slot
+
+```tsx
+'bottom' | 'middle' | 'top' | string
+```
+The slot in the Standard style to position the annotation layer.
+Use with Mapbox Standard style to control layer ordering.
+
+
+  
 ### children
 
 ```tsx

docs/StyleImport.md

@@ -38,13 +38,14 @@ existing is now always required as true
 ### config
 
 ```tsx
-type Config = {
-  [object Object]: string; /* FIX ME NO DESCRIPTION */
-}
+intersection
 ```
 _required_
 config is a dictionary of configuration options for the style import.
 
+When using the Mapbox Standard style with `id="basemap"`, use {@link StandardStyleConfig}
+keys for autocomplete. Arbitrary keys are also accepted for forward compatibility.
+
 See https://github.com/mapbox/mapbox-maps-ios/blob/main/Sources/MapboxMaps/Documentation.docc/Migrate%20to%20v11.md#21-the-mapbox-standard-style
 
 

docs/docs.json

@@ -6510,6 +6510,13 @@
         "default": "none",
         "description": "This callback is fired while this annotation is being dragged.\n*signature:*`(payload:Feature) => void`"
       },
+      {
+        "name": "slot",
+        "required": false,
+        "type": "'bottom' \\| 'middle' \\| 'top' \\| string",
+        "default": "none",
+        "description": "The slot in the Standard style to position the annotation layer.\nUse with Mapbox Standard style to control layer ordering."
+      },
       {
         "name": "children",
         "required": true,
@@ -8126,22 +8133,9 @@
       {
         "name": "config",
         "required": true,
-        "type": {
-          "name": "shape",
-          "value": [
-            {
-              "name": {
-                "name": "string"
-              },
-              "required": true,
-              "type": "string",
-              "default": "none",
-              "description": "FIX ME NO DESCRIPTION"
-            }
-          ]
-        },
+        "type": "intersection",
         "default": "none",
-        "description": "config is a dictionary of configuration options for the style import.\n\nSee https://github.com/mapbox/mapbox-maps-ios/blob/main/Sources/MapboxMaps/Documentation.docc/Migrate%20to%20v11.md#21-the-mapbox-standard-style"
+        "description": "config is a dictionary of configuration options for the style import.\n\nWhen using the Mapbox Standard style with `id=\"basemap\"`, use {@link StandardStyleConfig}\nkeys for autocomplete. Arbitrary keys are also accepted for forward compatibility.\n\nSee https://github.com/mapbox/mapbox-maps-ios/blob/main/Sources/MapboxMaps/Documentation.docc/Migrate%20to%20v11.md#21-the-mapbox-standard-style"
       }
     ],
     "fileNameWithExt": "StyleImport.tsx",

ios/RNMBX/RNMBXPointAnnotation.swift

@@ -29,6 +29,14 @@ public class RNMBXPointAnnotation : RNMBXInteractiveElement {
   var reactSubviews : [UIView] = []
 
 
+  @objc public var slot: String? {
+    didSet {
+      if let slot = slot {
+        map?.pointAnnotationManager.manager.slot = Slot(rawValue: slot)
+      }
+    }
+  }
+
   @objc public var onDeselected: RCTBubblingEventBlock? = nil
   @objc public var onDrag: RCTBubblingEventBlock? = nil
   @objc public var onDragEnd: RCTBubblingEventBlock? = nil
@@ -274,6 +282,9 @@ public class RNMBXPointAnnotation : RNMBXInteractiveElement {
 
   public override func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style) {
     super.addToMap(map, mapView: mapView, style: style)
+    if let slot = slot {
+      map.pointAnnotationManager.manager.slot = Slot(rawValue: slot)
+    }
     addIfPossible()
   }
 

ios/RNMBX/RNMBXPointAnnotationComponentView.mm

@@ -131,6 +131,7 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
   RNMBX_OPTIONAL_PROP_NSString(id)
   RNMBX_OPTIONAL_PROP_NSDictionary(anchor)
   RNMBX_REMAP_OPTIONAL_PROP_BOOL(selected, reactSelected)
+  RNMBX_OPTIONAL_PROP_NSString(slot)
 
   [super updateProps:props oldProps:oldProps];
 }

src/components/PointAnnotation.tsx

@@ -104,6 +104,12 @@ type Props = BaseProps & {
    */
   onDrag?: (payload: FeaturePayload) => void;
 
+  /**
+   * The slot in the Standard style to position the annotation layer.
+   * Use with Mapbox Standard style to control layer ordering.
+   */
+  slot?: 'bottom' | 'middle' | 'top' | string;
+
   /**
    * Expects one child, and an optional callout can be added as well
    */

src/specs/RNMBXPointAnnotationNativeComponent.ts

@@ -3,7 +3,7 @@ import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNati
 // @ts-ignore - CI environment type resolution issue for CodegenTypes
 import { DirectEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
 
-import type { UnsafeMixed } from './codegenUtils';
+import type { OptionalProp, UnsafeMixed } from './codegenUtils';
 
 type OnMapboxPointAnnotationDeselectedEventType = {
   type: string;
@@ -29,6 +29,7 @@ export interface NativeProps extends ViewProps {
   id: UnsafeMixed<string>;
   anchor: UnsafeMixed<any>;
   selected: UnsafeMixed<boolean>;
+  slot: OptionalProp<string>;
 
   onMapboxPointAnnotationDeselected: DirectEventHandler<OnMapboxPointAnnotationDeselectedEventType>;
   onMapboxPointAnnotationDrag: DirectEventHandler<OnMapboxPointAnnotationDragEventType>;