Skip to content

fix(google-maps): update right-click event to use contextmenu for Adv… #30523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/dev-app/google-map/google-map-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,22 @@
<map-advanced-marker
#firstMarker="mapAdvancedMarker"
[position]="center"
(mapClick)="infoWindow.open(firstMarker)"></map-advanced-marker>
(mapClick)="infoWindow.open(firstMarker)"
(mapRightclick)="handleMarkerRightclick($event)"
></map-advanced-marker>
@for (markerPosition of markerPositions; track markerPosition) {
<map-advanced-marker #marker="mapAdvancedMarker"
[position]="markerPosition"
(mapClick)="infoWindow.open(marker)"></map-advanced-marker>
(mapClick)="infoWindow.open(marker)"
(mapRightclick)="handleMarkerRightclick($event)"
></map-advanced-marker>
}
</map-marker-clusterer>
@if (hasCustomContentMarker) {
<map-advanced-marker
#secondMarker="mapAdvancedMarker"
(mapClick)="infoWindow.open(secondMarker)"
(mapRightclick)="handleMarkerRightclick($event)"
title="Advanced Marker"
[gmpDraggable]="false"
[content]="advancedMarkerContent"
Expand Down
4 changes: 4 additions & 0 deletions src/dev-app/google-map/google-map-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ export class GoogleMapDemo {
this.markerPositions.pop();
}

handleMarkerRightclick(event: google.maps.MapMouseEvent) {
console.log('Marker right-clicked');
}

editablePolylineChanged(editable: boolean) {
this.polylineOptions = {
...this.polylineOptions,
Expand Down
47 changes: 47 additions & 0 deletions src/google-maps/map-advanced-marker/map-advanced-marker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,58 @@ export class MapAdvancedMarker
this.advancedMarker = new advancedMarkerConstructor(this._combineOptions());
this._assertInitialized();
this.advancedMarker.map = map;
this._addRightClickSupport();
this._eventManager.setTarget(this.advancedMarker);
this.markerInitialized.next(this.advancedMarker);
});
}

private _addRightClickSupport() {
if (!this.advancedMarker?.element) return;

// Enhance the AdvancedMarkerElement prototype to natively support rightclick events
const markerProto = Object.getPrototypeOf(this.advancedMarker);

if (!markerProto._rightClickEnhanced) {
const originalAddListener = markerProto.addListener;

markerProto.addListener = function (eventName: string, handler: Function) {
if (eventName === 'rightclick') {
// Handle rightclick using mousedown event with right mouse button check
const listener = (event: MouseEvent) => {
// Only handle right mouse button clicks (button 2)
if (event.button === 2) {
const mapMouseEvent = {
domEvent: event,
latLng: null,
stop: () => {
event.stopPropagation();
event.preventDefault();
},
} as google.maps.MapMouseEvent;

handler(mapMouseEvent);
}
};

this.element.addEventListener('mousedown', listener);

return {
remove: () => {
this.element.removeEventListener('mousedown', listener);
},
};
} else {
// Use original method for other events
return originalAddListener.call(this, eventName, handler);
}
};

// Mark prototype as enhanced to avoid multiple enhancements
markerProto._rightClickEnhanced = true;
}
}

ngOnChanges(changes: SimpleChanges) {
const {advancedMarker, _content, _position, _title, _draggable, _zIndex} = this;
if (advancedMarker) {
Expand Down