Docs: Update version and CHANGELOG for style fix

Author: WillBLogical

packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.12+3
+
+* Fixes a bug where using `cloudMapId` for cloud-based styling would fail if the `style` property was also present.
+
 ## 0.5.12+2
 
 * Fix broken cameraTargetBounds option on web.

packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_style_test.dart

@@ -0,0 +1,101 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:js_util';
+
+import 'package:google_maps_flutter_web/google_maps_flutter_web.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+// ignore: implementation_imports
+import 'package:google_maps_flutter_web/src/third_party/js_types/google_maps.dart'
+as gmaps;
+
+import 'google_maps_controller_test.mocks.dart';
+import 'gmaps_mocks.dart';
+
+const String _kCloudMapId = 'test-map-id';
+
+@GenerateMocks(<Type>[
+  StreamController,
+])
+void main() {
+  late MockStreamController<MapEvent<Object?>> streamController;
+  late MockMap map;
+
+  setUp(() {
+    streamController = MockStreamController<MapEvent<Object?>>();
+    map = MockMap();
+    when(map.onTilesloaded).thenAnswer((_) => Stream<void>.value(null));
+    when(map.onClick).thenAnswer(
+            (_) => Stream<gmaps.MapMouseEvent>.value(MockMapMouseEvent()));
+    when(map.onRightclick).thenAnswer(
+            (_) => Stream<gmaps.MapMouseEvent>.value(MockMapMouseEvent()));
+    when(map.onBoundsChanged).thenAnswer((_) => Stream<void>.value(null));
+    when(map.onIdle).thenAnswer((_) => Stream<void>.value(null));
+    when(map.isZoomDefined()).thenReturn(true);
+    when(map.zoom).thenReturn(10);
+  });
+
+  GoogleMapController createController({
+    MapWidgetConfiguration widgetConfiguration = const MapWidgetConfiguration(
+      initialCameraPosition: CameraPosition(target: LatLng(0, 0)),
+    ),
+    MapObjects mapObjects = const MapObjects(),
+    MapConfiguration mapConfiguration = const MapConfiguration(),
+  }) {
+    return GoogleMapController(
+      mapId: 0,
+      streamController: streamController,
+      widgetConfiguration: widgetConfiguration,
+      mapObjects: mapObjects,
+      mapConfiguration: mapConfiguration,
+    );
+  }
+
+  testWidgets(
+      'disables rotate control when fortyFiveDegreeImageryEnabled is disabled',
+          (WidgetTester tester) async {
+        gmaps.MapOptions? capturedOptions;
+        final GoogleMapController controller = createController(
+            mapConfiguration:
+            const MapConfiguration(fortyFiveDegreeImageryEnabled: false));
+        controller.debugSetOverrides(createMap: (_, gmaps.MapOptions options) {
+          capturedOptions = options;
+          return map;
+        });
+
+        controller.init();
+
+        expect(capturedOptions, isNotNull);
+        expect(capturedOptions!.rotateControl, isFalse);
+        expect(capturedOptions!.tilt, 0);
+      });
+
+  testWidgets('style is ignored when mapId is set',
+          (WidgetTester tester) async {
+        gmaps.MapOptions? capturedOptions;
+        const String style =
+        '''[{  "featureType": "poi.park",  "elementType": "labels.text.fill",  "stylers": [{"color": "#6b9a76"}]}]''';
+        final GoogleMapController controller = createController(
+            mapConfiguration: const MapConfiguration(
+              style: style,
+              mapId: _kCloudMapId,
+            ));
+        controller.debugSetOverrides(createMap: (_, gmaps.MapOptions options) {
+          capturedOptions = options;
+          return map;
+        });
+
+        controller.init();
+
+        expect(capturedOptions, isNotNull);
+        expect(capturedOptions!.styles, isNull,
+            reason: 'styles should be null when mapId is provided.');
+        expect(capturedOptions!.mapId, _kCloudMapId);
+      });
+}

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+2
+version: 0.5.12+3
 
 environment:
   sdk: ^3.6.0
@@ -31,6 +31,8 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  build_runner: ^2.4.0
+  mockito: ^5.4.0
 
 topics:
   - google-maps