@lugg/maps 1.0.0-beta.12 → 1.0.0-beta.14

package/android/src/main/java/com/luggmaps/LuggPolylineView.kt

@@ -8,6 +8,7 @@ import com.google.android.gms.maps.model.Polyline
 
 interface LuggPolylineViewDelegate {
   fun polylineViewDidUpdate(polylineView: LuggPolylineView)
+  fun polylineViewDidDrop(polylineView: LuggPolylineView)
 }
 
 data class AnimatedOptions(val duration: Long = 2150L, val easing: String = "linear", val trailLength: Float = 1f, val delay: Long = 0L)
@@ -67,8 +68,8 @@ class LuggPolylineView(context: Context) : ReactViewGroup(context) {
   }
 
   fun onDropViewInstance() {
+    delegate?.polylineViewDidDrop(this)
     delegate = null
-    polyline?.remove()
     polyline = null
   }
 }

package/android/src/main/java/com/luggmaps/core/GoogleMapProvider.kt

@@ -598,6 +598,10 @@ class GoogleMapProvider(private val context: Context) :
     syncPolylineView(polylineView)
   }
 
+  override fun polylineViewDidDrop(polylineView: LuggPolylineView) {
+    teardownPolyline(polylineView)
+  }
+
   // endregion
 
   // region PolygonViewDelegate
@@ -773,8 +777,12 @@ class GoogleMapProvider(private val context: Context) :
   }
 
   override fun removePolylineView(polylineView: LuggPolylineView) {
-    polylineAnimators[polylineView]?.destroy()
-    polylineAnimators.remove(polylineView)
+    teardownPolyline(polylineView)
+  }
+
+  private fun teardownPolyline(polylineView: LuggPolylineView) {
+    pendingPolylineViews.remove(polylineView)
+    polylineAnimators.remove(polylineView)?.destroy()
     polylineView.polyline?.remove()
     polylineView.polyline = null
   }
