Normalize zoom speed and wheel behavior across trace types

Author: rreusser

src/components/fx/layout_attributes.js

@@ -31,6 +31,17 @@ module.exports = {
             '3D scenes.'
         ].join(' ')
     },
+    zoomspeed: {
+        valType: 'number',
+        role: 'info',
+        dflt: 1,
+        min: 0,
+        editType: 'none',
+        description: [
+            'Sets the speed at which the mouse wheel zooms the plot. Larger',
+            'values are faster.'
+        ].join(' ')
+    },
     hovermode: {
         valType: 'enumerated',
         role: 'info',

src/components/fx/layout_defaults.js

@@ -17,6 +17,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
     }
 
     coerce('dragmode');
+    coerce('zoomspeed');
 
     var hovermodeDflt;
     if(layoutOut._has('cartesian')) {

src/plots/cartesian/dragbox.js

@@ -380,7 +380,7 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
             return;
         }
 
-        var zoom = Math.exp(-Math.min(Math.max(wheelDelta, -20), 20) / 100),
+        var zoom = Math.exp(-Math.min(Math.max(wheelDelta, -20), 20) / 100 * fullLayout.zoomspeed),
             gbb = mainplot.draglayer.select('.nsewdrag')
                 .node().getBoundingClientRect(),
             xfrac = (e.clientX - gbb.left) / gbb.width,

src/plots/gl2d/camera.js

@@ -262,34 +262,27 @@ function createCamera(scene) {
         var lastX = result.lastPos[0],
             lastY = result.lastPos[1];
 
-        switch(scene.fullLayout.dragmode) {
-            case 'zoom':
-                break;
-
-            case 'pan':
-                var scale = Math.exp(0.1 * dy / (viewBox[3] - viewBox[1]));
-
-                var cx = lastX /
-                        (viewBox[2] - viewBox[0]) * (dataBox[2] - dataBox[0]) +
-                    dataBox[0];
-                var cy = lastY /
-                        (viewBox[3] - viewBox[1]) * (dataBox[3] - dataBox[1]) +
-                    dataBox[1];
-
-                dataBox[0] = (dataBox[0] - cx) * scale + cx;
-                dataBox[2] = (dataBox[2] - cx) * scale + cx;
-                dataBox[1] = (dataBox[1] - cy) * scale + cy;
-                dataBox[3] = (dataBox[3] - cy) * scale + cy;
-
-                scene.setRanges(dataBox);
-
-                result.lastInputTime = Date.now();
-                unSetAutoRange();
-                scene.cameraChanged();
-                scene.handleAnnotations();
-                scene.relayoutCallback();
-                break;
-        }
+        var scale = Math.exp(scene.fullLayout.zoomspeed * 10.0 * dy / (viewBox[3] - viewBox[1]));
+
+        var cx = lastX /
+                (viewBox[2] - viewBox[0]) * (dataBox[2] - dataBox[0]) +
+            dataBox[0];
+        var cy = lastY /
+                (viewBox[3] - viewBox[1]) * (dataBox[3] - dataBox[1]) +
+            dataBox[1];
+
+        dataBox[0] = (dataBox[0] - cx) * scale + cx;
+        dataBox[2] = (dataBox[2] - cx) * scale + cx;
+        dataBox[1] = (dataBox[1] - cy) * scale + cy;
+        dataBox[3] = (dataBox[3] - cy) * scale + cy;
+
+        scene.setRanges(dataBox);
+
+        result.lastInputTime = Date.now();
+        unSetAutoRange();
+        scene.cameraChanged();
+        scene.handleAnnotations();
+        scene.relayoutCallback();
 
         return true;
     });

src/plots/gl3d/camera.js

@@ -256,7 +256,7 @@ function createCamera(element, options) {
         if(Math.abs(dx) > Math.abs(dy)) {
             view.rotate(t, 0, 0, -dx * flipX * Math.PI * camera.rotateSpeed / window.innerWidth);
         } else {
-            var kzoom = -camera.zoomSpeed * flipY * dy / window.innerHeight * (t - view.lastT()) / 100.0;
+            var kzoom = -camera.zoomSpeed * flipY * dy / window.innerHeight * (t - view.lastT()) / 10.0;
             view.pan(t, 0, 0, distance * (Math.exp(kzoom) - 1));
         }
     }, true);

src/plots/gl3d/scene.js

@@ -205,6 +205,7 @@ function initializeGLPlot(scene, fullLayout, canvas, gl) {
             center: [cameraData.center.x, cameraData.center.y, cameraData.center.z],
             eye: [cameraData.eye.x, cameraData.eye.y, cameraData.eye.z],
             up: [cameraData.up.x, cameraData.up.y, cameraData.up.z],
+            zoomSpeed: fullLayout.zoomspeed,
             zoomMin: 0.1,
             zoomMax: 100,
             mode: 'orbit'

src/plots/plots.js

@@ -1332,6 +1332,7 @@ plots.purge = function(gd) {
     delete gd._transitionData;
     delete gd._transitioning;
     delete gd._initialAutoSize;
+    delete gd._transitioningWithDuration;
 
     // remove all event listeners
     if(gd.removeAllListeners) gd.removeAllListeners();