@maplibre/maplibre-react-native 11.0.0-alpha.43 → 11.0.0-alpha.44

package/android/src/main/java/org/maplibre/reactnative/components/AbstractEvent.kt

@@ -1,24 +1,20 @@
-package org.maplibre.reactnative.components
-
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
-
-class AbstractEvent(
-    viewId: Int,
-    private val mEventName: String,
-    private val mCanCoalesce: Boolean,
-    private val mEvent: WritableMap?
-) : Event<AbstractEvent>(viewId) {
-    override fun getEventName(): String {
-        return mEventName
-    }
-
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, mEvent)
-    }
-
-    override fun canCoalesce(): Boolean {
-        return mCanCoalesce
-    }
-}
+package org.maplibre.reactnative.components
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+class AbstractEvent(
+    viewId: Int,
+    private val mEventName: String,
+    private val mCanCoalesce: Boolean,
+    private val mEvent: WritableMap?,
+) : Event<AbstractEvent>(viewId) {
+    override fun getEventName(): String = mEventName
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEvent)
+    }
+
+    override fun canCoalesce(): Boolean = mCanCoalesce
+}

package/android/src/main/java/org/maplibre/reactnative/components/AbstractEventEmitter.kt

@@ -10,8 +10,9 @@ import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.events.EventDispatcher
 import org.maplibre.reactnative.events.IEvent
 