@@ -812,6 +820,8 @@ class GoogleMapProvider(private val context: Context) :
   private fun addPolylineViewToMap(polylineView: LuggPolylineView) {
     val map = googleMap ?: return
 
+    polylineAnimators.remove(polylineView)?.destroy()
+
     val options = PolylineOptions()
       .width(polylineView.strokeWidth.dpToPx())
       .zIndex(polylineView.zIndex)

package/android/src/main/java/com/luggmaps/core/PolylineAnimator.kt

@@ -249,7 +249,7 @@ class PolylineAnimator {
     // Clear spans before setting points to prevent IndexOutOfBoundsException
     // when the new points list is shorter than what existing spans reference
     poly.color = strokeColors.firstOrNull() ?: Color.BLACK
-    poly.points = ArrayList(reusablePoints)
+    poly.points = reusablePoints
 
     if (strokeColors.size > 1) {
       val segmentCount = reusablePoints.size - 1

package/ios/events/CameraIdleEvent.h

@@ -11,8 +11,10 @@ struct CameraIdleEvent {
   double zoom;
   bool gesture;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/ios/events/CameraMoveEvent.h

@@ -11,8 +11,10 @@ struct CameraMoveEvent {
   double zoom;
   bool gesture;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/ios/events/CirclePressEvent.h

@@ -6,8 +6,10 @@ namespace luggmaps {
 namespace events {
 
 struct CirclePressEvent {
-  template <typename Emitter>
-  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  static void emit(const EventEmitterPtr &eventEmitter) {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/ios/events/GroundOverlayPressEvent.h

@@ -6,8 +6,10 @@ namespace luggmaps {
 namespace events {
 
 struct GroundOverlayPressEvent {
-  template <typename Emitter>
-  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  static void emit(const EventEmitterPtr &eventEmitter) {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/ios/events/LongPressEvent.h

@@ -11,8 +11,10 @@ struct LongPressEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/ios/events/MarkerDragEvent.h

@@ -11,8 +11,10 @@ struct MarkerDragStartEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
@@ -31,8 +33,10 @@ struct MarkerDragChangeEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);
@@ -51,8 +55,10 @@ struct MarkerDragEndEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/ios/events/MarkerPressEvent.h

@@ -11,8 +11,10 @@ struct MarkerPressEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/ios/events/PolygonPressEvent.h

@@ -6,8 +6,10 @@ namespace luggmaps {
 namespace events {
 
 struct PolygonPressEvent {
-  template <typename Emitter>
-  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  static void emit(const EventEmitterPtr &eventEmitter) {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/ios/events/PressEvent.h

@@ -11,8 +11,10 @@ struct PressEvent {
   double x;
   double y;
 
-  template <typename Emitter>
-  void emit(const facebook::react::SharedEventEmitter &eventEmitter) const {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  void emit(const EventEmitterPtr &eventEmitter) const {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/ios/events/ReadyEvent.h

@@ -6,8 +6,10 @@ namespace luggmaps {
 namespace events {
 
 struct ReadyEvent {
-  template <typename Emitter>
-  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  static void emit(const EventEmitterPtr &eventEmitter) {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/ios/events/TileOverlayPressEvent.h

@@ -6,8 +6,10 @@ namespace luggmaps {
 namespace events {
 
 struct TileOverlayPressEvent {
-  template <typename Emitter>
-  static void emit(const facebook::react::SharedEventEmitter &eventEmitter) {
+  // Holder type is templated to bridge RN versions: SharedEventEmitter went
+  // from shared_ptr<const EventEmitter> to shared_ptr<EventEmitter> in 0.85.
+  template <typename Emitter, typename EventEmitterPtr>
+  static void emit(const EventEmitterPtr &eventEmitter) {
     if (!eventEmitter)
       return;
     auto emitter = std::static_pointer_cast<Emitter const>(eventEmitter);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lugg/maps",
-  "version": "1.0.0-beta.12",
+  "version": "1.0.0-beta.14",
   "description": "Universal maps for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -75,8 +75,9 @@
     "@eslint/compat": "^1.3.2",
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.35.0",
-    "@react-native/babel-preset": "0.83.0",
-    "@react-native/eslint-config": "0.83.0",
+    "@react-native/babel-preset": "0.85.3",
+    "@react-native/eslint-config": "0.85.3",
+    "@react-native/jest-preset": "0.85.3",
     "@release-it/conventional-changelog": "^10.0.1",
     "@types/jest": "^29.5.14",
     "@types/react": "^19.2.0",
@@ -89,15 +90,15 @@
     "jest": "^29.7.0",
     "lefthook": "^2.0.3",
     "prettier": "^2.8.8",
-    "react": "19.2.0",
-    "react-native": "0.83.0",
+    "react": "19.2.3",
+    "react-native": "0.85.3",
     "react-native-builder-bob": "^0.40.13",
     "release-it": "^19.0.4",
     "turbo": "^2.5.6",
     "typescript": "^5.9.2"
   },
   "resolutions": {
-    "@lodev09/react-native-true-sheet": "3.9.0-beta.1"
+    "@lodev09/react-native-true-sheet": "3.11.0-beta.10"
   },
   "peerDependencies": {
     "@vis.gl/react-google-maps": ">=1.0.0",
@@ -110,7 +111,7 @@
     }
   },
   "dependencies": {
-    "@expo/config-plugins": "^9.0.0"
+    "@expo/config-plugins": "^56.0.8"
   },
   "workspaces": [
     "example/bare",
@@ -158,7 +159,7 @@
     }
   },
   "jest": {
-    "preset": "react-native",
+    "preset": "@react-native/jest-preset",
     "modulePathIgnorePatterns": [
       "<rootDir>/example/bare/node_modules",
       "<rootDir>/lib/"

package/plugin/build/withMapsAndroid.d.ts

@@ -1,5 +0,0 @@
-import { type ConfigPlugin } from '@expo/config-plugins';
-export interface MapsAndroidPluginProps {
-  apiKey?: string;
-}
-export declare const withLuggMapsAndroid: ConfigPlugin<MapsAndroidPluginProps>;

package/plugin/build/withMapsAndroid.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withLuggMapsAndroid = void 0;
-const config_plugins_1 = require("@expo/config-plugins");
-const withLuggMapsAndroid = (config, { apiKey }) => {
-    if (!apiKey) {
-        return config;
-    }
-    return (0, config_plugins_1.withAndroidManifest)(config, (c) => {
-        const mainApplication = config_plugins_1.AndroidConfig.Manifest.getMainApplicationOrThrow(c.modResults);
-        config_plugins_1.AndroidConfig.Manifest.addMetaDataItemToMainApplication(mainApplication, 'com.google.android.geo.API_KEY', apiKey);
-        return c;
-    });
-};
-exports.withLuggMapsAndroid = withLuggMapsAndroid;

package/plugin/build/withMapsIOS.d.ts

@@ -1,5 +0,0 @@
-import { type ConfigPlugin } from '@expo/config-plugins';
-export interface MapsIOSPluginProps {
-  apiKey?: string;
-}
-export declare const withLuggMapsIOS: ConfigPlugin<MapsIOSPluginProps>;

package/plugin/build/withMapsIOS.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withLuggMapsIOS = void 0;
-const config_plugins_1 = require("@expo/config-plugins");
-const withLuggMapsIOS = (config, { apiKey }) => {
-    if (!apiKey) {
-        return config;
-    }
-    config = (0, config_plugins_1.withInfoPlist)(config, (c) => {
-        c.modResults.GMSApiKey = apiKey;
-        return c;
-    });
-    config = (0, config_plugins_1.withAppDelegate)(config, (c) => {
-        const contents = c.modResults.contents;
-        // Add import for GoogleMaps
-        if (!contents.includes('import GoogleMaps')) {
-            c.modResults.contents = contents.replace(/(import (?:UIKit|Expo))/, '$1\nimport GoogleMaps');
-        }
-        // Add GMSServices.provideAPIKey call
-        if (!c.modResults.contents.includes('GMSServices.provideAPIKey')) {
-            c.modResults.contents = c.modResults.contents.replace(/(func application\([^)]+\)[^{]*\{)/, `$1\n    GMSServices.provideAPIKey("${apiKey}")\n`);
-        }
-        return c;
-    });
-    return config;
-};
-exports.withLuggMapsIOS = withLuggMapsIOS;