feat: update to @types/google.maps (#122)

package.json

@@ -36,7 +36,7 @@
     "@babel/preset-env": "^7.12.13",
     "@babel/runtime-corejs3": "^7.13.8",
     "@googlemaps/jest-mocks": "^0.1.0",
-    "@types/googlemaps": "^3.43.3",
+    "@types/google.maps": "^3.44.0",
     "@types/jest": "^26.0.20",
     "@types/selenium-webdriver": "^4.0.11",
     "@typescript-eslint/eslint-plugin": ">=4.15.0",

src/marker.ts

@@ -46,7 +46,7 @@ export class MarkerWithLabel extends MarkerSafe {
   private isMouseDownOnLabel = false;
   private shouldIgnoreClick = false;
   private eventOffset: google.maps.Point | null;
-  private mouseOutTimeout: number;
+  private mouseOutTimeout: ReturnType<typeof setTimeout>;
 
   constructor(options: MarkerWithLabelOptions) {
     super({ ...options });
@@ -212,40 +212,48 @@ export class MarkerWithLabel extends MarkerSafe {
           });
           abortEvent(e);
         }),
-        google.maps.event.addListener(this.getMap(), MOUSEMOVE, (e) => {
+        google.maps.event.addListener(
-          if (this.isMouseDownOnLabel && this.getDraggable()) {
+          this.getMap(),
-            if (this.isDraggingLabel) {
+          MOUSEMOVE,
-              // Adjust for offset
+          (e: google.maps.MapMouseEvent) => {
-              const position = new google.maps.LatLng(
+            if (this.isMouseDownOnLabel && this.getDraggable()) {
-                e.latLng.lat() - this.eventOffset.y,
+              if (this.isDraggingLabel) {
-                e.latLng.lng() - this.eventOffset.x
+                // Adjust for offset
-              );
+                const position = new google.maps.LatLng(
-              // this.setPosition(position);
+                  e.latLng.lat() - this.eventOffset.y,
-              google.maps.event.trigger(this, DRAG, {
+                  e.latLng.lng() - this.eventOffset.x
-                ...e,
+                );
-                latLng: position,
+                // this.setPosition(position);
-              });
+                google.maps.event.trigger(this, DRAG, {
-            } else {
+                  ...e,
-              this.isDraggingLabel = true;
+                  latLng: position,
+                });
+              } else {
+                this.isDraggingLabel = true;
 
-              // Calculate and store event offset from marker position
+                // Calculate and store event offset from marker position
-              this.eventOffset = new google.maps.Point(
+                this.eventOffset = new google.maps.Point(
-                e.latLng.lng() - this.getPosition().lng(),
+                  e.latLng.lng() - this.getPosition().lng(),
-                e.latLng.lat() - this.getPosition().lat()
+                  e.latLng.lat() - this.getPosition().lat()
-              );
+                );
-              google.maps.event.trigger(this, DRAGSTART, {
+                google.maps.event.trigger(this, DRAGSTART, {
-                ...e,
+                  ...e,
-                latLng: this.getPosition(),
+                  latLng: this.getPosition(),
-              });
+                });
+              }
             }
           }
-        }),
+        ),
         google.maps.event.addListener(this, DRAGSTART, () => {
           this.label.zIndex = 1000000;
         }),
-        google.maps.event.addListener(this, DRAG, ({ latLng }) => {
+        google.maps.event.addListener(
-          this.setPosition(latLng);
+          this,
-        }),
+          DRAG,
+          ({ latLng }: google.maps.MapMouseEvent) => {
+            this.setPosition(latLng);
+          }
+        ),
         google.maps.event.addListener(this, DRAGEND, () => {
           this.label.zIndex = this.getZIndex();
           this.label.draw();

tsconfig.json

@@ -7,7 +7,6 @@
     "sourceMap": true,
     "esModuleInterop": true,
     "lib": ["DOM", "ESNext"],
-    "types": ["googlemaps", "jest"],
     "target": "ES6",
     "moduleResolution": "node"
   },