-abstract class AbstractEventEmitter<T : ViewGroup>(private val reactContext: ReactApplicationContext) :
-    ViewGroupManager<T>() {
+abstract class AbstractEventEmitter<T : ViewGroup>(
+    private val reactContext: ReactApplicationContext,
+) : ViewGroupManager<T>() {
     private val mRateLimitedEvents: MutableMap<String?, Long?> = HashMap()
     private var mEventDispatcher: EventDispatcher? = null
 
@@ -26,12 +27,18 @@ abstract class AbstractEventEmitter<T : ViewGroup>(private val reactContext: Rea
         mRateLimitedEvents.put(eventCacheKey, System.currentTimeMillis())
         mEventDispatcher!!.dispatchEvent(
             AbstractEvent(
-                event.getID(), event.getKey(), event.canCoalesce(), event.toJSON()
-            )
+                event.getID(),
+                event.getKey(),
+                event.canCoalesce(),
+                event.toJSON(),
+            ),
         )
     }
 
-    override fun addEventEmitters(context: ThemedReactContext, view: T) {
+    override fun addEventEmitters(
+        context: ThemedReactContext,
+        view: T,
+    ) {
         mEventDispatcher =
             UIManagerHelper.getUIManager(context, UIManagerType.Companion.FABRIC)!!.eventDispatcher
     }
@@ -47,7 +54,8 @@ abstract class AbstractEventEmitter<T : ViewGroup>(private val reactContext: Rea
 
         for (event in events.entries) {
             exportedEvents.put(
-                event.key, MapBuilder.of<String?, String?>("registrationName", event.value!!)
+                event.key,
+                MapBuilder.of<String?, String?>("registrationName", event.value!!),
             )
         }
 
@@ -56,14 +64,15 @@ abstract class AbstractEventEmitter<T : ViewGroup>(private val reactContext: Rea
 
     abstract fun customEvents(): Map<String, String>?
 
-    private fun shouldDropEvent(cacheKey: String?, event: IEvent): Boolean {
+    private fun shouldDropEvent(
+        cacheKey: String?,
+        event: IEvent,
+    ): Boolean {
         val lastEventTimestamp = mRateLimitedEvents.get(cacheKey)
         return lastEventTimestamp != null && (event.getTimestamp() - lastEventTimestamp) <= BRIDGE_TIMEOUT_MS
     }
 
-    private fun getEventCacheKey(event: IEvent): String {
-        return String.format("%s-%s", event.getKey(), event.getType())
-    }
+    private fun getEventCacheKey(event: IEvent): String = String.format("%s-%s", event.getKey(), event.getType())
 
     companion object {
         private const val BRIDGE_TIMEOUT_MS = 10.0

package/android/src/main/java/org/maplibre/reactnative/components/annotations/callout/MLRNCallout.kt

@@ -3,5 +3,6 @@ package org.maplibre.reactnative.components.annotations.callout
 import android.content.Context
 import com.facebook.react.views.view.ReactViewGroup
 
-class MLRNCallout(context: Context) : ReactViewGroup(context) {
-}
+class MLRNCallout(
+    context: Context,
+) : ReactViewGroup(context)

package/android/src/main/java/org/maplibre/reactnative/components/annotations/callout/MLRNCalloutManager.kt

@@ -11,7 +11,6 @@ import com.facebook.react.viewmanagers.MLRNCalloutManagerInterface
 class MLRNCalloutManager :
     ViewGroupManager<MLRNCallout>(),
     MLRNCalloutManagerInterface<MLRNCallout> {
-
     private val delegate: MLRNCalloutManagerDelegate<MLRNCallout, MLRNCalloutManager> =
         MLRNCalloutManagerDelegate(this)
 
@@ -23,7 +22,5 @@ class MLRNCalloutManager :
 
     override fun getName(): String = REACT_CLASS
 
-    override fun createViewInstance(reactContext: ThemedReactContext): MLRNCallout {
-        return MLRNCallout(reactContext)
-    }
+    override fun createViewInstance(reactContext: ThemedReactContext): MLRNCallout = MLRNCallout(reactContext)
 }

package/android/src/main/java/org/maplibre/reactnative/components/annotations/markerview/MLRNMarkerView.kt

@@ -12,7 +12,10 @@ import org.maplibre.reactnative.components.mapview.MLRNMapView
 import org.maplibre.reactnative.utils.GeoJSONUtils
 
 @SuppressLint("ViewConstructor")
-class MLRNMarkerView(context: Context) : AbstractMapFeature(context), View.OnLayoutChangeListener {
+class MLRNMarkerView(
+    context: Context,
+) : AbstractMapFeature(context),
+    View.OnLayoutChangeListener {
     private var mMapView: MLRNMapView? = null
     private var mChildView: View? = null
     private var mWrapperView: MLRNMarkerViewContent? = null
@@ -35,19 +38,31 @@ class MLRNMarkerView(context: Context) : AbstractMapFeature(context), View.OnLay
     private fun disableClippingRecursively(view: View) {
         if (view is ViewGroup) {
             view.disableClipping()
-            view.setOnHierarchyChangeListener(object : ViewGroup.OnHierarchyChangeListener {
-                override fun onChildViewAdded(parent: View?, child: View?) {
-                    child?.let { disableClippingRecursively(it) }
-                }
-                override fun onChildViewRemoved(parent: View?, child: View?) {}
-            })
+            view.setOnHierarchyChangeListener(
+                object : ViewGroup.OnHierarchyChangeListener {
+                    override fun onChildViewAdded(
+                        parent: View?,
+                        child: View?,
+                    ) {
+                        child?.let { disableClippingRecursively(it) }
+                    }
+
+                    override fun onChildViewRemoved(
+                        parent: View?,
+                        child: View?,
+                    ) {}
+                },
+            )
             for (i in 0 until view.childCount) {
                 disableClippingRecursively(view.getChildAt(i))
             }
         }
     }
 
-    override fun addView(childView: View, childPosition: Int) {
+    override fun addView(
+        childView: View,
+        childPosition: Int,
+    ) {
         if (childPosition != 0) return
 
         mChildView = childView
@@ -77,13 +92,9 @@ class MLRNMarkerView(context: Context) : AbstractMapFeature(context), View.OnLay
         mChildView = null
     }
 
-    override fun getChildCount(): Int {
-        return if (mChildView != null) 1 else 0
-    }
+    override fun getChildCount(): Int = if (mChildView != null) 1 else 0
 
-    override fun getChildAt(index: Int): View? {
-        return if (index == 0) mChildView else null
-    }
+    override fun getChildAt(index: Int): View? = if (index == 0) mChildView else null
 
     fun setLngLat(lngLat: DoubleArray?) {
         if (lngLat == null || lngLat.size < 2) return
@@ -95,14 +106,20 @@ class MLRNMarkerView(context: Context) : AbstractMapFeature(context), View.OnLay
         }
     }
 
-    fun setAnchor(x: Float, y: Float) {
+    fun setAnchor(
+        x: Float,
+        y: Float,
+    ) {
         mAnchor = floatArrayOf(x, y)
         if (mMarkerInfo != null && mMarkerViewManager != null) {
             mMarkerViewManager!!.updateMarkerAnchor(mMarkerInfo!!, x, y)
         }
     }
 
-    fun setOffset(x: Float, y: Float) {
+    fun setOffset(
+        x: Float,
+        y: Float,
+    ) {
         mOffset = floatArrayOf(x, y)
         val scale = resources.displayMetrics.density
         val pixelOffsetX = x * scale
@@ -140,13 +157,15 @@ class MLRNMarkerView(context: Context) : AbstractMapFeature(context), View.OnLay
                 mMapView?.offscreenAnnotationViewContainer()?.removeView(mChildView)
                 disableClippingRecursively(mChildView!!)
 
-                mWrapperView = MLRNMarkerViewContent(context).apply {
-                    layoutParams = FrameLayout.LayoutParams(
-                        FrameLayout.LayoutParams.WRAP_CONTENT,
-                        FrameLayout.LayoutParams.WRAP_CONTENT
-                    )
-                    addView(mChildView)
-                }
+                mWrapperView =
+                    MLRNMarkerViewContent(context).apply {
+                        layoutParams =
+                            FrameLayout.LayoutParams(
+                                FrameLayout.LayoutParams.WRAP_CONTENT,
+                                FrameLayout.LayoutParams.WRAP_CONTENT,
+                            )
+                        addView(mChildView)
+                    }
                 mWrapperView!!.setLayerType(View.LAYER_TYPE_HARDWARE, null)
 
                 mLastZIndex = ViewGroupManager.getViewZIndex(this@MLRNMarkerView)
@@ -158,14 +177,15 @@ class MLRNMarkerView(context: Context) : AbstractMapFeature(context), View.OnLay
                 val pixelOffsetX = (mOffset?.get(0) ?: 0f) * scale
                 val pixelOffsetY = (mOffset?.get(1) ?: 0f) * scale
 
-                mMarkerInfo = mMarkerViewManager!!.addMarker(
-                    view = mWrapperView!!,
-                    latLng = latLng,
-                    anchorX = mAnchor?.get(0) ?: 0f,
-                    anchorY = mAnchor?.get(1) ?: 0f,
-                    offsetX = pixelOffsetX,
-                    offsetY = pixelOffsetY
-                )
+                mMarkerInfo =
+                    mMarkerViewManager!!.addMarker(
+                        view = mWrapperView!!,
+                        latLng = latLng,
+                        anchorX = mAnchor?.get(0) ?: 0f,
+                        anchorY = mAnchor?.get(1) ?: 0f,
+                        offsetX = pixelOffsetX,
+                        offsetY = pixelOffsetY,
+                    )
             }
         }
     }
@@ -186,8 +206,15 @@ class MLRNMarkerView(context: Context) : AbstractMapFeature(context), View.OnLay
     }
 
     override fun onLayoutChange(
-        v: View, left: Int, top: Int, right: Int, bottom: Int,
-        oldLeft: Int, oldTop: Int, oldRight: Int, oldBottom: Int
+        v: View,
+        left: Int,
+        top: Int,
+        right: Int,
+        bottom: Int,
+        oldLeft: Int,
+        oldTop: Int,
+        oldRight: Int,
+        oldBottom: Int,
     ) {
         if (left == 0 && top == 0 && right == 0 && bottom == 0) return
 

package/android/src/main/java/org/maplibre/reactnative/components/annotations/markerview/MLRNMarkerViewContent.kt

@@ -7,13 +7,14 @@ import com.facebook.react.views.view.ReactViewGroup
 
 /**
  * Custom ReactViewGroup that allows content to render outside its bounds (#642).
- * This is used as a wrapper for MarkerView content to prevent clipping.
+ * This is used as a wrapper for Marker content to prevent clipping.
  *
  * Based on rnmapbox/maps implementation:
  * https://github.com/rnmapbox/maps/blob/main/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewContent.kt
  */
-class MLRNMarkerViewContent(context: Context) : ReactViewGroup(context) {
-
+class MLRNMarkerViewContent(
+    context: Context,
+) : ReactViewGroup(context) {
     init {
         allowRenderingOutside()
     }

package/android/src/main/java/org/maplibre/reactnative/components/annotations/markerview/MLRNMarkerViewManager.kt

@@ -15,10 +15,10 @@ import com.facebook.react.viewmanagers.MLRNMarkerViewManagerDelegate
 import com.facebook.react.viewmanagers.MLRNMarkerViewManagerInterface
 
 @ReactModule(name = MLRNMarkerViewManager.REACT_CLASS)
-class MLRNMarkerViewManager(private val reactApplicationContext: ReactApplicationContext) :
-    ViewGroupManager<MLRNMarkerView>(),
+class MLRNMarkerViewManager(
+    private val reactApplicationContext: ReactApplicationContext,
+) : ViewGroupManager<MLRNMarkerView>(),
     MLRNMarkerViewManagerInterface<MLRNMarkerView> {
-
     private val delegate: MLRNMarkerViewManagerDelegate<MLRNMarkerView, MLRNMarkerViewManager> =
         MLRNMarkerViewManagerDelegate(this)
 
@@ -30,28 +30,35 @@ class MLRNMarkerViewManager(private val reactApplicationContext: ReactApplicatio
 
     override fun getName(): String = REACT_CLASS
 
-    override fun createViewInstance(reactContext: ThemedReactContext): MLRNMarkerView {
-        return MLRNMarkerView(reactContext)
-    }
+    override fun createViewInstance(reactContext: ThemedReactContext): MLRNMarkerView = MLRNMarkerView(reactContext)
 
-    override fun addView(parent: MLRNMarkerView, child: View, index: Int) {
+    override fun addView(
+        parent: MLRNMarkerView,
+        child: View,
+        index: Int,
+    ) {
         parent.addView(child, index)
     }
 
-    override fun removeViewAt(parent: MLRNMarkerView, index: Int) {
+    override fun removeViewAt(
+        parent: MLRNMarkerView,
+        index: Int,
+    ) {
         parent.removeViewAt(index)
     }
 
-    override fun getChildCount(parent: MLRNMarkerView): Int {
-        return parent.childCount
-    }
+    override fun getChildCount(parent: MLRNMarkerView): Int = parent.childCount
 
-    override fun getChildAt(parent: MLRNMarkerView, index: Int): View? {
-        return parent.getChildAt(index)
-    }
+    override fun getChildAt(
+        parent: MLRNMarkerView,
+        index: Int,
+    ): View? = parent.getChildAt(index)
 
     @ReactProp(name = "lngLat")
-    override fun setLngLat(markerView: MLRNMarkerView, lngLat: Dynamic) {
+    override fun setLngLat(
+        markerView: MLRNMarkerView,
+        lngLat: Dynamic,
+    ) {
         if (lngLat.type == ReadableType.Array) {
             val arr = lngLat.asArray()
             if (arr != null && arr.size() >= 2) {
@@ -61,20 +68,29 @@ class MLRNMarkerViewManager(private val reactApplicationContext: ReactApplicatio
     }
 
     @ReactProp(name = "anchor")
-    override fun setAnchor(markerView: MLRNMarkerView, map: ReadableMap?) {
+    override fun setAnchor(
+        markerView: MLRNMarkerView,
+        map: ReadableMap?,
+    ) {
         if (map != null) {
             markerView.setAnchor(map.getDouble("x").toFloat(), map.getDouble("y").toFloat())
         }
     }
 
     @ReactProp(name = "offset")
-    override fun setOffset(markerView: MLRNMarkerView, map: ReadableMap?) {
+    override fun setOffset(
+        markerView: MLRNMarkerView,
+        map: ReadableMap?,
+    ) {
         if (map != null) {
             markerView.setOffset(map.getDouble("x").toFloat(), map.getDouble("y").toFloat())
         }
     }
 
-    override fun setZIndex(view: MLRNMarkerView, zIndex: Float) {
+    override fun setZIndex(
+        view: MLRNMarkerView,
+        zIndex: Float,
+    ) {
         super.setZIndex(view, zIndex)
         view.updateZIndex(zIndex)
     }

package/android/src/main/java/org/maplibre/reactnative/components/annotations/markerview/MarkerViewManager.kt

@@ -10,7 +10,7 @@ import org.maplibre.android.maps.MapView
 
 class MarkerViewManager(
     private val mapView: MapView,
-    private val map: MapLibreMap
+    private val map: MapLibreMap,
 ) {
     data class MarkerInfo(
         val view: View,
@@ -18,7 +18,7 @@ class MarkerViewManager(
         var anchorX: Float = 0f,
         var anchorY: Float = 0f,
         var offsetX: Float = 0f,
-        var offsetY: Float = 0f
+        var offsetY: Float = 0f,
     )
 
     private val markers = mutableListOf<MarkerInfo>()
@@ -30,7 +30,7 @@ class MarkerViewManager(
         anchorX: Float = 0f,
         anchorY: Float = 0f,
         offsetX: Float = 0f,
-        offsetY: Float = 0f
+        offsetY: Float = 0f,
     ): MarkerInfo {
         val markerInfo = MarkerInfo(view, latLng, anchorX, anchorY, offsetX, offsetY)
         markers.add(markerInfo)
@@ -81,22 +81,31 @@ class MarkerViewManager(
         view.y = screenPos.y - anchorOffsetY + marker.offsetY
     }
 
-    fun findMarkerByView(view: View): MarkerInfo? {
-        return markers.find { it.view == view }
-    }
+    fun findMarkerByView(view: View): MarkerInfo? = markers.find { it.view == view }
 
-    fun updateMarkerCoordinate(markerInfo: MarkerInfo, latLng: LatLng) {
+    fun updateMarkerCoordinate(
+        markerInfo: MarkerInfo,
+        latLng: LatLng,
+    ) {
         markerInfo.latLng = latLng
         updateMarkerPosition(markerInfo)
     }
 
-    fun updateMarkerAnchor(markerInfo: MarkerInfo, anchorX: Float, anchorY: Float) {
+    fun updateMarkerAnchor(
+        markerInfo: MarkerInfo,
+        anchorX: Float,
+        anchorY: Float,
+    ) {
         markerInfo.anchorX = anchorX
         markerInfo.anchorY = anchorY
         updateMarkerPosition(markerInfo)
     }
 
-    fun updateMarkerOffset(markerInfo: MarkerInfo, offsetX: Float, offsetY: Float) {
+    fun updateMarkerOffset(
+        markerInfo: MarkerInfo,
+        offsetX: Float,
+        offsetY: Float,
+    ) {
         markerInfo.offsetX = offsetX
         markerInfo.offsetY = offsetY
         updateMarkerPosition(markerInfo)