Fix typings issues in 3.2.0

package.json

@@ -25,6 +25,7 @@
     "@types/mapbox__point-geometry": "^0.1.2",
     "@types/mapbox__vector-tile": "^1.3.0",
     "@types/pbf": "^3.0.2",
+    "@types/supercluster": "^7.1.0",
     "earcut": "^2.2.4",
     "geojson-vt": "^3.2.1",
     "gl-matrix": "^3.4.3",
@@ -69,7 +70,6 @@
     "@types/react-dom": "^18.2.6",
     "@types/request": "^2.48.8",
     "@types/shuffle-seed": "^1.1.0",
-    "@types/supercluster": "^7.1.0",
     "@types/window-or-global": "^1.0.4",
     "@typescript-eslint/eslint-plugin": "^5.61.0",
     "@typescript-eslint/parser": "^5.62.0",

src/ui/hash.ts

@@ -133,6 +133,5 @@ export class Hash {
     /**
      * Mobile Safari doesn't allow updating the hash more than 100 times per 30 seconds.
      */
-    _updateHash = throttle(this._updateHashUnthrottled, 30 * 1000 / 100);
-
+    _updateHash: () => ReturnType<typeof setTimeout> = throttle(this._updateHashUnthrottled, 30 * 1000 / 100);
 }

src/ui/map.ts

@@ -1411,13 +1411,13 @@ export class Map extends Camera {
      * @see [Create a hover effect](https://maplibre.org/maplibre-gl-js/docs/examples/hover-styles/)
      * @see [Create a draggable marker](https://maplibre.org/maplibre-gl-js/docs/examples/drag-a-point/)
      */
-    on(type: keyof MapEventType | string, listener: Listener): this;
     on<T extends keyof MapLayerEventType>(
         type: T,
         layer: string,
         listener: (ev: MapLayerEventType[T] & Object) => void,
     ): Map;
     on<T extends keyof MapEventType>(type: T, listener: (ev: MapEventType[T] & Object) => void): this;
+    on(type: keyof MapEventType | string, listener: Listener): this;
     /**
      * This is an overload of the `on` method that allows to listen to events based on the `layerId`
      * @event

src/ui/map_events.test.ts

@@ -170,6 +170,19 @@ describe('map events', () => {
         expect(handler.onMove).toHaveBeenCalledTimes(1);
     });
 
+    test('Map#on allows a listener to infer the event type ', () => {
+        const map = createMap();
+
+        const spy = jest.fn();
+        map.on('mousemove', (event) => {
+            const {lng, lat} = event.lngLat;
+            spy({lng, lat});
+        });
+
+        simulate.mousemove(map.getCanvas());
+        expect(spy).toHaveBeenCalledTimes(1);
+    });
+
     test('Map#off removes a delegated event listener', () => {
         const map = createMap();
 
@@ -244,6 +257,62 @@ describe('map events', () => {
         expect(spyB).not.toHaveBeenCalled();
     });
 
+    test('Map#off calls an event listener with no type arguments, defaulting to \'unknown\' originalEvent type', () => {
+        const map = createMap();
+
+        const handler = {
+            onMove: function onMove(_event: MapLibreEvent) {}
+        };
+
+        jest.spyOn(handler, 'onMove');
+
+        map.off('move', (event) => handler.onMove(event));
+        map.jumpTo({center: {lng: 10, lat: 10}});
+
+        expect(handler.onMove).toHaveBeenCalledTimes(0);
+    });
+
+    test('Map#off allows a listener to infer the event type ', () => {
+        const map = createMap();
+
+        const spy = jest.fn();
+        map.off('mousemove', (event) => {
+            const {lng, lat} = event.lngLat;
+            spy({lng, lat});
+        });
+
+        simulate.mousemove(map.getCanvas());
+        expect(spy).toHaveBeenCalledTimes(0);
+    });
+
+    test('Map#once calls an event listener with no type arguments, defaulting to \'unknown\' originalEvent type', () => {
+        const map = createMap();
+
+        const handler = {
+            onMoveOnce: function onMoveOnce(_event: MapLibreEvent) {}
+        };
+
+        jest.spyOn(handler, 'onMoveOnce');
+
+        map.once('move', (event) => handler.onMoveOnce(event));
+        map.jumpTo({center: {lng: 10, lat: 10}});
+
+        expect(handler.onMoveOnce).toHaveBeenCalledTimes(1);
+    });
+
+    test('Map#once allows a listener to infer the event type ', () => {
+        const map = createMap();
+
+        const spy = jest.fn();
+        map.once('mousemove', (event) => {
+            const {lng, lat} = event.lngLat;
+            spy({lng, lat});
+        });
+
+        simulate.mousemove(map.getCanvas());
+        expect(spy).toHaveBeenCalledTimes(1);
+    });
+
     (['mouseenter', 'mouseover'] as (keyof MapLayerEventType)[]).forEach((event) => {
         test(`Map#on ${event} does not fire if the specified layer does not exist`, () => {
             const map = createMap();