fix: tests

Author: kurkle

src/hammer.ts

@@ -22,7 +22,7 @@ function createEnabler(chart: Chart, state: State) {
       event.pointerType === 'mouse' &&
       (keyNotPressed(getModifierKey(panOptions), srcEvent) || keyPressed(getModifierKey(zoomOptions.drag), srcEvent))
     ) {
-      panOptions.onPanRejected?.({ chart, event: event.srcEvent })
+      panOptions.onPanRejected?.({ chart, event })
       return false
     }
     return true
@@ -111,8 +111,8 @@ function startPan(chart: Chart, state: State, event: HammerInput) {
     y: event.center.y - rect.top,
   }
 
-  if (onPanStart?.({ chart, event: event.srcEvent, point }) === false) {
-    return onPanRejected?.({ chart, event: event.srcEvent })
+  if (onPanStart?.({ chart, event, point }) === false) {
+    return onPanRejected?.({ chart, event })
   }
 
   state.panScales = getEnabledScalesByPoint(state.options.pan, point, chart)

src/options.ts

@@ -7,8 +7,13 @@ export type ModifierKey = 'ctrl' | 'alt' | 'shift' | 'meta'
 export type DrawTime = 'afterDraw' | 'afterDatasetsDraw' | 'beforeDraw' | 'beforeDatasetsDraw'
 export type ZoomTrigger = 'api' | 'drag' | 'wheel' | 'pinch'
 
-type RejectableStartEvent = (context: { chart: Chart; event: Event; point: Point }) => boolean | undefined
-type RejectEvent = (context: { chart: Chart; event: Event }) => void
+type RejectableStartEvent<T = Event | HammerInput> = (context: {
+  chart: Chart
+  event: T
+  point: Point
+}) => boolean | undefined
+type RejectEvent<T = Event | HammerInput> = (context: { chart: Chart; event: T }) => void
+
 type GenericEvent = (context: { chart: Chart }) => void
 
 export interface WheelOptions {
@@ -125,9 +130,9 @@ export interface ZoomOptions {
   /**
    * Function called when wheel input occurs without modifier key
    */
-  onZoomRejected?: RejectEvent
+  onZoomRejected?: RejectEvent<Event>
 
-  onZoomStart?: RejectableStartEvent
+  onZoomStart?: RejectableStartEvent<Event>
 }
 
 /**
@@ -178,9 +183,9 @@ export interface PanOptions {
    * Function called when pan fails because modifier key was not detected.
    * event is the Hammer event that failed - see https://hammerjs.github.io/api#event-object
    */
-  onPanRejected?: RejectEvent
+  onPanRejected?: RejectEvent<HammerInput>
 
-  onPanStart?: RejectableStartEvent
+  onPanStart?: RejectableStartEvent<HammerInput>
 }
 
 export interface ScaleLimits {

src/utils.ts

@@ -60,13 +60,15 @@ const convertOverScaleMode = (
   scaleEnabled: { x: boolean; y: boolean },
   enabled: { x: boolean; y: boolean }
 ) => {
-  if (overScaleMode) {
-    const overScaleEnabled = directionsEnabled(overScaleMode, chart)
-    for (const axis of ['x', 'y'] as const) {
-      if (overScaleEnabled[axis]) {
-        scaleEnabled[axis] = enabled[axis]
-        enabled[axis] = false
-      }
+  if (!overScaleMode) {
+    return
+  }
+
+  const overScaleEnabled = directionsEnabled(overScaleMode, chart)
+  for (const axis of ['x', 'y'] as const) {
+    if (overScaleEnabled[axis]) {
+      scaleEnabled[axis] = enabled[axis]
+      enabled[axis] = false
     }
   }
 }

test/types/exports.ts

@@ -1,16 +1,18 @@
-import {Chart} from 'chart.js';
-import Zoom, {pan, zoom, resetZoom} from '../../src';
+import { Chart } from 'chart.js'
+import Zoom, { pan, zoom, resetZoom } from '../../src'
 
-Chart.register(Zoom);
-Chart.unregister(Zoom);
+Chart.register(Zoom)
+Chart.unregister(Zoom)
 
 const chart = new Chart('id', {
   type: 'bar',
   data: {
     labels: [],
-    datasets: [{
-      data: []
-    }]
+    datasets: [
+      {
+        data: [],
+      },
+    ],
   },
   options: {
     plugins: {
@@ -19,45 +21,45 @@ const chart = new Chart('id', {
           x: {
             min: 1,
             max: 2,
-            minRange: 1
+            minRange: 1,
           },
           y: {
             min: 1,
             max: 2,
-            minRange: 1
+            minRange: 1,
           },
           y2: {
             min: 10,
             max: 20,
-            minRange: 5
-          }
+            minRange: 5,
+          },
         },
         pan: {
           enabled: true,
           mode: 'x',
-          onPanStart({event}) {
-            return event.distance > 2;
-          }
+          onPanStart({ event }) {
+            return event.distance > 2
+          },
         },
         zoom: {
           wheel: {
-            enabled: true
+            enabled: true,
           },
           mode: 'x',
-        }
+        },
       },
-    }
+    },
   },
-  plugins: [Zoom]
-});
+  plugins: [Zoom],
+})
 
-chart.resetZoom();
-chart.zoom(1.1);
-chart.zoom({x: 1, y: 1.1, focalPoint: {x: 10, y: 10}}, 'zoom');
+chart.resetZoom()
+chart.zoom(1.1)
+chart.zoom({ x: 1, y: 1.1, focalPoint: { x: 10, y: 10 } }, 'zoom')
 
-chart.pan(10);
-chart.pan({x: 10, y: 20}, [chart.scales.x]);
+chart.pan(10)
+chart.pan({ x: 10, y: 20 }, [chart.scales.x])
 
-pan(chart, -42, undefined, 'zoom');
-zoom(chart, {x: 1, y: 1.1, focalPoint: {x: 10, y: 10}}, 'zoom');
-resetZoom(chart, 'none');
+pan(chart, -42, undefined, 'zoom')
+zoom(chart, { x: 1, y: 1.1, focalPoint: { x: 10, y: 10 } }, 'zoom')
+resetZoom(chart, 'none')