@react-google-maps/marker-clusterer 2.6.0 → 2.10.0

package/src/Clusterer.tsx

@@ -26,7 +26,7 @@ const CALCULATOR = function CALCULATOR(
 
   return {
     text: count.toString(),
-    index: index,
+    index,
     title: '',
   }
 }
@@ -134,13 +134,13 @@ export class Clusterer {
     this.setupStyles()
 
     this.addMarkers(optMarkers, true)
-    // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     this.setMap(map) // Note: this causes onAdd to be called
   }
 
   onAdd() {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     this.activeMap = this.getMap()
 
@@ -151,11 +151,10 @@ export class Clusterer {
     // Add the map event listeners
     this.listeners = [
       google.maps.event.addListener(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         this.getMap(),
         'zoom_changed',
-        // eslint-disable-next-line  @getify/proper-arrows/this, @getify/proper-arrows/name
         () => {
           this.resetViewport(false)
           // Workaround for this Google bug: when map is at level 0 and "-" of
@@ -164,10 +163,10 @@ export class Clusterer {
           // event is triggered so the cluster markers that have been removed
           // do not get redrawn. Same goes for a zoom in at maxZoom.
           if (
-            // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             this.getMap().getZoom() === (this.get('minZoom') || 0) ||
-            // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             this.getMap().getZoom() === this.get('maxZoom')
           ) {
@@ -176,11 +175,10 @@ export class Clusterer {
         }
       ),
       google.maps.event.addListener(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         this.getMap(),
         'idle',
-        // eslint-disable-next-line  @getify/proper-arrows/this, @getify/proper-arrows/name
         () => {
           this.redraw()
         }
@@ -188,7 +186,6 @@ export class Clusterer {
     ]
   }
 
-  // eslint-disable-next-line @getify/proper-arrows/this
   onRemove() {
     // Put all the managed markers back on the map:
     for (let i = 0; i < this.markers.length; i++) {
@@ -245,7 +242,7 @@ export class Clusterer {
       }
     }
 
-    // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     this.getMap().fitBounds(bounds)
   }
@@ -396,7 +393,7 @@ export class Clusterer {
 
   addMarkers(markers: MarkerExtended[], optNoDraw: boolean) {
     for (const key in markers) {
-      if (markers.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(markers, key)) {
         this.pushMarkerTo(markers[key])
       }
     }
@@ -409,7 +406,6 @@ export class Clusterer {
   pushMarkerTo(marker: MarkerExtended) {
     // If the marker is draggable add a listener so we can update the clusters on the dragend:
     if (marker.getDraggable()) {
-      // eslint-disable-next-line @getify/proper-arrows/name, @getify/proper-arrows/this
       google.maps.event.addListener(marker, 'dragend', () => {
         if (this.ready) {
           marker.isAdded = false
@@ -500,7 +496,7 @@ export class Clusterer {
   }
 
   getExtendedBounds(bounds: google.maps.LatLngBounds): google.maps.LatLngBounds {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     const projection = this.getProjection()
     // Convert the points to pixels and the extend out by the grid size.
@@ -640,6 +636,7 @@ export class Clusterer {
       if (this.timerRefStatic !== null) {
         window.clearTimeout(this.timerRefStatic)
 
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         delete this.timerRefStatic
       }
@@ -650,16 +647,16 @@ export class Clusterer {
     //
     // See Comments 9 & 11 on Issue 3651 relating to this workaround for a Google Maps bug:
     const mapBounds =
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       this.getMap().getZoom() > 3
         ? new google.maps.LatLngBounds(
-            // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             this.getMap()
               .getBounds()
               .getSouthWest(),
-            // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             this.getMap()
               .getBounds()
@@ -677,16 +674,13 @@ export class Clusterer {
     for (let i = iFirst; i < iLast; i++) {
       const marker = this.markers[i]
 
-      if (!marker.isAdded && this.isMarkerInBounds(marker, bounds)) {
-        if (!this.ignoreHidden || (this.ignoreHidden && marker.getVisible())) {
-          this.addToClosestCluster(marker)
-        }
+      if (!marker.isAdded && this.isMarkerInBounds(marker, bounds) && (!this.ignoreHidden || (this.ignoreHidden && marker.getVisible()))) {
+        this.addToClosestCluster(marker)
       }
     }
 
     if (iLast < this.markers.length) {
       this.timerRefStatic = window.setTimeout(
-        // eslint-disable-next-line @getify/proper-arrows/this, @getify/proper-arrows/name
         () => {
           this.createClusters(iLast)
         },
@@ -714,12 +708,12 @@ export class Clusterer {
     return function applyExtend(object: any) {
       // eslint-disable-next-line guard-for-in
       for (const property in object.prototype) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         this.prototype[property] = object.prototype[property]
       }
 
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       return this
     }.apply(obj1, [obj2])

package/src/__tests__/clusterer.test.ts

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { Clusterer } from '../Clusterer'
 
 describe('Clusterer', () => {

package/src/index.ts

@@ -43,9 +43,9 @@ export { Cluster } from './Cluster'
 export { ClusterIcon } from './ClusterIcon'
 
 export {
-  ClusterIconInfo,
-  ClusterIconStyle,
-  MarkerExtended,
-  TCalculator,
-  ClustererOptions,
+  type ClusterIconInfo,
+  type ClusterIconStyle,
+  type MarkerExtended,
+  type TCalculator,
+  type ClustererOptions,
 } from './types'

package/src/types.tsx

@@ -11,6 +11,22 @@ export type MarkerExtended = google.maps.Marker & {
 
 export type TCalculator = (markers: MarkerExtended[], num: number) => ClusterIconInfo
 
+export interface ClusterIconStyle {
+  url: string
+  className?: string
+  height: number
+  width: number
+  anchorText?: number[]
+  anchorIcon?: number[]
+  textColor?: string
+  textSize?: number
+  textDecoration?: string
+  fontWeight?: string
+  fontStyle?: string
+  fontFamily?: string
+  backgroundPosition?: string
+}
+
 export interface ClustererOptions {
   gridSize?: number
   maxZoom?: number
@@ -29,19 +45,3 @@ export interface ClustererOptions {
   imageExtension?: string
   imageSizes?: number[]
 }
-
-export interface ClusterIconStyle {
-  url: string
-  className?: string
-  height: number
-  width: number
-  anchorText?: number[]
-  anchorIcon?: number[]
-  textColor?: string
-  textSize?: number
-  textDecoration?: string
-  fontWeight?: string
-  fontStyle?: string
-  fontFamily?: string
-  backgroundPosition?: string
-}

package/src/setup-tests.js

@@ -1,356 +0,0 @@
-const createMockFuncsFromArray = (instance, names = []) => {
-  names.forEach(name => {
-    instance[name] = jest.fn().mockName(name)
-  })
-}
-
-const createGoogleMapsMock = (libraries = []) => {
-  const createMVCObject = instance => {
-    const listeners = {}
-    instance.listeners = listeners
-
-    instance.addListener = jest
-      .fn((event, fn) => {
-        listeners[event] = listeners[event] || []
-        listeners[event].push(fn)
-        return {
-          remove: () => {
-            const index = listeners[event].indexOf(fn)
-
-            if (index !== -1) {
-              listeners[event].splice(index, 1)
-            }
-          },
-        }
-      })
-      .mockName('addListener')
-
-    createMockFuncsFromArray(instance, [
-      'bindTo',
-      'get',
-      'notify',
-      'set',
-      'setValues',
-      'unbind',
-      'unbindAll',
-    ])
-  }
-
-  const OverlayViewMock = function() {}
-  OverlayViewMock.prototype.setMap = jest.fn()
-
-  const maps = {
-    Animation: {
-      BOUNCE: 1,
-      DROP: 2,
-      Lo: 3,
-      Go: 4,
-    },
-    BicyclingLayer: jest.fn().mockImplementation(function() {
-      createMVCObject(this)
-      createMockFuncsFromArray(this, ['setMap'])
-    }),
-    TransitLayer: jest.fn().mockImplementation(function() {
-      createMVCObject(this)
-      createMockFuncsFromArray(this, ['setMap'])
-    }),
-    Circle: jest.fn().mockImplementation(function(opts) {
-      this.opts = opts
-      createMVCObject(this)
-      createMockFuncsFromArray(this, [
-        'setCenter',
-        'setDraggable',
-        'setEditable',
-        'setMap',
-        'setOptions',
-        'setRadius',
-        'setVisible',
-      ])
-    }),
-    ControlPosition: {
-      TOP_LEFT: 1,
-      TOP_CENTER: 2,
-      TOP: 2,
-      TOP_RIGHT: 3,
-      LEFT_CENTER: 4,
-      LEFT: 5,
-      LEFT_TOP: 5,
-      LEFT_BOTTOM: 6,
-      RIGHT: 7,
-      RIGHT_CENTER: 8,
-      RIGHT_BOTTOM: 9,
-      BOTTOM_LEFT: 10,
-      BOTTOM: 11,
-      BOTTOM_CENTER: 11,
-      BOTTOM_RIGHT: 12,
-      CENTER: 13,
-    },
-    Data: jest.fn().mockImplementation(function(options) {
-      this.options = options
-      createMVCObject(this)
-      createMockFuncsFromArray(this, [
-        'setControlPosition',
-        'setControls',
-        'setDrawingMode',
-        'setMap',
-        'setStyle',
-      ])
-    }),
-    DirectionsRenderer: jest.fn().mockImplementation(function(opts) {
-      this.opts = opts
-      createMVCObject(this)
-      createMockFuncsFromArray(this, [
-        'setDirections',
-        'setMap',
-        'setOptions',
-        'setPanel',
-        'setRouteIndex',
-      ])
-    }),
-    DirectionsService: function() {},
-    DirectionsStatus: {
-      INVALID_REQUEST: 'INVALID_REQUEST',
-      MAX_WAYPOINTS_EXCEEDED: 'MAX_WAYPOINTS_EXCEEDED',
-      NOT_FOUND: 'NOT_FOUND',
-      OK: 'OK',
-      OVER_QUERY_LIMIT: 'OVER_QUERY_LIMIT',
-      REQUEST_DENIED: 'REQUEST_DENIED',
-      UNKNOWN_ERROR: 'UNKNOWN_ERROR',
-      ZERO_RESULTS: 'ZERO_RESULTS',
-    },
-    DirectionsTravelMode: {
-      BICYCLING: 'BICYCLING',
-      DRIVING: 'DRIVING',
-      TRANSIT: 'TRANSIT',
-      WALKING: 'WALKING',
-    },
-    DirectionsUnitSystem: {
-      IMPERIAL: 1,
-      METRIC: 0,
-    },
-    DistanceMatrixElementStatus: {
-      NOT_FOUND: 'NOT_FOUND',
-      OK: 'OK',
-      ZERO_RESULTS: 'ZERO_RESULTS',
-    },
-    DistanceMatrixService: function() {},
-    DistanceMatrixStatus: {
-      INVALID_REQUEST: 'INVALID_REQUEST',
-      MAX_DIMENSIONS_EXCEEDED: 'MAX_DIMENSIONS_EXCEEDED',
-      MAX_ELEMENTS_EXCEEDED: 'MAX_ELEMENTS_EXCEEDED',
-      OK: 'OK',
-      OVER_QUERY_LIMIT: 'OVER_QUERY_LIMIT',
-      REQUEST_DENIED: 'REQUEST_DENIED',
-      UNKNOWN_ERROR: 'UNKNOWN_ERROR',
-    },
-    ElevationService: function() {},
-    ElevationStatus: {
-      Co: 'DATA_NOT_AVAILABLE',
-      INVALID_REQUEST: 'INVALID_REQUEST',
-      OK: 'OK',
-      OVER_QUERY_LIMIT: 'OVER_QUERY_LIMIT',
-      REQUEST_DENIED: 'REQUEST_DENIED',
-      UNKNOWN_ERROR: 'UNKNOWN_ERROR',
-    },
-    FusionTablesLayer: jest.fn().mockImplementation(function(options) {
-      this.options = options
-      createMVCObject(this)
-      createMockFuncsFromArray(this, ['setMap', 'setOptions'])
-    }),
-    Geocoder: function() {},
-    GeocoderLocationType: {
-      APPROXIMATE: 'APPROXIMATE',
-      GEOMETRIC_CENTER: 'GEOMETRIC_CENTER',
-      RANGE_INTERPOLATED: 'RANGE_INTERPOLATED',
-      ROOFTOP: 'ROOFTOP',
-    },
-    GeocoderStatus: {
-      ERROR: 'ERROR',
-      INVALID_REQUEST: 'INVALID_REQUEST',
-      OK: 'OK',
-      OVER_QUERY_LIMIT: 'OVER_QUERY_LIMIT',
-      REQUEST_DENIED: 'REQUEST_DENIED',
-      UNKNOWN_ERROR: 'UNKNOWN_ERROR',
-      ZERO_RESULTS: 'ZERO_RESULTS',
-    },
-    GroundOverlay: function() {},
-    ImageMapType: function() {},
-    InfoWindow: function() {},
-    KmlLayer: function() {},
-    KmlLayerStatus: {
-      DOCUMENT_NOT_FOUND: 'DOCUMENT_NOT_FOUND',
-      DOCUMENT_TOO_LARGE: 'DOCUMENT_TOO_LARGE',
-      FETCH_ERROR: 'FETCH_ERROR',
-      INVALID_DOCUMENT: 'INVALID_DOCUMENT',
-      INVALID_REQUEST: 'INVALID_REQUEST',
-      LIMITS_EXCEEDED: 'LIMITS_EXCEEDED',
-      OK: 'OK',
-      TIMED_OUT: 'TIMED_OUT',
-      UNKNOWN: 'UNKNOWN',
-    },
-    LatLng: function() {},
-    LatLngBounds: function() {},
-    MVCArray: function() {},
-    MVCObject: jest.fn().mockImplementation(function() {
-      createMVCObject(this)
-    }),
-    Map: jest.fn().mockImplementation(function(mapDiv, opts) {
-      this.mapDiv = mapDiv
-      this.opts = opts
-      createMVCObject(this)
-      createMockFuncsFromArray(this, [
-        'setCenter',
-        'setClickableIcons',
-        'setHeading',
-        'setMapTypeId',
-        'setOptions',
-        'setStreetView',
-        'setTilt',
-        'setZoom',
-        'fitBounds',
-        'getBounds',
-        'panToBounds',
-      ])
-    }),
-    MapTypeControlStyle: {
-      DEFAULT: 0,
-      DROPDOWN_MENU: 2,
-      HORIZONTAL_BAR: 1,
-      INSET: 3,
-      INSET_LARGE: 4,
-    },
-    MapTypeId: {
-      HYBRID: 'hybrid',
-      ROADMAP: 'roadmap',
-      SATELLITE: 'satellite',
-      TERRAIN: 'terrain',
-    },
-    MapTypeRegistry: function() {},
-    Marker: jest.fn().mockImplementation(function(opts) {
-      this.opts = opts
-      createMVCObject(this)
-      createMockFuncsFromArray(this, [
-        'setMap',
-        'setOpacity',
-        'setOptions',
-        'setPosition',
-        'setShape',
-        'setTitle',
-        'setVisible',
-        'setZIndex',
-      ])
-    }),
-    MarkerImage: function() {},
-    MaxZoomService: function() {
-      return {
-        getMaxZoomAtLatLng: function() {},
-      }
-    },
-    MaxZoomStatus: {
-      ERROR: 'ERROR',
-      OK: 'OK',
-    },
-    NavigationControlStyle: {
-      ANDROID: 2,
-      DEFAULT: 0,
-      Mo: 4,
-      SMALL: 1,
-      ZOOM_PAN: 3,
-      ik: 5,
-    },
-    OverlayView: OverlayViewMock,
-    Point: function() {},
-    Polygon: function() {},
-    Polyline: function() {},
-    Rectangle: function() {},
-    SaveWidget: function() {},
-    ScaleControlStyle: {
-      DEFAULT: 0,
-    },
-    Size: function() {},
-    StreetViewCoverageLayer: function() {},
-    StreetViewPanorama: function() {},
-    StreetViewPreference: {
-      BEST: 'best',
-      NEAREST: 'nearest',
-    },
-    StreetViewService: function() {},
-    StreetViewSource: {
-      DEFAULT: 'default',
-      OUTDOOR: 'outdoor',
-    },
-    StreetViewStatus: {
-      OK: 'OK',
-      UNKNOWN_ERROR: 'UNKNOWN_ERROR',
-      ZERO_RESULTS: 'ZERO_RESULTS',
-    },
-    StrokePosition: {
-      CENTER: 0,
-      INSIDE: 1,
-      OUTSIDE: 2,
-    },
-    StyledMapType: function() {},
-    SymbolPath: {
-      BACKWARD_CLOSED_ARROW: 3,
-      BACKWARD_OPEN_ARROW: 4,
-      CIRCLE: 0,
-      FORWARD_CLOSED_ARROW: 1,
-      FORWARD_OPEN_ARROW: 2,
-    },
-    TrafficLayer: jest.fn().mockImplementation(function(opts) {
-      this.opts = opts
-      createMVCObject(this)
-      createMockFuncsFromArray(this, ['setMap', 'setOptions'])
-    }),
-    TrafficModel: {
-      BEST_GUESS: 'bestguess',
-      OPTIMISTIC: 'optimistic',
-      PESSIMISTIC: 'pessimistic',
-    },
-    TransitMode: {
-      BUS: 'BUS',
-      RAIL: 'RAIL',
-      SUBWAY: 'SUBWAY',
-      TRAIN: 'TRAIN',
-      TRAM: 'TRAM',
-    },
-    TransitRoutePreference: {
-      FEWER_TRANSFERS: 'FEWER_TRANSFERS',
-      LESS_WALKING: 'LESS_WALKING',
-    },
-    TravelMode: {
-      BICYCLING: 'BICYCLING',
-      DRIVING: 'DRIVING',
-      TRANSIT: 'TRANSIT',
-      WALKING: 'WALKING',
-    },
-    UnitSystem: {
-      IMPERIAL: 1,
-      METRIC: 0,
-    },
-    ZoomControlStyle: {
-      DEFAULT: 0,
-      LARGE: 2,
-      SMALL: 1,
-      ik: 3,
-    },
-    __gjsload__: function() {},
-    event: {
-      clearInstanceListeners: jest.fn().mockName('clearInstanceListeners'),
-    },
-  }
-
-  if (libraries.includes('places')) {
-    maps.places = {
-      AutocompleteService: jest.fn(() => ({
-        getPlacePredictions: jest.fn(),
-      })),
-    }
-  }
-
-  return maps
-}
-
-window.google = {
-  maps: createGoogleMapsMock(),
-}