@maplibre/maplibre-react-native 11.0.0-beta.2 → 11.0.0-beta.21

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

@@ -13,6 +13,9 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactContext
@@ -37,6 +40,8 @@ import org.maplibre.android.maps.Style.OnStyleLoaded
 import org.maplibre.android.plugins.annotation.OnSymbolDragListener
 import org.maplibre.android.plugins.annotation.Symbol
 import org.maplibre.android.plugins.annotation.SymbolManager
+import org.maplibre.android.plugins.scalebar.ScaleBarOptions
+import org.maplibre.android.plugins.scalebar.ScaleBarPlugin
 import org.maplibre.android.style.expressions.Expression
 import org.maplibre.android.style.layers.Layer
 import org.maplibre.android.style.layers.Property
@@ -91,7 +96,6 @@ open class MLRNMapView(
     OnMapReadyCallback,
     MapLibreMap.OnMapClickListener,
     MapLibreMap.OnMapLongClickListener,
-    MapView.OnCameraIsChangingListener,
     MapView.OnCameraDidChangeListener,
     MapView.OnWillStartLoadingMapListener,
     MapView.OnDidFailLoadingMapListener,
@@ -154,10 +158,14 @@ open class MLRNMapView(
     private var compassMargins: IntArray? = null
     private var compassHiddenFacingNorth: Boolean? = null
 
-    private var symbolManager: SymbolManager? = null
+    private var scaleBarEnabled: Boolean? = null
+    private var scaleBarMarginTop: Float? = null
+    private var scaleBarMarginLeft: Float? = null
+    private var scaleBarPlugin: ScaleBarPlugin? = null
+
+    private var windowInsets: WindowInsetsCompat? = null
 
-    private var activePointAnnotationAnnotationId: Long? = null
-    private var pointAnnotationClicked = false
+    private var symbolManager: SymbolManager? = null
 
     private var markerViewManager: MarkerViewManager? = null
     private var offscreenAnnotationViewContainer: ViewGroup? = null
@@ -195,6 +203,22 @@ open class MLRNMapView(
         destroyed = true
     }
 
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        ViewCompat.setOnApplyWindowInsetsListener(this) { _, insets ->
+            windowInsets = insets
+            updateUISettings()
+            updateScaleBar()
+            insets
+        }
+        ViewCompat.requestApplyInsets(this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        ViewCompat.setOnApplyWindowInsetsListener(this, null)
+    }
+
     fun addFeature(
         childView: View?,
         childPosition: Int,
@@ -264,10 +288,6 @@ open class MLRNMapView(
                     }
 
                     is MLRNPointAnnotation -> {
-                        if (child.feature.annotationId == activePointAnnotationAnnotationId) {
-                            activePointAnnotationAnnotationId = null
-                        }
-
                         child.feature.mapLibreId?.let { pointAnnotations.remove(it) }
                     }
 
@@ -324,18 +344,11 @@ open class MLRNMapView(
         mapLibreMap!!.moveCamera(cameraUpdate, callback)
     }
 
-    fun getPointAnnotationByMarkerID(markerID: Long): MLRNPointAnnotation? {
-        for (key in pointAnnotations.keys) {
-            val annotation = pointAnnotations[key]
-
-            if (annotation != null && markerID == annotation.annotationId) {
-                return annotation
-            }
+    fun getPointAnnotationByAnnotationId(annotationId: Long): MLRNPointAnnotation? =
+        pointAnnotations.values.find {
+            it.annotationId == annotationId
         }
 
-        return null
-    }
-
     fun getSymbolManager(): SymbolManager = symbolManager!!
 
     interface FoundLayerCallback {
@@ -361,7 +374,6 @@ open class MLRNMapView(
 
         setLifecycleListeners()
 
-        addOnCameraIsChangingListener(this)
         addOnCameraDidChangeListener(this)
         addOnDidFailLoadingMapListener(this)
         addOnDidFinishLoadingMapListener(this)
@@ -402,6 +414,37 @@ open class MLRNMapView(
     override fun onMapReady(mapLibreMap: MapLibreMap) {
         this.mapLibreMap = mapLibreMap
 
+        val uiSettings = mapLibreMap.uiSettings
+        attributionGravity = Gravity.END or Gravity.BOTTOM
+        attributionMargin =
+            intArrayOf(
+                0,
+                0,
+                (4 * displayDensity).roundToInt(),
+                (4 * displayDensity).roundToInt(),
+            )
+
+        if (logoGravity == null) logoGravity = uiSettings.logoGravity
+        if (logoMargins == null) {
+            logoMargins =
+                intArrayOf(
+                    uiSettings.logoMarginLeft,
+                    uiSettings.logoMarginTop,
+                    uiSettings.logoMarginRight,
+                    uiSettings.logoMarginBottom,
+                )
+        }
+        if (compassGravity == null) compassGravity = uiSettings.compassGravity
+        if (compassMargins == null) {
+            compassMargins =
+                intArrayOf(
+                    uiSettings.compassMarginLeft,
+                    uiSettings.compassMarginTop,
+                    uiSettings.compassMarginRight,
+                    uiSettings.compassMarginBottom,
+                )
+        }
+
         mapStyle?.let { style ->
             mapLibreMap.setStyle(
                 if (ConvertUtils.isJSONValid(style)) {
@@ -425,12 +468,17 @@ open class MLRNMapView(
         updatePreferredFramesPerSecond()
         updateInsets()
         updateUISettings()
+        updateScaleBar()
 
         mapLibreMap.addOnCameraMoveStartedListener { reason ->
             cameraChangeTracker.setReason(reason)
             handleMapChangedEvent("onRegionWillChange", true)
         }
 
+        mapLibreMap.addOnCameraMoveListener {
+            handleMapChangedEvent("onRegionIsChanging", true)
+        }
+
         mapLibreMap.addOnMoveListener(
             object : MapLibreMap.OnMoveListener {
                 override fun onMoveBegin(detector: MoveGestureDetector) {
@@ -439,8 +487,7 @@ open class MLRNMapView(
                 }
 
                 override fun onMove(detector: MoveGestureDetector) {
-                    cameraChangeTracker.setReason(CameraChangeTracker.USER_GESTURE)
-                    handleMapChangedEvent("onRegionIsChanging", true)
+                    // Handled by mapLibreMap.addOnCameraMoveListener
                 }
 
                 override fun onMoveEnd(detector: MoveGestureDetector) {
@@ -465,28 +512,24 @@ open class MLRNMapView(
         symbolManager = SymbolManager(this, this.mapLibreMap!!, style)
         symbolManager!!.setIconAllowOverlap(true)
         symbolManager!!.addClickListener { symbol ->
-            onMarkerClick(symbol)
+            onPointAnnotationClick(symbol)
             true
         }
         symbolManager!!.addDragListener(
             object : OnSymbolDragListener {
                 override fun onAnnotationDragStarted(symbol: Symbol) {
-                    pointAnnotationClicked = true
-                    val selectedMarkerID = symbol.id
-                    val annotation = getPointAnnotationByMarkerID(selectedMarkerID)
+                    val selectedPointAnnotationID = symbol.id
+                    val annotation = getPointAnnotationByAnnotationId(selectedPointAnnotationID)
                     annotation?.onDragStart()
                 }
 
                 override fun onAnnotationDrag(symbol: Symbol) {
-                    val selectedMarkerID = symbol.id
-                    val annotation = getPointAnnotationByMarkerID(selectedMarkerID)
+                    val annotation = getPointAnnotationByAnnotationId(symbol.id)
                     annotation?.onDrag()
                 }
 
                 override fun onAnnotationDragFinished(symbol: Symbol) {
-                    pointAnnotationClicked = false
-                    val selectedMarkerID = symbol.id
-                    val annotation = getPointAnnotationByMarkerID(selectedMarkerID)
+                    val annotation = getPointAnnotationByAnnotationId(symbol.id)
                     annotation?.onDragEnd()
                 }
             },
@@ -544,22 +587,29 @@ open class MLRNMapView(
                 markerViewManager!!.restoreViews()
             }
         }
+
+        if (changed) {
+            handler.post {
+                updateUISettings()
+                updateScaleBar()
+            }
+        }
     }
 
     override fun onMapClick(latLng: LatLng): Boolean {
-        if (pointAnnotationClicked) {
-            pointAnnotationClicked = false
-        }
+        pointAnnotations.values.find { it.selected }?.let { deselectAnnotation(it) }
 
-        if (activePointAnnotationAnnotationId != null) {
-            val active = pointAnnotations.values.find { it.annotationId == activePointAnnotationAnnotationId }
-            if (active != null) {
-                deselectAnnotation(active)
+        val screenPoint = mapLibreMap!!.projection.toScreenLocation(latLng)
+
+        if (markerViewManager != null) {
+            val hitMarker = markerViewManager!!.findMarkerAtPoint(screenPoint)
+            if (hitMarker != null) {
+                val pressPoint = PointF(screenPoint.x / displayDensity, screenPoint.y / displayDensity)
+                hitMarker.markerView.onPress(latLng, pressPoint)
+                return true
             }
         }
 
-        val screenPoint = mapLibreMap!!.projection.toScreenLocation(latLng)
-
         val hits: MutableMap<String, MutableList<Feature>?> = HashMap()
         val hitPressableSources: MutableList<MLRNPressableSource<*>> = ArrayList()
         for (pressableSource in this.pressableSources) {
@@ -567,10 +617,10 @@ open class MLRNMapView(
 
             val pointWithHitbox =
                 RectF(
-                    screenPoint.x - hitbox.left,
-                    screenPoint.y - hitbox.top,
-                    screenPoint.x + hitbox.right,
-                    screenPoint.y + hitbox.bottom,
+                    screenPoint.x - (hitbox.left * displayDensity),
+                    screenPoint.y - (hitbox.top * displayDensity),
+                    screenPoint.x + (hitbox.right * displayDensity),
+                    screenPoint.y + (hitbox.bottom * displayDensity),
                 )
 
             val features =
@@ -581,6 +631,9 @@ open class MLRNMapView(
             }
         }
 
+        screenPoint.x /= this.displayDensity
+        screenPoint.y /= this.displayDensity
+
         if (hits.isNotEmpty()) {
             val source = getPressableSourceWithHighestZIndex(hitPressableSources)
             if (source != null && source.hasOnPress) {
@@ -599,11 +652,14 @@ open class MLRNMapView(
     }
 
     override fun onMapLongClick(latLng: LatLng): Boolean {
-        if (pointAnnotationClicked) {
-            pointAnnotationClicked = false
+        val screenPoint = mapLibreMap!!.projection.toScreenLocation(latLng)
+
+        if (markerViewManager?.isPointInsideMarker(screenPoint) == true) {
+            return true
         }
 
-        val screenPoint = mapLibreMap!!.projection.toScreenLocation(latLng)
+        screenPoint.x /= this.displayDensity
+        screenPoint.y /= this.displayDensity
 
         val event = MapPressEvent(surfaceId, id, "onLongPress", latLng, screenPoint)
         eventDispatcher?.dispatchEvent(event)
@@ -611,42 +667,26 @@ open class MLRNMapView(
         return false
     }
 
-    fun onMarkerClick(symbol: Symbol) {
-        pointAnnotationClicked = true
-        val selectedMarkerID = symbol.id
-
-        var activeAnnotation: MLRNPointAnnotation? = null
-        var nextActiveAnnotation: MLRNPointAnnotation? = null
+    fun onPointAnnotationClick(nextSymbol: Symbol) {
+        val nextSelectedPointAnnotation =
+            getPointAnnotationByAnnotationId(nextSymbol.id) ?: return
 
-        for (key in pointAnnotations.keys) {
-            val pointAnnotation = pointAnnotations[key]
-            val currentAnnotationId = pointAnnotation!!.annotationId
+        nextSelectedPointAnnotation.onPress()
 
-            if (activePointAnnotationAnnotationId == currentAnnotationId) {
-                activeAnnotation = pointAnnotation
-            }
-
-            if (selectedMarkerID == currentAnnotationId && activePointAnnotationAnnotationId != currentAnnotationId) {
-                nextActiveAnnotation = pointAnnotation
-            }
-        }
-
-        if (activeAnnotation != null) {
-            deselectAnnotation(activeAnnotation)
-        }
-
-        if (nextActiveAnnotation != null) {
-            selectAnnotation(nextActiveAnnotation)
+        if (!nextSelectedPointAnnotation.selected) {
+            selectAnnotation(nextSelectedPointAnnotation)
         }
     }
 
-    fun selectAnnotation(annotation: MLRNPointAnnotation) {
-        activePointAnnotationAnnotationId = annotation.annotationId
-        annotation.onSelect(true)
+    fun selectAnnotation(nextSelectedPointAnnotation: MLRNPointAnnotation) {
+        pointAnnotations.values
+            .filter { it.selected && it !== nextSelectedPointAnnotation }
+            .forEach { it.onDeselect() }
+
+        nextSelectedPointAnnotation.onSelect()
     }
 
     fun deselectAnnotation(annotation: MLRNPointAnnotation) {
-        activePointAnnotationAnnotationId = null
         annotation.onDeselect()
     }
 
@@ -654,10 +694,6 @@ open class MLRNMapView(
         cameraChangeTracker.isAnimating = animated
     }
 
-    override fun onCameraIsChanging() {
-        handleMapChangedEvent("onRegionIsChanging", true)
-    }
-
     override fun onWillStartLoadingMap() {
         handleMapChangedEvent("onWillStartLoadingMap")
     }
@@ -825,13 +861,12 @@ open class MLRNMapView(
             if (position.hasKey("right")) gravity = gravity or Gravity.END
             if (position.hasKey("top")) gravity = gravity or Gravity.TOP
             if (position.hasKey("bottom")) gravity = gravity or Gravity.BOTTOM
-            val density = this.displayDensity
             val margins =
                 intArrayOf(
-                    if (position.hasKey("left")) (density * position.getInt("left")).roundToInt() else 0,
-                    if (position.hasKey("top")) (density * position.getInt("top")).roundToInt() else 0,
-                    if (position.hasKey("right")) (density * position.getInt("right")).roundToInt() else 0,
-                    if (position.hasKey("bottom")) (density * position.getInt("bottom")).roundToInt() else 0,
+                    if (position.hasKey("left")) (displayDensity * position.getInt("left")).roundToInt() else 0,
+                    if (position.hasKey("top")) (displayDensity * position.getInt("top")).roundToInt() else 0,
+                    if (position.hasKey("right")) (displayDensity * position.getInt("right")).roundToInt() else 0,
+                    if (position.hasKey("bottom")) (displayDensity * position.getInt("bottom")).roundToInt() else 0,
                 )
             setGravity(gravity)
             setMargins(margins)
@@ -890,6 +925,39 @@ open class MLRNMapView(
         updateUISettings()
     }
 
+    fun setReactScaleBar(value: Boolean) {
+        scaleBarEnabled = value
+        updateScaleBar()
+    }
+
+    fun setReactScaleBarPosition(position: ReadableMap?) {
+        if (position == null) {
+            scaleBarMarginTop = null
+            scaleBarMarginLeft = null
+        } else {
+            scaleBarMarginTop = if (position.hasKey("top")) (displayDensity * position.getInt("top")) else 0f
+            scaleBarMarginLeft = if (position.hasKey("left")) (displayDensity * position.getInt("left")) else 0f
+        }
+        updateScaleBar()
+    }
+
+    private fun updateScaleBar() {
+        val map = mapLibreMap ?: return
+
+        if (scaleBarPlugin == null) {
+            scaleBarPlugin = ScaleBarPlugin(this, map)
+        }
+
+        val viewInsets = getSystemInsetsForView()
+        val options = ScaleBarOptions(context)
+        options.setMarginTop((scaleBarMarginTop ?: (8 * displayDensity)) + viewInsets.top)
+        options.setMarginLeft((scaleBarMarginLeft ?: (10 * displayDensity)) + viewInsets.left)
+        scaleBarPlugin!!.create(options)
+        scaleBarPlugin!!.isEnabled = scaleBarEnabled ?: false
+
+        reflow()
+    }
+
     fun getCenter(): WritableArray {
         val cameraPosition = mapLibreMap!!.cameraPosition
         val center = cameraPosition.target!!
@@ -937,8 +1005,7 @@ open class MLRNMapView(
         layers: ReadableArray?,
         filter: Expression?,
     ): WritableArray {
-        val density = this.displayDensity
-        val screenPoint = PointF(point.x * density, point.y * density)
+        val screenPoint = PointF(point.x * displayDensity, point.y * displayDensity)
 
         val features =
             mapLibreMap!!.queryRenderedFeatures(
@@ -981,9 +1048,8 @@ open class MLRNMapView(
 
     fun project(mapCoordinate: LatLng): WritableArray {
         val pointInView = mapLibreMap!!.projection.toScreenLocation(mapCoordinate)
-        val density = this.displayDensity
-        pointInView.x /= density
-        pointInView.y /= density
+        pointInView.x /= displayDensity
+        pointInView.y /= displayDensity
         val payload: WritableArray = Arguments.createArray()
 
         payload.pushDouble(pointInView.x.toDouble())
@@ -993,9 +1059,8 @@ open class MLRNMapView(
     }
 
     fun unproject(pointInView: PointF): WritableArray {
-        val density = this.displayDensity
-        pointInView.x *= density
-        pointInView.y *= density
+        pointInView.x *= displayDensity
+        pointInView.y *= displayDensity
 
         val latLng = mapLibreMap!!.projection.fromScreenLocation(pointInView)
 
@@ -1061,6 +1126,48 @@ open class MLRNMapView(
         mapLibreMap!!.getStyle(onStyleLoaded)
     }
 
+    private fun getSystemInsetsForView(): Insets {
+        val sysInsets =
+            windowInsets?.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout(),
+            )
+                ?: return Insets.NONE
+        if (!isAttachedToWindow || width == 0 || height == 0) return Insets.NONE
+
+        val location = IntArray(2)
+        getLocationOnScreen(location)
+        val screenWidth = rootView.width
+        val screenHeight = rootView.height
+
+        return Insets.of(
+            if (location[0] <= 0) sysInsets.left else 0,
+            if (location[1] <= 0) sysInsets.top else 0,
+            if (location[0] + width >= screenWidth) sysInsets.right else 0,
+            if (location[1] + height >= screenHeight) sysInsets.bottom else 0,
+        )
+    }
+
+    private fun marginsWithInsets(
+        margins: IntArray,
+        gravity: Int,
+    ): IntArray {
+        val viewInsets = getSystemInsetsForView()
+        if (viewInsets == Insets.NONE) return margins
+
+        val absGravity = Gravity.getAbsoluteGravity(gravity, layoutDirection)
+        val isLeft = (absGravity and Gravity.HORIZONTAL_GRAVITY_MASK) == Gravity.LEFT
+        val isRight = (absGravity and Gravity.HORIZONTAL_GRAVITY_MASK) == Gravity.RIGHT
+        val isTop = (absGravity and Gravity.VERTICAL_GRAVITY_MASK) == Gravity.TOP
+        val isBottom = (absGravity and Gravity.VERTICAL_GRAVITY_MASK) == Gravity.BOTTOM
+
+        return intArrayOf(
+            margins[0] + if (isLeft) viewInsets.left else 0,
+            margins[1] + if (isTop) viewInsets.top else 0,
+            margins[2] + if (isRight) viewInsets.right else 0,
+            margins[3] + if (isBottom) viewInsets.bottom else 0,
+        )
+    }
+
     private fun updateUISettings() {
         if (mapLibreMap == null) {
             return
@@ -1108,19 +1215,13 @@ open class MLRNMapView(
             uiSettings.attributionGravity = attributionGravity!!
         }
 
-        if (attributionMargin != null &&
-            (
-                uiSettings.attributionMarginLeft != attributionMargin!![0] || uiSettings.attributionMarginTop != attributionMargin!![1] ||
-                    uiSettings.attributionMarginRight != attributionMargin!![2] ||
-                    uiSettings.attributionMarginBottom != attributionMargin!![3]
-            )
-        ) {
-            uiSettings.setAttributionMargins(
-                attributionMargin!![0],
-                attributionMargin!![1],
-                attributionMargin!![2],
-                attributionMargin!![3],
-            )
+        if (attributionMargin != null) {
+            val adjusted = marginsWithInsets(attributionMargin!!, attributionGravity ?: uiSettings.attributionGravity)
+            if (uiSettings.attributionMarginLeft != adjusted[0] || uiSettings.attributionMarginTop != adjusted[1] ||
+                uiSettings.attributionMarginRight != adjusted[2] || uiSettings.attributionMarginBottom != adjusted[3]
+            ) {
+                uiSettings.setAttributionMargins(adjusted[0], adjusted[1], adjusted[2], adjusted[3])
+            }
         }
 
         if (logoEnabled != null && uiSettings.isLogoEnabled != logoEnabled) {
@@ -1131,19 +1232,13 @@ open class MLRNMapView(
             uiSettings.logoGravity = logoGravity!!
         }
 
-        if (logoMargins != null &&
-            (
-                uiSettings.logoMarginLeft != logoMargins!![0] || uiSettings.logoMarginTop != logoMargins!![1] ||
-                    uiSettings.logoMarginRight != logoMargins!![2] ||
-                    uiSettings.logoMarginBottom != logoMargins!![3]
-            )
-        ) {
-            uiSettings.setLogoMargins(
-                logoMargins!![0],
-                logoMargins!![1],
-                logoMargins!![2],
-                logoMargins!![3],
-            )
+        if (logoMargins != null) {
+            val adjusted = marginsWithInsets(logoMargins!!, logoGravity ?: uiSettings.logoGravity)
+            if (uiSettings.logoMarginLeft != adjusted[0] || uiSettings.logoMarginTop != adjusted[1] ||
+                uiSettings.logoMarginRight != adjusted[2] || uiSettings.logoMarginBottom != adjusted[3]
+            ) {
+                uiSettings.setLogoMargins(adjusted[0], adjusted[1], adjusted[2], adjusted[3])
+            }
         }
 
         if (compassEnabled != null && uiSettings.isCompassEnabled != compassEnabled) {
@@ -1154,19 +1249,13 @@ open class MLRNMapView(
             uiSettings.compassGravity = compassGravity!!
         }
 
-        if (compassMargins != null &&
-            (
-                uiSettings.compassMarginLeft != compassMargins!![0] || uiSettings.compassMarginTop != compassMargins!![1] ||
-                    uiSettings.compassMarginRight != compassMargins!![2] ||
-                    uiSettings.compassMarginBottom != compassMargins!![3]
-            )
-        ) {
-            uiSettings.setCompassMargins(
-                compassMargins!![0],
-                compassMargins!![1],
-                compassMargins!![2],
-                compassMargins!![3],
-            )
+        if (compassMargins != null) {
+            val adjusted = marginsWithInsets(compassMargins!!, compassGravity ?: uiSettings.compassGravity)
+            if (uiSettings.compassMarginLeft != adjusted[0] || uiSettings.compassMarginTop != adjusted[1] ||
+                uiSettings.compassMarginRight != adjusted[2] || uiSettings.compassMarginBottom != adjusted[3]
+            ) {
+                uiSettings.setCompassMargins(adjusted[0], adjusted[1], adjusted[2], adjusted[3])
+            }
         }
         if (compassHiddenFacingNorth != null) {
             uiSettings.setCompassFadeFacingNorth(compassHiddenFacingNorth!!)
@@ -1348,7 +1437,7 @@ open class MLRNMapView(
         }
 
     private fun getPressableSourceWithHighestZIndex(sources: MutableList<MLRNPressableSource<*>>?): MLRNPressableSource<*>? {
-        if (sources == null || sources.isEmpty()) {
+        if (sources.isNullOrEmpty()) {
             return null
         }
 
@@ -1401,10 +1490,10 @@ open class MLRNMapView(
      */
     private fun setUpImage(loadedStyle: Style) {
         loadedStyle.addImage(
-            "MARKER_IMAGE_ID",
+            MLRNPointAnnotation.DEFAULT_MARKER,
             BitmapFactory.decodeResource(
                 this.resources,
-                R.drawable.red_marker,
+                R.drawable.default_marker,
             ),
         )
     }

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

@@ -78,6 +78,8 @@ open class MLRNMapViewManager(
             mViews.remove(reactTag)
         }
 
+        mapView.dispose()
+
         super.onDropViewInstance(mapView)
     }
 
@@ -213,6 +215,22 @@ open class MLRNMapViewManager(
         mapView.setReactCompassHiddenFacingNorth(value)
     }
 
+    @ReactProp(name = "scaleBar")
+    override fun setScaleBar(
+        mapView: MLRNMapView,
+        value: Boolean,
+    ) {
+        mapView.setReactScaleBar(value)
+    }
+
+    @ReactProp(name = "scaleBarPosition")
+    override fun setScaleBarPosition(
+        mapView: MLRNMapView,
+        value: ReadableMap?,
+    ) {
+        mapView.setReactScaleBarPosition(value)
+    }
+
     //endregion
 
     private class MapShadowNode(

package/android/src/main/java/org/maplibre/reactnative/modules/MLRNLogModule.kt

@@ -3,10 +3,12 @@ package org.maplibre.reactnative.modules
 import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModule
 import org.maplibre.android.log.Logger
 import org.maplibre.android.log.LoggerDefinition
 import org.maplibre.reactnative.NativeLogModuleSpec
 
+@ReactModule(name = MLRNLogModule.NAME)
 class MLRNLogModule(
     reactContext: ReactApplicationContext,
 ) : NativeLogModuleSpec(