Skip to content

Commit

Permalink
fix: remap click to gmp-click to avoid error-messages
Browse files Browse the repository at this point in the history
  • Loading branch information
usefulthink committed Dec 7, 2023
1 parent cfd7a9c commit 71d459a
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 1 deletion.
50 changes: 50 additions & 0 deletions src/__tests__/marker.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,56 @@ describe('html attributes', () => {
});
});

describe('events', () => {
const position = [10, 53] as [number, number];

let map: google.maps.Map;
let marker: Marker;
let markerElement: google.maps.marker.AdvancedMarkerElement;
let addListenerSpy: jest.SpyInstance;
let addDomListenerSpy: jest.SpyInstance;

beforeEach(async () => {
initialize();

map = new google.maps.Map(document.createElement('div'));
marker = new Marker({position, map});

markerElement = mockInstances.get(AdvancedMarkerElement).at(0)!;
// eslint-disable-next-line @typescript-eslint/unbound-method
addListenerSpy = markerElement.addListener as jest.MockedFunction<
typeof markerElement.addListener
>;
addDomListenerSpy = jest
.spyOn(markerElement.element, 'addEventListener')
.mockImplementation(() => {});
});

test('events are added to the marker instance', () => {
const fn = jest.fn();

marker.addListener('drag', fn);

expect(addListenerSpy).toHaveBeenCalledWith('drag', fn);
});

test('click event is rerouted to gmp-click', () => {
const fn = jest.fn();

marker.addListener('click', fn);

expect(addListenerSpy).toHaveBeenCalledWith('gmp-click', fn);
});

test('dom-events are forwarded to the html-element', () => {
const fn = jest.fn();
marker.addListener('touchstart', fn);
expect(addDomListenerSpy).toHaveBeenCalledWith('touchstart', fn);
});

test.todo('dom-events can be removed');
});

describe('dynamic attributes', () => {
test.todo('dynamic attribute parameters');
test.todo('marker state');
Expand Down
5 changes: 4 additions & 1 deletion src/marker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,10 @@ export class Marker<TUserData = unknown> {
handler: ((ev: google.maps.MapMouseEvent) => void) | ((ev: Event) => void)
): google.maps.MapsEventListener {
if (eventName in MarkerEvents) {
return this.markerView_.addListener(eventName, handler);
return this.markerView_.addListener(
eventName === 'click' ? 'gmp-click' : eventName,
handler
);
}

const element = this.markerView_.element;
Expand Down

0 comments on commit 71d459a

Please sign in to comment.