Skip to content

Commit eee082d

Browse files
crisbetocrisbeto
authored
fix(google-maps): compatibility with latest typings (#21441)
Fixes a bunch of compilation errors as a result of a breaking change in the Google Maps typings. Fixes #21440.
1 parent d590847 commit eee082d

File tree

17 files changed

+153
-153
lines changed

17 files changed

+153
-153
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@angular/elements": "^11.1.0-next.2",
5959
"@angular/forms": "^11.1.0-next.2",
6060
"@angular/platform-browser": "^11.1.0-next.2",
61-
"@types/googlemaps": "^3.39.3",
61+
"@types/googlemaps": "^3.43.0",
6262
"@types/youtube": "^0.0.40",
6363
"@webcomponents/custom-elements": "^1.1.0",
6464
"core-js": "^2.6.9",

‎src/dev-app/google-map/google-map-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ export class GoogleMapDemo {
9898
markerClustererImagePath =
9999
'https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/m';
100100

101-
handleClick(event: google.maps.MouseEvent) {
101+
handleClick(event: google.maps.MapMouseEvent) {
102102
this.markerPositions.push(event.latLng.toJSON());
103103
}
104104

105-
handleMove(event: google.maps.MouseEvent) {
105+
handleMove(event: google.maps.MapMouseEvent) {
106106
this.display = event.latLng.toJSON();
107107
}
108108

‎src/google-maps/google-map/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ export class GoogleMapDemo {
3434
center: google.maps.LatLngLiteral = {lat: 24, lng: 12};
3535
zoom = 4;
3636

37-
moveMap(event: google.maps.MouseEvent) {
37+
moveMap(event: google.maps.MapMouseEvent) {
3838
this.center = (event.latLng.toJSON());
3939
}
4040

41-
move(event: google.maps.MouseEvent) {
41+
move(event: google.maps.MapMouseEvent) {
4242
this.display = event.latLng.toJSON();
4343
}
4444
}

‎src/google-maps/google-map/google-map.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ class TestApp {
371371
options?: google.maps.MapOptions;
372372
mapTypeId?: google.maps.MapTypeId;
373373

374-
handleClick(event: google.maps.MouseEvent) {}
374+
handleClick(event: google.maps.MapMouseEvent) {}
375375
handleCenterChanged() {}
376-
handleRightclick(event: google.maps.MouseEvent) {}
376+
handleRightclick(event: google.maps.MapMouseEvent) {}
377377
}

‎src/google-maps/google-map/google-map.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,16 @@ export class GoogleMap implements OnChanges, OnInit, OnDestroy {
120120
* https://developers.google.com/maps/documentation/javascript/reference/map#Map.click
121121
*/
122122
@Output()
123-
mapClick: Observable<google.maps.MouseEvent|google.maps.IconMouseEvent> =
124-
this._eventManager.getLazyEmitter<google.maps.MouseEvent|google.maps.IconMouseEvent>('click');
123+
mapClick: Observable<google.maps.MapMouseEvent|google.maps.IconMouseEvent> = this._eventManager
124+
.getLazyEmitter<google.maps.MapMouseEvent|google.maps.IconMouseEvent>('click');
125125

126126
/**
127127
* See
128128
* https://developers.google.com/maps/documentation/javascript/reference/map#Map.dblclick
129129
*/
130130
@Output()
131-
mapDblclick: Observable<google.maps.MouseEvent> =
132-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('dblclick');
131+
mapDblclick: Observable<google.maps.MapMouseEvent> =
132+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('dblclick');
133133

134134
/**
135135
* See
@@ -174,24 +174,24 @@ export class GoogleMap implements OnChanges, OnInit, OnDestroy {
174174
* https://developers.google.com/maps/documentation/javascript/reference/map#Map.mousemove
175175
*/
176176
@Output()
177-
mapMousemove: Observable<google.maps.MouseEvent> =
178-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mousemove');
177+
mapMousemove: Observable<google.maps.MapMouseEvent> =
178+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mousemove');
179179

180180
/**
181181
* See
182182
* https://developers.google.com/maps/documentation/javascript/reference/map#Map.mouseout
183183
*/
184184
@Output()
185-
mapMouseout: Observable<google.maps.MouseEvent> =
186-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mouseout');
185+
mapMouseout: Observable<google.maps.MapMouseEvent> =
186+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mouseout');
187187

188188
/**
189189
* See
190190
* https://developers.google.com/maps/documentation/javascript/reference/map#Map.mouseover
191191
*/
192192
@Output()
193-
mapMouseover: Observable<google.maps.MouseEvent> =
194-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mouseover');
193+
mapMouseover: Observable<google.maps.MapMouseEvent> =
194+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mouseover');
195195

196196
/**
197197
* See
@@ -206,8 +206,8 @@ export class GoogleMap implements OnChanges, OnInit, OnDestroy {
206206
* https://developers.google.com/maps/documentation/javascript/reference/map#Map.rightclick
207207
*/
208208
@Output()
209-
mapRightclick: Observable<google.maps.MouseEvent> =
210-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('rightclick');
209+
mapRightclick: Observable<google.maps.MapMouseEvent> =
210+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('rightclick');
211211

212212
/**
213213
* See

‎src/google-maps/map-circle/map-circle.ts

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,80 +67,80 @@ export class MapCircle implements OnInit, OnDestroy {
6767
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.click
6868
*/
6969
@Output()
70-
circleClick: Observable<google.maps.MouseEvent> =
71-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('click');
70+
circleClick: Observable<google.maps.MapMouseEvent> =
71+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('click');
7272

7373
/**
7474
* @see
7575
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.dblclick
7676
*/
7777
@Output()
78-
circleDblclick: Observable<google.maps.MouseEvent> =
79-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('dblclick');
78+
circleDblclick: Observable<google.maps.MapMouseEvent> =
79+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('dblclick');
8080

8181
/**
8282
* @see
8383
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.drag
8484
*/
8585
@Output()
86-
circleDrag: Observable<google.maps.MouseEvent> =
87-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('drag');
86+
circleDrag: Observable<google.maps.MapMouseEvent> =
87+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('drag');
8888

8989
/**
9090
* @see
9191
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.dragend
9292
*/
9393
@Output()
94-
circleDragend: Observable<google.maps.MouseEvent> =
95-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('dragend');
94+
circleDragend: Observable<google.maps.MapMouseEvent> =
95+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('dragend');
9696

9797
/**
9898
* @see
9999
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.dragstart
100100
*/
101101
@Output()
102-
circleDragstart: Observable<google.maps.MouseEvent> =
103-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('dragstart');
102+
circleDragstart: Observable<google.maps.MapMouseEvent> =
103+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('dragstart');
104104

105105
/**
106106
* @see
107107
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.mousedown
108108
*/
109109
@Output()
110-
circleMousedown: Observable<google.maps.MouseEvent> =
111-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mousedown');
110+
circleMousedown: Observable<google.maps.MapMouseEvent> =
111+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mousedown');
112112

113113
/**
114114
* @see
115115
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.mousemove
116116
*/
117117
@Output()
118-
circleMousemove: Observable<google.maps.MouseEvent> =
119-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mousemove');
118+
circleMousemove: Observable<google.maps.MapMouseEvent> =
119+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mousemove');
120120

121121
/**
122122
* @see
123123
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.mouseout
124124
*/
125125
@Output()
126-
circleMouseout: Observable<google.maps.MouseEvent> =
127-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mouseout');
126+
circleMouseout: Observable<google.maps.MapMouseEvent> =
127+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mouseout');
128128

129129
/**
130130
* @see
131131
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.mouseover
132132
*/
133133
@Output()
134-
circleMouseover: Observable<google.maps.MouseEvent> =
135-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mouseover');
134+
circleMouseover: Observable<google.maps.MapMouseEvent> =
135+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mouseover');
136136

137137
/**
138138
* @see
139139
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.mouseup
140140
*/
141141
@Output()
142-
circleMouseup: Observable<google.maps.MouseEvent> =
143-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mouseup');
142+
circleMouseup: Observable<google.maps.MapMouseEvent> =
143+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mouseup');
144144

145145
/**
146146
* @see
@@ -154,8 +154,8 @@ export class MapCircle implements OnInit, OnDestroy {
154154
* developers.google.com/maps/documentation/javascript/reference/polygon#Circle.rightclick
155155
*/
156156
@Output()
157-
circleRightclick: Observable<google.maps.MouseEvent> =
158-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('rightclick');
157+
circleRightclick: Observable<google.maps.MapMouseEvent> =
158+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('rightclick');
159159

160160
constructor(private readonly _map: GoogleMap, private readonly _ngZone: NgZone) {}
161161

‎src/google-maps/map-ground-overlay/map-ground-overlay.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@ export class MapGroundOverlay implements OnInit, OnDestroy {
7171
* developers.google.com/maps/documentation/javascript/reference/image-overlay#GroundOverlay.click
7272
*/
7373
@Output()
74-
mapClick: Observable<google.maps.MouseEvent> =
75-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('click');
74+
mapClick: Observable<google.maps.MapMouseEvent> =
75+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('click');
7676

7777
/**
7878
* See
7979
* developers.google.com/maps/documentation/javascript/reference/image-overlay
8080
* #GroundOverlay.dblclick
8181
*/
8282
@Output()
83-
mapDblclick: Observable<google.maps.MouseEvent> =
84-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('dblclick');
83+
mapDblclick: Observable<google.maps.MapMouseEvent> =
84+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('dblclick');
8585

8686
constructor(private readonly _map: GoogleMap, private readonly _ngZone: NgZone) {}
8787

‎src/google-maps/map-info-window/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class GoogleMapDemo {
2222
markerPositions: google.maps.LatLngLiteral[] = [];
2323
zoom = 4;
2424

25-
addMarker(event: google.maps.MouseEvent) {
25+
addMarker(event: google.maps.MapMouseEvent) {
2626
this.markerPositions.push(event.latLng.toJSON());
2727
}
2828

‎src/google-maps/map-marker-clusterer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class GoogleMapDemo {
2929
markerClustererImagePath =
3030
'https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/m';
3131

32-
addMarker(event: google.maps.MouseEvent) {
32+
addMarker(event: google.maps.MapMouseEvent) {
3333
this.markerPositions.push(event.latLng.toJSON());
3434
}
3535
}

‎src/google-maps/map-marker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class GoogleMapDemo {
1919
markerOptions: google.maps.MarkerOptions = {draggable: false};
2020
markerPositions: google.maps.LatLngLiteral[] = [];
2121

22-
addMarker(event: google.maps.MouseEvent) {
22+
addMarker(event: google.maps.MapMouseEvent) {
2323
this.markerPositions.push(event.latLng.toJSON());
2424
}
2525
}

‎src/google-maps/map-marker/map-marker.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ export class MapMarker implements OnInit, OnChanges, OnDestroy, MapAnchorPoint {
107107
* developers.google.com/maps/documentation/javascript/reference/marker#Marker.click
108108
*/
109109
@Output()
110-
mapClick: Observable<google.maps.MouseEvent> =
111-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('click');
110+
mapClick: Observable<google.maps.MapMouseEvent> =
111+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('click');
112112

113113
/**
114114
* See
@@ -129,24 +129,24 @@ export class MapMarker implements OnInit, OnChanges, OnDestroy, MapAnchorPoint {
129129
* developers.google.com/maps/documentation/javascript/reference/marker#Marker.dblclick
130130
*/
131131
@Output()
132-
mapDblclick: Observable<google.maps.MouseEvent> =
133-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('dblclick');
132+
mapDblclick: Observable<google.maps.MapMouseEvent> =
133+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('dblclick');
134134

135135
/**
136136
* See
137137
* developers.google.com/maps/documentation/javascript/reference/marker#Marker.drag
138138
*/
139139
@Output()
140-
mapDrag: Observable<google.maps.MouseEvent> =
141-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('drag');
140+
mapDrag: Observable<google.maps.MapMouseEvent> =
141+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('drag');
142142

143143
/**
144144
* See
145145
* developers.google.com/maps/documentation/javascript/reference/marker#Marker.dragend
146146
*/
147147
@Output()
148-
mapDragend: Observable<google.maps.MouseEvent> =
149-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('dragend');
148+
mapDragend: Observable<google.maps.MapMouseEvent> =
149+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('dragend');
150150

151151
/**
152152
* See
@@ -160,8 +160,8 @@ export class MapMarker implements OnInit, OnChanges, OnDestroy, MapAnchorPoint {
160160
* developers.google.com/maps/documentation/javascript/reference/marker#Marker.dragstart
161161
*/
162162
@Output()
163-
mapDragstart: Observable<google.maps.MouseEvent> =
164-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('dragstart');
163+
mapDragstart: Observable<google.maps.MapMouseEvent> =
164+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('dragstart');
165165

166166
/**
167167
* See
@@ -180,32 +180,32 @@ export class MapMarker implements OnInit, OnChanges, OnDestroy, MapAnchorPoint {
180180
* developers.google.com/maps/documentation/javascript/reference/marker#Marker.mousedown
181181
*/
182182
@Output()
183-
mapMousedown: Observable<google.maps.MouseEvent> =
184-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mousedown');
183+
mapMousedown: Observable<google.maps.MapMouseEvent> =
184+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mousedown');
185185

186186
/**
187187
* See
188188
* developers.google.com/maps/documentation/javascript/reference/marker#Marker.mouseout
189189
*/
190190
@Output()
191-
mapMouseout: Observable<google.maps.MouseEvent> =
192-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mouseout');
191+
mapMouseout: Observable<google.maps.MapMouseEvent> =
192+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mouseout');
193193

194194
/**
195195
* See
196196
* developers.google.com/maps/documentation/javascript/reference/marker#Marker.mouseover
197197
*/
198198
@Output()
199-
mapMouseover: Observable<google.maps.MouseEvent> =
200-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mouseover');
199+
mapMouseover: Observable<google.maps.MapMouseEvent> =
200+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mouseover');
201201

202202
/**
203203
* See
204204
* developers.google.com/maps/documentation/javascript/reference/marker#Marker.mouseup
205205
*/
206206
@Output()
207-
mapMouseup: Observable<google.maps.MouseEvent> =
208-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('mouseup');
207+
mapMouseup: Observable<google.maps.MapMouseEvent> =
208+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('mouseup');
209209

210210
/**
211211
* See
@@ -219,8 +219,8 @@ export class MapMarker implements OnInit, OnChanges, OnDestroy, MapAnchorPoint {
219219
* developers.google.com/maps/documentation/javascript/reference/marker#Marker.rightclick
220220
*/
221221
@Output()
222-
mapRightclick: Observable<google.maps.MouseEvent> =
223-
this._eventManager.getLazyEmitter<google.maps.MouseEvent>('rightclick');
222+
mapRightclick: Observable<google.maps.MapMouseEvent> =
223+
this._eventManager.getLazyEmitter<google.maps.MapMouseEvent>('rightclick');
224224

225225
/**
226226
* See

0 commit comments

Comments
 (0)