Skip to content

Commit 756c474

Browse files
authored
[google_maps_flutter_web] Fix AdvancedMarker anchors on web (flutter#11966)
Fixes AdvancedMarker anchor handling in `google_maps_flutter_web`. Previously `AdvancedMarker.anchor` was not applied on web, so custom advanced marker content was positioned as if it used the default anchor. This caused markers with non-default anchors to appear offset from their intended map coordinates. This PR converts Flutter marker anchor offsets into the Google Maps JavaScript Advanced Marker `anchorLeft` and `anchorTop` CSS offset properties when creating marker options, and reapplies those properties when an existing advanced marker is updated. Adds integration test coverage for creating and updating an `AdvancedMarker` with custom anchors. Addresses flutter#80578. ## Pre-Review Checklist
1 parent e55e7ac commit 756c474

6 files changed

Lines changed: 59 additions & 2 deletions

File tree

‎packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.6.4+1
2+
3+
* Fixes AdvancedMarker anchor handling.
4+
15
## 0.6.4
26

37
* Adds support for tapping points of interest on the map.

‎packages/google_maps_flutter/google_maps_flutter_web/example/latest/integration_test/advanced_markers_test.dart‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,32 @@ void main() {
480480
expect(icon.style.height, '30px');
481481
});
482482

483+
testWidgets('markers with anchor work', (WidgetTester tester) async {
484+
const markerId = MarkerId('1');
485+
const anchorOffset = Offset(0.14, 0.75);
486+
const updatedAnchorOffset = Offset(-0.6, 1.6);
487+
488+
final markers = <AdvancedMarker>{AdvancedMarker(markerId: markerId, anchor: anchorOffset)};
489+
490+
await controller.addMarkers(markers);
491+
492+
gmaps.AdvancedMarkerElement? marker = controller.markers[markerId]?.marker;
493+
expect(marker, isNotNull);
494+
expect(marker!.anchorLeft, '-14%');
495+
expect(marker.anchorTop, '-75%');
496+
497+
final updatedMarkers = <AdvancedMarker>{
498+
AdvancedMarker(markerId: markerId, anchor: updatedAnchorOffset),
499+
};
500+
501+
await controller.changeMarkers(updatedMarkers);
502+
503+
marker = controller.markers[markerId]?.marker;
504+
expect(marker, isNotNull);
505+
expect(marker!.anchorLeft, '60%');
506+
expect(marker.anchorTop, '-160%');
507+
});
508+
483509
testWidgets('markers created with text glyph work', (WidgetTester widgetTester) async {
484510
final markers = <AdvancedMarker>{
485511
AdvancedMarker(

‎packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,30 @@ void _setIconAnchor({required gmaps.Size size, required Offset anchor, required
366366
icon.anchor = gmapsAnchor;
367367
}
368368

369+
String _advancedMarkerAnchorToCssOffset(double anchor) {
370+
final double percentage = -anchor * 100;
371+
final int rounded = percentage.round();
372+
if ((percentage - rounded).abs() < 1e-9) {
373+
return '$rounded%';
374+
}
375+
return '$percentage%';
376+
}
377+
378+
void _setAdvancedMarkerOptionsAnchor(gmaps.AdvancedMarkerElementOptions options, Offset anchor) {
379+
options
380+
..anchorLeft = _advancedMarkerAnchorToCssOffset(anchor.dx)
381+
..anchorTop = _advancedMarkerAnchorToCssOffset(anchor.dy);
382+
}
383+
384+
void _copyAdvancedMarkerOptionsAnchor(
385+
gmaps.AdvancedMarkerElement marker,
386+
gmaps.AdvancedMarkerElementOptions options,
387+
) {
388+
marker
389+
..anchorLeft = options.anchorLeft
390+
..anchorTop = options.anchorTop;
391+
}
392+
369393
// Sets the size of the Google Maps icon.
370394
void _setIconSize({required gmaps.Size size, required gmaps.Icon icon}) {
371395
final gmapsSize = gmaps.Size(size.width, size.height);
@@ -754,6 +778,7 @@ Future<O> _markerOptionsFromMarker<T, O>(
754778
rotation: marker.rotation,
755779
);
756780
}
781+
_setAdvancedMarkerOptionsAnchor(options, marker.anchor);
757782
return options as O;
758783
} else {
759784
final options = gmaps.MarkerOptions()

‎packages/google_maps_flutter/google_maps_flutter_web/lib/src/marker.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ class AdvancedMarkerController
322322
marker.position = options.position;
323323
marker.title = options.title ?? '';
324324
marker.zIndex = options.zIndex;
325+
_copyAdvancedMarkerOptionsAnchor(marker, options);
325326

326327
if (_infoWindow != null && newInfoWindowContent != null) {
327328
_infoWindow.content = newInfoWindowContent;

‎packages/google_maps_flutter/google_maps_flutter_web/lib/src/markers.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ class AdvancedMarkersController
343343
assert(marker is AdvancedMarker, 'Marker must be an AdvancedMarker.');
344344

345345
final gmMarker = gmaps.AdvancedMarkerElement(markerOptions);
346+
_copyAdvancedMarkerOptionsAnchor(gmMarker, markerOptions);
346347
gmMarker.setAttribute('id', marker.markerId.value);
347348

348349
return AdvancedMarkerController(

‎packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_maps_flutter_web
22
description: Web platform implementation of google_maps_flutter
33
repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
5-
version: 0.6.4
5+
version: 0.6.4+1
66

77
environment:
88
sdk: ^3.11.0
@@ -22,7 +22,7 @@ dependencies:
2222
sdk: flutter
2323
flutter_web_plugins:
2424
sdk: flutter
25-
google_maps: ^8.1.0
25+
google_maps: ^8.3.0
2626
google_maps_flutter_platform_interface: ^2.17.0
2727
sanitize_html: ^2.0.0
2828
stream_transform: ^2.0.0

0 commit comments

Comments
 (0)