Skip to content

Commit 8f3aa45

Browse files
committed
one line confition fix + abstract doCreateInfoWindow improvment
1 parent d18a26d commit 8f3aa45

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

src/Map/assets/dist/abstract_map_controller.d.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ export default abstract class<MapOptions, Map, MarkerOptions, Marker, InfoWindow
5959
element: Marker | Polygon;
6060
}): InfoWindow;
6161
protected abstract doCreateInfoWindow({ definition, element, }: {
62-
definition: MarkerDefinition<MarkerOptions, InfoWindowOptions>['infoWindow'] | PolygonDefinition<PolygonOptions, InfoWindowOptions>['infoWindow'];
63-
element: Marker | Polygon;
62+
definition: MarkerDefinition<MarkerOptions, InfoWindowOptions>['infoWindow'];
63+
element: Marker;
64+
} | {
65+
definition: PolygonDefinition<PolygonOptions, InfoWindowOptions>['infoWindow'];
66+
element: Polygon;
6467
}): InfoWindow;
6568
protected abstract doFitBoundsToMarkers(): void;
6669
protected abstract dispatchEvent(name: string, payload: Record<string, unknown>): void;

src/Map/assets/src/abstract_map_controller.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,15 @@ export default abstract class<
153153
protected abstract doCreateInfoWindow({
154154
definition,
155155
element,
156-
}: {
157-
definition:
158-
| MarkerDefinition<MarkerOptions, InfoWindowOptions>['infoWindow']
159-
| PolygonDefinition<PolygonOptions, InfoWindowOptions>['infoWindow'];
160-
element: Marker | Polygon;
161-
}): InfoWindow;
156+
}:
157+
| {
158+
definition: MarkerDefinition<MarkerOptions, InfoWindowOptions>['infoWindow'];
159+
element: Marker;
160+
}
161+
| {
162+
definition: PolygonDefinition<PolygonOptions, InfoWindowOptions>['infoWindow'];
163+
element: Polygon;
164+
}): InfoWindow;
162165

163166
protected abstract doFitBoundsToMarkers(): void;
164167

src/Map/src/Bridge/Google/assets/dist/map_controller.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ class default_1 extends AbstractMapController {
8181
});
8282
if (element instanceof google.maps.marker.AdvancedMarkerElement) {
8383
element.addListener('click', () => {
84-
if (definition.autoClose)
84+
if (definition.autoClose) {
8585
this.closeInfoWindowsExcept(infoWindow);
86+
}
8687
infoWindow.open({ map: this.map, anchor: element });
8788
});
8889
if (definition.opened) {
@@ -91,8 +92,9 @@ class default_1 extends AbstractMapController {
9192
}
9293
else if (element instanceof google.maps.Polygon) {
9394
element.addListener('click', (event) => {
94-
if (definition.autoClose)
95+
if (definition.autoClose) {
9596
this.closeInfoWindowsExcept(infoWindow);
97+
}
9698
infoWindow.setPosition(event.latLng);
9799
infoWindow.open(this.map);
98100
});

src/Map/src/Bridge/Google/assets/src/map_controller.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ export default class extends AbstractMapController<
172172

173173
if (element instanceof google.maps.marker.AdvancedMarkerElement) {
174174
element.addListener('click', () => {
175-
if (definition.autoClose) this.closeInfoWindowsExcept(infoWindow);
175+
if (definition.autoClose) {
176+
this.closeInfoWindowsExcept(infoWindow);
177+
}
176178
infoWindow.open({ map: this.map, anchor: element });
177179
});
178180

@@ -181,7 +183,9 @@ export default class extends AbstractMapController<
181183
}
182184
} else if (element instanceof google.maps.Polygon) {
183185
element.addListener('click', (event: any) => {
184-
if (definition.autoClose) this.closeInfoWindowsExcept(infoWindow);
186+
if (definition.autoClose) {
187+
this.closeInfoWindowsExcept(infoWindow);
188+
}
185189
infoWindow.setPosition(event.latLng);
186190
infoWindow.open(this.map);
187191
});

0 commit comments

Comments
 (0)