@genome-spy/core 0.48.0 → 0.48.2

package/dist/src/view/zoom.js

@@ -46,15 +46,21 @@ export function interactionToZoom(event, coords, handleZoom, hover, animator) {
     handleZoom = recordTimeStamp(handleZoom);
 
     if (event.type == "wheel") {
+        // TODO: Wheel-zoom inertia should probably be moved here and the faked wheel
+        // events in genomeSpy.js and inertia.js should be retired.
+
         event.uiEvent.preventDefault(); // TODO: Only if there was something zoomable
 
         const wheelEvent = /** @type {WheelEvent} */ (event.uiEvent);
         const wheelMultiplier = wheelEvent.deltaMode ? 120 : 1;
 
-        if (wheelEvent.deltaX === 0 && wheelEvent.deltaY === 0) {
+        if (!wheelEvent.deltaX && !wheelEvent.deltaY) {
             return;
         }
 
+        // Stop drag-to-pan inertia
+        smoother?.stop();
+
         let { x, y } = event.point;
 
         // Snapping to the hovered item:
@@ -63,9 +69,6 @@ export function interactionToZoom(event, coords, handleZoom, hover, animator) {
         // This allows the user to rapidly zoom closer without having to
         // continuously adjust the cursor position.
 
-        // Stop drag-to-pan inertia
-        smoother?.stop();
-
         if (hover) {
             const e = hover.mark.encoders;
             if (e.x && !e.x2 && !e.x.constantValue) {
@@ -102,7 +105,7 @@ export function interactionToZoom(event, coords, handleZoom, hover, animator) {
         }
 
         /** @type {RingBuffer<{point: Point, timestamp: number}>} */
-        const buffer = new RingBuffer(30);
+        const eventBuffer = new RingBuffer(30);
 
         const mouseEvent = /** @type {MouseEvent} */ (event.uiEvent);
         mouseEvent.preventDefault();
@@ -113,7 +116,7 @@ export function interactionToZoom(event, coords, handleZoom, hover, animator) {
             moveEvent
         ) => {
             const point = Point.fromMouseEvent(moveEvent);
-            buffer.push({ point, timestamp: performance.now() });
+            eventBuffer.push({ point, timestamp: performance.now() });
 
             const delta = point.subtract(prevPoint);
 
@@ -132,7 +135,7 @@ export function interactionToZoom(event, coords, handleZoom, hover, animator) {
             const lastMillisToInclude = 160;
 
             const now = performance.now();
-            const arr = buffer
+            const arr = eventBuffer
                 .get()
                 .filter((p) => now - p.timestamp < lastMillisToInclude);
 
@@ -148,25 +151,30 @@ export function interactionToZoom(event, coords, handleZoom, hover, animator) {
                 .multiply(1 / (a.timestamp - b.timestamp));
 
             let x = prevPoint.x;
+            let y = prevPoint.y;
 
             smoother = makeLerpSmoother(
                 animator,
-                (a) => {
+                (p) => {
                     handleZoom({
-                        x: a,
-                        y: prevPoint.y,
-                        xDelta: x - a,
-                        yDelta: 0,
+                        x: p.x,
+                        y: p.y,
+                        xDelta: x - p.x,
+                        yDelta: y - p.y,
                         zDelta: 0,
                     });
-                    x = a;
+                    x = p.x;
+                    y = p.y;
                 },
                 150,
                 0.5,
-                x
+                { x, y }
             );
 
-            smoother(prevPoint.x - v.x * 250);
+            smoother({
+                x: prevPoint.x - v.x * 250,
+                y: prevPoint.y - v.y * 250,
+            });
         };
 
         const onMouseup = () => {

package/package.json

@@ -7,7 +7,7 @@
   },
   "contributors": [],
   "license": "MIT",
-  "version": "0.48.0",
+  "version": "0.48.2",
   "jsdelivr": "dist/bundle/index.js",
   "unpkg": "dist/bundle/index.js",
   "browser": "dist/bundle/index.js",
@@ -64,5 +64,5 @@
     "vega-scale": "^7.3.1",
     "vega-util": "^1.17.2"
   },
-  "gitHead": "64cd3335607b2608db3c85c74a4fb571302e77d0"
+  "gitHead": "f2817f82263b92e453356083f2d770b8b236f77a"
 }