@canvas-harness/react 0.1.2 → 0.1.3

package/dist/index.js

@@ -813,12 +813,27 @@ var usePanZoom = (ref, store, tool) => {
       scheduled = false;
       rafId = 0;
       if (pendingZoomFactor !== 1 && pendingZoomAnchor) {
+        const MAX_PER_FRAME = 2;
+        const MIN_PER_FRAME = 0.5;
+        let appliedFactor = pendingZoomFactor;
+        let drained = true;
+        if (appliedFactor > MAX_PER_FRAME) {
+          appliedFactor = MAX_PER_FRAME;
+          pendingZoomFactor = pendingZoomFactor / MAX_PER_FRAME;
+          drained = false;
+        } else if (appliedFactor < MIN_PER_FRAME) {
+          appliedFactor = MIN_PER_FRAME;
+          pendingZoomFactor = pendingZoomFactor / MIN_PER_FRAME;
+          drained = false;
+        } else {
+          pendingZoomFactor = 1;
+        }
         const camera = store.getCamera();
         store.setCamera(
-          zoomAtScreenPoint(camera, clampZoom(camera.z * pendingZoomFactor), pendingZoomAnchor)
+          zoomAtScreenPoint(camera, clampZoom(camera.z * appliedFactor), pendingZoomAnchor)
         );
-        pendingZoomFactor = 1;
-        pendingZoomAnchor = null;
+        if (drained) pendingZoomAnchor = null;
+        else schedule();
       }
       if (pendingDx !== 0 || pendingDy !== 0) {
         const camera = store.getCamera();
@@ -855,7 +870,7 @@ var usePanZoom = (ref, store, tool) => {
       if (isEditing()) return;
       e.preventDefault();
       if (e.ctrlKey || e.metaKey) {
-        const factor = Math.exp(-e.deltaY * 0.01);
+        const factor = Math.abs(e.deltaY) >= 100 ? e.deltaY > 0 ? 1 / 1.1 : 1.1 : Math.exp(-e.deltaY * 0.01);
         pendingZoomFactor *= factor;
         pendingZoomAnchor = screenFromClient(e.clientX, e.clientY);
         pulseMotion("zooming");