@maplibre/maplibre-react-native 11.0.0-alpha.9 → 11.0.0-beta.10

package/MapLibreReactNative.podspec

@@ -3,7 +3,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 # Global Variable Defaults
-$MLRN_NATIVE_VERSION ||= "6.17.1"
+$MLRN_NATIVE_VERSION ||= "6.22.1"
 $MLRN_SPM_SPEC ||= {
   url: "https://github.com/maplibre/maplibre-gl-native-distribution",
   requirement: {
@@ -22,9 +22,9 @@ def $MLRN._add_spm_to_target(project, target, url, requirement, product_name)
   if !pkg
     pkg = project.new(pkg_class)
     pkg.repositoryURL = url
-    pkg.requirement = requirement
     project.root_object.package_references << pkg
   end
+  pkg.requirement = requirement
   ref = target.package_product_dependencies.find { |r| r.class == ref_class && r.package == pkg && r.product_name == product_name }
   if !ref
     ref = project.new(ref_class)
@@ -73,7 +73,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/maplibre/maplibre-react-native.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,cpp}"
-  s.public_header_files = "ios/MLRNCustomHeaders.h"
+  s.private_header_files = "ios/**/*.h"
 
  install_modules_dependencies(s)
 end

package/README.md

@@ -18,11 +18,9 @@ _React Native library for creating maps
 with [MapLibre Native for Android & iOS](https://github.com/maplibre/maplibre-gl-native)._
 
 > [!IMPORTANT]
-> Support for the new architecture with v10 is only through the interoperability layer. There are still quite a few
-> [issues](https://github.com/maplibre/maplibre-react-native/issues?q=is%3Aissue%20state%3Aopen%20type%3ABug%20label%3A%22Architecture%3A%20New%22),
-> when used with the new architecture. Switch to the v11 alpha releases on the
-> [`alpha`](https://github.com/maplibre/maplibre-react-native/tree/alpha) branch for better support of the new
-> architecture.
+> This is the v11 beta branch, which **only supports the new architecture**.
+>
+> Please refer to the [v11 migration guide](https://github.com/maplibre/maplibre-react-native/blob/beta/docs/content/setup/migrations/v11.md) for upgrading.
 
 This project originated as a fork of [rnmapbox](https://github.com/rnmapbox/maps), a community-maintained
 React Native library for building maps with the Mapbox iOS and Android mobile SDKs. The original library

package/android/build.gradle

@@ -96,9 +96,7 @@ dependencies {
     implementation("org.maplibre.gl:android-plugin-annotation-v9:${getConfigurableExtOrDefault('pluginVersion')}") {
         exclude(group: "org.maplibre.gl", module: "android-sdk")
     }
-    implementation("org.maplibre.gl:android-plugin-markerview-v9:${getConfigurableExtOrDefault('pluginVersion')}") {
-        exclude(group: "org.maplibre.gl", module: "android-sdk")
-    }
+    // Note: markerview plugin removed - using native implementation instead
 
     // Dependencies
     implementation "org.maplibre.gl:android-sdk-turf:${getConfigurableExtOrDefault('turfVersion')}"

package/android/gradle.properties

@@ -5,7 +5,7 @@ org.maplibre.reactnative.compileSdkVersion=35
 org.maplibre.reactnative.ndkVersion=27.1.12297006
 
 # MapLibre React Native
-org.maplibre.reactnative.nativeVersion=11.12.1
+org.maplibre.reactnative.nativeVersion=12.2.3
 org.maplibre.reactnative.nativeVariant=opengl
 org.maplibre.reactnative.pluginVersion=3.0.2
 org.maplibre.reactnative.turfVersion=6.0.1

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 </manifest>

package/android/src/main/java/org/maplibre/reactnative/MLRNPackage.kt

@@ -6,133 +6,166 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
-import org.maplibre.reactnative.components.annotation.MLRNCalloutManager
-import org.maplibre.reactnative.components.annotation.MLRNMarkerViewManager
-import org.maplibre.reactnative.components.annotation.MLRNPointAnnotationManager
+import org.maplibre.reactnative.components.annotations.callout.MLRNCalloutManager
+import org.maplibre.reactnative.components.annotations.markerview.MLRNMarkerViewManager
+import org.maplibre.reactnative.components.annotations.pointannotation.MLRNPointAnnotationManager
 import org.maplibre.reactnative.components.camera.MLRNCameraManager
 import org.maplibre.reactnative.components.camera.MLRNCameraModule
 import org.maplibre.reactnative.components.images.MLRNImagesManager
+import org.maplibre.reactnative.components.layer.MLRNLayerManager
 import org.maplibre.reactnative.components.location.MLRNNativeUserLocationManager
 import org.maplibre.reactnative.components.mapview.MLRNAndroidTextureMapViewManager
 import org.maplibre.reactnative.components.mapview.MLRNMapViewManager
 import org.maplibre.reactnative.components.mapview.MLRNMapViewModule
-import org.maplibre.reactnative.components.styles.layers.MLRNBackgroundLayerManager
-import org.maplibre.reactnative.components.styles.layers.MLRNCircleLayerManager
-import org.maplibre.reactnative.components.styles.layers.MLRNFillExtrusionLayerManager
-import org.maplibre.reactnative.components.styles.layers.MLRNFillLayerManager
-import org.maplibre.reactnative.components.styles.layers.MLRNHeatmapLayerManager
-import org.maplibre.reactnative.components.styles.layers.MLRNLineLayerManager
-import org.maplibre.reactnative.components.styles.layers.MLRNRasterLayerManager
-import org.maplibre.reactnative.components.styles.layers.MLRNSymbolLayerManager
-import org.maplibre.reactnative.components.styles.light.MLRNLightManager
-import org.maplibre.reactnative.components.styles.sources.MLRNImageSourceManager
-import org.maplibre.reactnative.components.styles.sources.MLRNRasterSourceManager
-import org.maplibre.reactnative.components.styles.sources.MLRNShapeSourceManager
-import org.maplibre.reactnative.components.styles.sources.MLRNVectorSourceManager
+import org.maplibre.reactnative.components.sources.geojsonsource.MLRNGeoJSONSourceManager
+import org.maplibre.reactnative.components.sources.geojsonsource.MLRNGeoJSONSourceModule
+import org.maplibre.reactnative.components.sources.imagesource.MLRNImageSourceManager
+import org.maplibre.reactnative.components.sources.tilesources.rastersource.MLRNRasterSourceManager
+import org.maplibre.reactnative.components.sources.tilesources.vectorsource.MLRNVectorSourceManager
+import org.maplibre.reactnative.components.sources.tilesources.vectorsource.MLRNVectorSourceModule
 import org.maplibre.reactnative.modules.MLRNLocationModule
-import org.maplibre.reactnative.modules.MLRNLogging
-import org.maplibre.reactnative.modules.MLRNModule
+import org.maplibre.reactnative.modules.MLRNLogModule
+import org.maplibre.reactnative.modules.MLRNNetworkModule
 import org.maplibre.reactnative.modules.MLRNOfflineModule
-import org.maplibre.reactnative.modules.MLRNSnapshotModule
+import org.maplibre.reactnative.modules.MLRNStaticMapModule
 import org.maplibre.reactnative.utils.ReactTagResolver
 
-
 class MLRNPackage : BaseReactPackage() {
     override fun getModule(
         name: String,
-        reactContext: ReactApplicationContext
+        reactContext: ReactApplicationContext,
     ): NativeModule? {
         when (name) {
-            MLRNModule.REACT_CLASS -> return MLRNModule(reactContext)
             MLRNMapViewModule.NAME -> return MLRNMapViewModule(
                 reactContext,
-                getReactTagResolver(reactContext)
+                getReactTagResolver(reactContext),
             )
+
             MLRNCameraModule.NAME -> return MLRNCameraModule(
                 reactContext,
-                getReactTagResolver(reactContext)
+                getReactTagResolver(reactContext),
             )
 
+            MLRNGeoJSONSourceModule.NAME -> return MLRNGeoJSONSourceModule(
+                reactContext,
+                getReactTagResolver(reactContext),
+            )
 
-            MLRNOfflineModule.REACT_CLASS -> return MLRNOfflineModule(reactContext)
-            MLRNSnapshotModule.NAME -> return MLRNSnapshotModule(reactContext)
-            MLRNLocationModule.REACT_CLASS -> return MLRNLocationModule(reactContext)
-            MLRNLogging.REACT_CLASS -> return MLRNLogging(reactContext)
-        }
+            MLRNVectorSourceModule.NAME -> return MLRNVectorSourceModule(
+                reactContext,
+                getReactTagResolver(reactContext),
+            )
 
-        return null
-    }
+            MLRNOfflineModule.NAME -> return MLRNOfflineModule(reactContext)
 
-    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
-        return ReactModuleInfoProvider {
-            val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+            MLRNStaticMapModule.NAME -> return MLRNStaticMapModule(reactContext)
 
-            moduleInfos[MLRNModule.REACT_CLASS] = ReactModuleInfo(
-                MLRNModule.REACT_CLASS,
-                MLRNModule.REACT_CLASS,
-                canOverrideExistingModule = false,
-                needsEagerInit = false,
-                isCxxModule = false,
-                isTurboModule = false
-            )
+            MLRNLocationModule.NAME -> return MLRNLocationModule(reactContext)
 
-            moduleInfos[MLRNMapViewModule.NAME] = ReactModuleInfo(
-                MLRNMapViewModule.NAME,
-                MLRNMapViewModule.NAME,
-                canOverrideExistingModule = false,
-                needsEagerInit = false,
-                isCxxModule = false,
-                isTurboModule = true
-            )
+            MLRNLogModule.NAME -> return MLRNLogModule(reactContext)
 
-            moduleInfos[MLRNCameraModule.NAME] = ReactModuleInfo(
-                MLRNCameraModule.NAME,
-                MLRNCameraModule.NAME,
-                canOverrideExistingModule = false,
-                needsEagerInit = false,
-                isCxxModule = false,
-                isTurboModule = true
-            )
-
-            moduleInfos[MLRNOfflineModule.REACT_CLASS] = ReactModuleInfo(
-                MLRNOfflineModule.REACT_CLASS,
-                MLRNOfflineModule.REACT_CLASS,
-                canOverrideExistingModule = false,
-                needsEagerInit = false,
-                isCxxModule = false,
-                isTurboModule = false
-            )
+            MLRNNetworkModule.NAME -> return MLRNNetworkModule(reactContext)
+        }
 
-            moduleInfos[MLRNSnapshotModule.NAME] = ReactModuleInfo(
-                MLRNSnapshotModule.NAME,
-                MLRNSnapshotModule.NAME,
-                canOverrideExistingModule = false,
-                needsEagerInit = false,
-                isCxxModule = false,
-                isTurboModule = true
-            )
+        return null
+    }
 
-            moduleInfos[MLRNLocationModule.REACT_CLASS] = ReactModuleInfo(
-                MLRNLocationModule.REACT_CLASS,
-                MLRNLocationModule.REACT_CLASS,
-                canOverrideExistingModule = false,
-                needsEagerInit = false,
-                isCxxModule = false,
-                isTurboModule = false
-            )
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider =
+        ReactModuleInfoProvider {
+            val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
 
-            moduleInfos[MLRNLogging.REACT_CLASS] = ReactModuleInfo(
-                MLRNLogging.REACT_CLASS,
-                MLRNLogging.REACT_CLASS,
-                canOverrideExistingModule = false,
-                needsEagerInit = false,
-                isCxxModule = false,
-                isTurboModule = false
-            )
+            moduleInfos[MLRNMapViewModule.NAME] =
+                ReactModuleInfo(
+                    MLRNMapViewModule.NAME,
+                    MLRNMapViewModule.NAME,
+                    canOverrideExistingModule = false,
+                    needsEagerInit = false,
+                    isCxxModule = false,
+                    isTurboModule = true,
+                )
+
+            moduleInfos[MLRNCameraModule.NAME] =
+                ReactModuleInfo(
+                    MLRNCameraModule.NAME,
+                    MLRNCameraModule.NAME,
+                    canOverrideExistingModule = false,
+                    needsEagerInit = false,
+                    isCxxModule = false,
+                    isTurboModule = true,
+                )
+
+            moduleInfos[MLRNGeoJSONSourceModule.NAME] =
+                ReactModuleInfo(
+                    MLRNGeoJSONSourceModule.NAME,
+                    MLRNGeoJSONSourceModule.NAME,
+                    canOverrideExistingModule = false,
+                    needsEagerInit = false,
+                    isCxxModule = false,
+                    isTurboModule = true,
+                )
+
+            moduleInfos[MLRNVectorSourceModule.NAME] =
+                ReactModuleInfo(
+                    MLRNVectorSourceModule.NAME,
+                    MLRNVectorSourceModule.NAME,
+                    canOverrideExistingModule = false,
+                    needsEagerInit = false,
+                    isCxxModule = false,
+                    isTurboModule = true,
+                )
+
+            moduleInfos[MLRNOfflineModule.NAME] =
+                ReactModuleInfo(
+                    MLRNOfflineModule.NAME,
+                    MLRNOfflineModule.NAME,
+                    canOverrideExistingModule = false,
+                    needsEagerInit = false,
+                    isCxxModule = false,
+                    isTurboModule = true,
+                )
+
+            moduleInfos[MLRNStaticMapModule.NAME] =
+                ReactModuleInfo(
+                    MLRNStaticMapModule.NAME,
+                    MLRNStaticMapModule.NAME,
+                    canOverrideExistingModule = false,
+                    needsEagerInit = false,
+                    isCxxModule = false,
+                    isTurboModule = true,
+                )
+
+            moduleInfos[MLRNLocationModule.NAME] =
+                ReactModuleInfo(
+                    MLRNLocationModule.NAME,
+                    MLRNLocationModule.NAME,
+                    canOverrideExistingModule = false,
+                    needsEagerInit = false,
+                    isCxxModule = false,
+                    isTurboModule = true,
+                )
+
+            moduleInfos[MLRNLogModule.NAME] =
+                ReactModuleInfo(
+                    MLRNLogModule.NAME,
+                    MLRNLogModule.NAME,
+                    canOverrideExistingModule = false,
+                    needsEagerInit = false,
+                    isCxxModule = false,
+                    isTurboModule = true,
+                )
+
+            moduleInfos[MLRNNetworkModule.NAME] =
+                ReactModuleInfo(
+                    MLRNNetworkModule.NAME,
+                    MLRNNetworkModule.NAME,
+                    canOverrideExistingModule = false,
+                    needsEagerInit = false,
+                    isCxxModule = false,
+                    isTurboModule = true,
+                )
 
             moduleInfos
         }
-    }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
         val managers: MutableList<ViewManager<*, *>> = ArrayList()
@@ -142,29 +175,21 @@ class MLRNPackage : BaseReactPackage() {
         managers.add(MLRNMapViewManager(reactContext))
         managers.add(MLRNMarkerViewManager(reactContext))
         managers.add(MLRNAndroidTextureMapViewManager(reactContext))
-        managers.add(MLRNLightManager())
         managers.add(MLRNPointAnnotationManager(reactContext))
         managers.add(MLRNCalloutManager())
         managers.add(MLRNNativeUserLocationManager())
 
         // sources
-        managers.add(MLRNVectorSourceManager(reactContext))
-        managers.add(MLRNShapeSourceManager(reactContext))
+        managers.add(MLRNImageSourceManager(reactContext))
+        managers.add(MLRNGeoJSONSourceManager(reactContext))
         managers.add(MLRNRasterSourceManager(reactContext))
-        managers.add(MLRNImageSourceManager())
+        managers.add(MLRNVectorSourceManager(reactContext))
 
         // images
         managers.add(MLRNImagesManager(reactContext))
 
         // layers
-        managers.add(MLRNFillLayerManager())
-        managers.add(MLRNFillExtrusionLayerManager())
-        managers.add(MLRNHeatmapLayerManager())
-        managers.add(MLRNLineLayerManager())
-        managers.add(MLRNCircleLayerManager())
-        managers.add(MLRNSymbolLayerManager())
-        managers.add(MLRNRasterLayerManager())
-        managers.add(MLRNBackgroundLayerManager())
+        managers.add(MLRNLayerManager())
 
         return managers
     }

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/AbstractMapFeature.kt

@@ -0,0 +1,13 @@
+package org.maplibre.reactnative.components
+
+import android.content.Context
+import com.facebook.react.views.view.ReactViewGroup
+import org.maplibre.reactnative.components.mapview.MLRNMapView
+
+abstract class AbstractMapFeature(
+    context: Context?,
+) : ReactViewGroup(context) {
+    abstract fun addToMap(mapView: MLRNMapView)
+
+    abstract fun removeFromMap(mapView: MLRNMapView)
+}

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

@@ -0,0 +1,8 @@
+package org.maplibre.reactnative.components.annotations.callout
+
+import android.content.Context
+import com.facebook.react.views.view.ReactViewGroup
+
+class MLRNCallout(
+    context: Context,
+) : ReactViewGroup(context)

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

@@ -0,0 +1,26 @@
+package org.maplibre.reactnative.components.annotations.callout
+
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.MLRNCalloutManagerDelegate
+import com.facebook.react.viewmanagers.MLRNCalloutManagerInterface
+
+@ReactModule(name = MLRNCalloutManager.REACT_CLASS)
+class MLRNCalloutManager :
+    ViewGroupManager<MLRNCallout>(),
+    MLRNCalloutManagerInterface<MLRNCallout> {
+    private val delegate: MLRNCalloutManagerDelegate<MLRNCallout, MLRNCalloutManager> =
+        MLRNCalloutManagerDelegate(this)
+
+    override fun getDelegate(): ViewManagerDelegate<MLRNCallout> = delegate
+
+    companion object {
+        const val REACT_CLASS: String = "MLRNCallout"
+    }
+
+    override fun getName(): String = REACT_CLASS
+
+    override fun createViewInstance(reactContext: ThemedReactContext): MLRNCallout = MLRNCallout(reactContext)
+}