fix(point annotation): selected property should select/deselect a point annotation

Co-Authored-By: Miklós Fazekas <mfazekas@szemafor.com>

Author: mfazekas

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

@@ -78,6 +78,15 @@ class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationConte
         annotation.setAnchor(mapValue.getDouble("x").toFloat(), mapValue.getDouble("y").toFloat())
     }
 
+    override fun setSelected(
+        annotation: RNMBXPointAnnotation,
+        value: Dynamic?
+    ) {
+       value?.let {
+           annotation.isSelected = it.asBoolean()
+       }
+    }
+
     @ReactProp(name = "draggable")
     override fun setDraggable(annotation: RNMBXPointAnnotation, draggable: Dynamic) {
         annotation.setDraggable(draggable.asBoolean())

ios/RNMBX/RNMBXMapView.swift

@@ -1893,6 +1893,19 @@ class RNMBXPointAnnotationManager : AnnotationInteractionDelegate {
     //   onTap(annotations: annotations)
   }
 
+  func selected(pointAnnotation: RNMBXPointAnnotation) {
+    if (selected != nil) {
+      deselectCurrentlySelected(deselectAnnotationOnTap: false)
+    }
+    selected = pointAnnotation
+  }
+
+  func unselected(pointAnnotation: RNMBXPointAnnotation) {
+    if (selected == pointAnnotation) {
+      deselectCurrentlySelected(deselectAnnotationOnTap: false)
+    }
+  }
+
   func deselectCurrentlySelected(deselectAnnotationOnTap: Bool = false) -> Bool {
     if let selected = selected {
       selected.doDeselect(deselectAnnotationOnMapTap: deselectAnnotationOnTap)
@@ -2120,6 +2133,7 @@ class RNMBXPointAnnotationManager : AnnotationInteractionDelegate {
     )
 
   func add(_ annotation: PointAnnotation, _ rnmbxPointAnnotation: RNMBXPointAnnotation) {
+    rnmbxPointAnnotation.manager = self
     manager.annotations.append(annotation)
     manager.refresh()
     annotations.setObject(rnmbxPointAnnotation, forKey: annotation.id as NSString)

ios/RNMBX/RNMBXPointAnnotation.swift

@@ -10,6 +10,8 @@ final class WeakRef<T: AnyObject> {
 }
 @objc
 public class RNMBXPointAnnotation : RNMBXInteractiveElement {
+  weak var manager: RNMBXPointAnnotationManager? = nil
+
   static let key = "RNMBXPointAnnotation"
   static var gid = 0;
 
@@ -31,7 +33,25 @@ public class RNMBXPointAnnotation : RNMBXInteractiveElement {
   @objc public var onDrag: RCTBubblingEventBlock? = nil
   @objc public var onDragEnd: RCTBubblingEventBlock? = nil
   @objc public var onSelected: RCTBubblingEventBlock? = nil
-  
+
+  private var selected: Bool? = nil {
+    didSet {
+      update { annotation in
+        if let selected = selected {
+          annotation.isSelected = selected
+        }
+      }
+    }
+  }
+
+  @objc public func setReactSelected(_ _selected: Bool) {
+    if (_selected == true && self.selected != true) {
+      manager?.selected(pointAnnotation: self)
+    } else if (_selected == false && self.selected == true) {
+      manager?.unselected(pointAnnotation: self)
+    }
+  }
+
   @objc public var coordinate : String? {
     didSet {
       _updateCoordinate()
@@ -173,14 +193,16 @@ public class RNMBXPointAnnotation : RNMBXInteractiveElement {
   }
 
   func doSelect() {
+    self.selected = true
     let event = makeEvent(isSelect: true)
     if let onSelected = onSelected {
       onSelected(event.toJSON())
     }
     onSelect()
   }
-  
+
   func doDeselect(deselectAnnotationOnMapTap: Bool = false) {
+    self.selected = false
     let event = makeEvent(isSelect: false, deselectAnnotationOnMapTap: deselectAnnotationOnMapTap)
     if let onDeselected = onDeselected {
       onDeselected(event.toJSON())

ios/RNMBX/RNMBXPointAnnotationComponentView.mm

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

src/specs/RNMBXPointAnnotationNativeComponent.ts

@@ -28,6 +28,7 @@ export interface NativeProps extends ViewProps {
   draggable: UnsafeMixed<boolean>;
   id: UnsafeMixed<string>;
   anchor: UnsafeMixed<any>;
+  selected: UnsafeMixed<boolean>;
 
   onMapboxPointAnnotationDeselected: DirectEventHandler<OnMapboxPointAnnotationDeselectedEventType>;
   onMapboxPointAnnotationDrag: DirectEventHandler<OnMapboxPointAnnotationDragEventType>;