Cancel map stream subscriptions on dispose

Author: JamesMcIntosh

packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.13
+
+* Stop processing events and cancel subscriptions when controller is disposed.
+
 ## 0.5.12
 
 * Adds support for ground overlay.

packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart

@@ -137,6 +137,11 @@ class GoogleMapController {
   TileOverlaysController? _tileOverlaysController;
   GroundOverlaysController? _groundOverlaysController;
 
+  StreamSubscription<void>? _onClickSubscription;
+  StreamSubscription<void>? _onRightClickSubscription;
+  StreamSubscription<void>? _onBoundsChangedSubscription;
+  StreamSubscription<void>? _onIdleSubscription;
+
   // Keeps track if _attachGeometryControllers has been called or not.
   bool _controllersBoundToMap = false;
 
@@ -247,23 +252,25 @@ class GoogleMapController {
         _streamController.add(WebMapReadyEvent(_mapId));
       }
     });
-    map.onClick.listen((gmaps.MapMouseEventOrIconMouseEvent event) {
+    _onClickSubscription =
+        map.onClick.listen((gmaps.MapMouseEventOrIconMouseEvent event) {
       assert(event.latLng != null);
       if (!_streamController.isClosed) {
         _streamController.add(
           MapTapEvent(_mapId, gmLatLngToLatLng(event.latLng!)),
         );
       }
     });
-    map.onRightclick.listen((gmaps.MapMouseEvent event) {
+    _onRightClickSubscription =
+        map.onRightclick.listen((gmaps.MapMouseEvent event) {
       assert(event.latLng != null);
       if (!_streamController.isClosed) {
         _streamController.add(
           MapLongPressEvent(_mapId, gmLatLngToLatLng(event.latLng!)),
         );
       }
     });
-    map.onBoundsChanged.listen((void _) {
+    _onBoundsChangedSubscription = map.onBoundsChanged.listen((void _) {
       if (!_mapIsMoving) {
         _mapIsMoving = true;
         if (!_streamController.isClosed) {
@@ -276,7 +283,7 @@ class GoogleMapController {
         );
       }
     });
-    map.onIdle.listen((void _) {
+    _onIdleSubscription = map.onIdle.listen((void _) {
       _mapIsMoving = false;
       if (!_streamController.isClosed) {
         _streamController.add(CameraIdleEvent(_mapId));
@@ -600,6 +607,14 @@ class GoogleMapController {
     _clusterManagersController = null;
     _tileOverlaysController = null;
     _groundOverlaysController = null;
+    _onClickSubscription?.cancel();
+    _onClickSubscription = null;
+    _onRightClickSubscription?.cancel();
+    _onRightClickSubscription = null;
+    _onBoundsChangedSubscription?.cancel();
+    _onBoundsChangedSubscription = null;
+    _onIdleSubscription?.cancel();
+    _onIdleSubscription = null;
     _streamController.close();
   }
 }

packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml

@@ -2,7 +2,7 @@ name: google_maps_flutter_web
 description: Web platform implementation of google_maps_flutter
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 0.5.12
+version: 0.5.13
 
 environment:
   sdk: ^3.4.0