react-native-google-maps-plus 1.8.4 → 1.8.5

package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -5,6 +5,8 @@ import MarkerTag
 import PolygonTag
 import PolylineTag
 import android.annotation.SuppressLint
+import android.content.ComponentCallbacks2
+import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.location.Location
 import android.util.Size
@@ -105,8 +107,24 @@ class GoogleMapsViewImpl(
 
   private var cameraMoveReason = -1
 
+  val componentCallbacks =
+    object : ComponentCallbacks2 {
+      override fun onConfigurationChanged(newConfig: Configuration) {}
+
+      override fun onLowMemory() {
+        mapView?.onLowMemory()
+        markerBuilder.clearIconCache()
+      }
+
+      override fun onTrimMemory(level: Int) {
+        mapView?.onLowMemory()
+        markerBuilder.cancelAllJobs()
+      }
+    }
+
   init {
     MapsInitializer.initialize(reactContext)
+    reactContext.registerComponentCallbacks(componentCallbacks)
     reactContext.addLifecycleEventListener(this)
   }
 
@@ -822,6 +840,7 @@ class GoogleMapsViewImpl(
         removeAllViews()
       }
       super.removeAllViews()
+      reactContext.unregisterComponentCallbacks(componentCallbacks)
       reactContext.removeLifecycleEventListener(this)
       initialized = false
     }

package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt

@@ -45,7 +45,7 @@ class MapMarkerBuilder(
   private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default),
 ) {
   private val iconCache =
-    object : LruCache<Int, BitmapDescriptor>(512) {
+    object : LruCache<Int, BitmapDescriptor>(256) {
       override fun sizeOf(
         key: Int,
         value: BitmapDescriptor,
@@ -281,7 +281,7 @@ class MapMarkerBuilder(
             onReady(desc)
           }
         } catch (_: OutOfMemoryError) {
-          iconCache.evictAll()
+          clearIconCache()
           withContext(Dispatchers.Main) {
             ensureActive()
             onReady(null)
@@ -310,6 +310,10 @@ class MapMarkerBuilder(
       jobsById[id]?.cancel()
     }
     jobsById.clear()
+    clearIconCache()
+  }
+
+  fun clearIconCache() {
     iconCache.evictAll()
   }
 

package/ios/GoogleMapViewImpl.swift

@@ -42,19 +42,39 @@ GMSIndoorDisplayDelegate {
     setupAppLifecycleObservers()
   }
 
+  @MainActor
+  private var lifecycleTasks = [Task<Void, Never>]()
+
   @MainActor
   private func setupAppLifecycleObservers() {
-    NotificationCenter.default.addObserver(
-      self,
-      selector: #selector(appDidBecomeActive),
-      name: UIApplication.didBecomeActiveNotification,
-      object: nil
+    lifecycleTasks.append(
+      Task { @MainActor in
+        for await _ in NotificationCenter.default.notifications(
+          named: UIApplication.didBecomeActiveNotification
+        ) {
+          appDidBecomeActive()
+        }
+      }
+    )
+
+    lifecycleTasks.append(
+      Task { @MainActor in
+        for await _ in NotificationCenter.default.notifications(
+          named: UIApplication.didEnterBackgroundNotification
+        ) {
+          appDidEnterBackground()
+        }
+      }
     )
-    NotificationCenter.default.addObserver(
-      self,
-      selector: #selector(appDidEnterBackground),
-      name: UIApplication.didEnterBackgroundNotification,
-      object: nil
+
+    lifecycleTasks.append(
+      Task { @MainActor in
+        for await _ in NotificationCenter.default.notifications(
+          named: UIApplication.didReceiveMemoryWarningNotification
+        ) {
+          onLowMemory()
+        }
+      }
     )
   }
 
@@ -688,16 +708,20 @@ GMSIndoorDisplayDelegate {
     }
   }
 
-  @objc private func appDidBecomeActive() {
+  private func appDidBecomeActive() {
     if window != nil {
       locationHandler.start()
     }
   }
 
-  @objc private func appDidEnterBackground() {
+  private func appDidEnterBackground() {
     locationHandler.stop()
   }
 
+  private func onLowMemory() {
+    markerBuilder.cancelAllIconTasks()
+  }
+
   override func didMoveToWindow() {
     super.didMoveToWindow()
     if window != nil {
@@ -708,8 +732,9 @@ GMSIndoorDisplayDelegate {
   }
 
   deinit {
-    NotificationCenter.default.removeObserver(self)
     deinitInternal()
+    lifecycleTasks.forEach { $0.cancel() }
+    lifecycleTasks.removeAll()
   }
 
   func mapViewDidFinishTileRendering(_ mapView: GMSMapView) {

package/ios/MapMarkerBuilder.swift

@@ -5,7 +5,7 @@ import UIKit
 final class MapMarkerBuilder {
   private let iconCache: NSCache<NSNumber, UIImage> = {
     let c = NSCache<NSNumber, UIImage>()
-    c.countLimit = 512
+    c.countLimit = 256
     return c
   }()
   private var tasks: [String: Task<Void, Never>] = [:]
@@ -205,6 +205,7 @@ final class MapMarkerBuilder {
     }
     tasks.removeAll()
     iconCache.removeAllObjects()
+    CATransaction.flush()
   }
 
   @MainActor

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",
@@ -80,9 +80,9 @@
   "devDependencies": {
     "@commitlint/cli": "20.1.0",
     "@commitlint/config-conventional": "20.0.0",
-    "@eslint/compat": "1.4.0",
+    "@eslint/compat": "1.4.1",
     "@eslint/eslintrc": "3.3.1",
-    "@eslint/js": "9.38.0",
+    "@eslint/js": "9.39.1",
     "@expo/config-plugins": "54.0.2",
     "@jamesacarr/eslint-formatter-github-actions": "0.2.0",
     "@react-native/babel-preset": "0.82.1",
@@ -95,17 +95,17 @@
     "clang-format-node": "2.0.3",
     "conventional-changelog-conventionalcommits": "9.1.0",
     "del-cli": "7.0.0",
-    "eslint": "9.38.0",
+    "eslint": "9.39.1",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-ft-flow": "3.0.11",
     "eslint-plugin-prettier": "5.5.4",
     "jest": "30.2.0",
-    "lefthook": "2.0.0",
+    "lefthook": "2.0.2",
     "nitrogen": "0.30.2",
     "prettier": "3.6.2",
     "react": "19.1.1",
     "react-native": "0.82.1",
-    "react-native-builder-bob": "0.40.13",
+    "react-native-builder-bob": "0.40.14",
     "react-native-nitro-modules": "0.30.2",
     "semantic-release": "25.0.1",
     "typescript": "5.9.3"