react-native-google-maps-plus 1.6.1-dev.6 → 1.6.1-dev.7

package/ios/GoogleMapViewImpl.swift

@@ -278,7 +278,7 @@ GMSIndoorDisplayDelegate {
         disableActions: false,
         duration: durationMs / 1000.0
       ) {
-        mapView?.animate(to: camera)
+        self.mapView?.animate(to: camera)
       }
     } else {
       let update = GMSCameraUpdate.setCamera(camera)
@@ -318,7 +318,7 @@ GMSIndoorDisplayDelegate {
         disableActions: false,
         duration: durationMs / 1000.0
       ) {
-        mapView?.animate(with: update)
+        self.mapView?.animate(with: update)
       }
     } else {
       mapView?.moveCamera(update)

package/ios/MapHelper.swift

@@ -1,22 +1,24 @@
 import QuartzCore
 
-@inline(__always)
+@MainActor @inline(__always)
 func withCATransaction(
   disableActions: Bool = true,
   duration: CFTimeInterval? = nil,
   timingFunction: CAMediaTimingFunction? = nil,
   completion: (() -> Void)? = nil,
-  _ body: () -> Void
+  _ body: @escaping @MainActor () -> Void
 ) {
-  CATransaction.begin()
+  onMain {
+    CATransaction.begin()
 
-  CATransaction.setDisableActions(disableActions)
-  duration.map { CATransaction.setAnimationDuration($0) }
-  timingFunction.map { CATransaction.setAnimationTimingFunction($0) }
-  completion.map { CATransaction.setCompletionBlock($0) }
+    CATransaction.setDisableActions(disableActions)
+    duration.map { CATransaction.setAnimationDuration($0) }
+    timingFunction.map { CATransaction.setAnimationTimingFunction($0) }
+    completion.map { CATransaction.setCompletionBlock($0) }
 
-  body()
-  CATransaction.commit()
+    body()
+    CATransaction.commit()
+  }
 }
 
 @MainActor @inline(__always)

package/ios/RNGoogleMapsPlusView.swift

@@ -132,19 +132,19 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       withCATransaction(disableActions: true) {
 
         removed.forEach {
-          impl.removeMarker(id: $0)
-          markerBuilder.cancelIconTask($0)
+          self.impl.removeMarker(id: $0)
+          self.markerBuilder.cancelIconTask($0)
         }
 
         for (id, next) in nextById {
           if let prev = prevById[id] {
             if !prev.markerEquals(next) {
-              impl.updateMarker(id: id) { m in
+              self.impl.updateMarker(id: id) { m in
                 self.markerBuilder.update(prev, next, m)
               }
             }
           } else {
-            markerBuilder.buildIconAsync(next.id, next) { icon in
+            self.markerBuilder.buildIconAsync(next.id, next) { icon in
               let marker = self.markerBuilder.build(next, icon: icon)
               self.impl.addMarker(id: id, marker: marker)
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.6.1-dev.6",
+  "version": "1.6.1-dev.7",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",