fix3801 legend touch-scrolling: natural scrolling with no jumping

plotly · May 21, 2019 · 53fa7f3 · 53fa7f3
1 parent 26ea3bc
commit 53fa7f3
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/components/legend/draw.js b/src/components/legend/draw.js
@@ -277,11 +277,16 @@ module.exports = function draw(gd) {
 
                 var eventY0, eventY1, scrollBoxY0;
 
-                var getScrollBoxDragY = function(scrollBoxY0, eventY0, eventY1) {
+                var getScrollBarDragY = function(scrollBoxY0, eventY0, eventY1) {
                     var y = ((eventY1 - eventY0) / scrollRatio) + scrollBoxY0;
                     return Lib.constrain(y, 0, scrollBoxYMax);
                 };
 
+                var getNaturalDragY = function(scrollBoxY0, eventY0, eventY1) {
+                    var y = ((eventY0 - eventY1) / scrollRatio) + scrollBoxY0;
+                    return Lib.constrain(y, 0, scrollBoxYMax);
+                };
+
                 // scroll legend by dragging scrollBAR
                 var scrollBarDrag = d3.behavior.drag()
                 .on('dragstart', function() {
@@ -301,7 +306,7 @@ module.exports = function draw(gd) {
                     } else {
                         eventY1 = e.clientY;
                     }
-                    scrollBoxY = getScrollBoxDragY(scrollBoxY0, eventY0, eventY1);
+                    scrollBoxY = getScrollBarDragY(scrollBoxY0, eventY0, eventY1);
                     scrollHandler(scrollBoxY, scrollBarHeight, scrollRatio);
                 });
                 scrollBar.call(scrollBarDrag);
@@ -319,9 +324,8 @@ module.exports = function draw(gd) {
                     var e = d3.event.sourceEvent;
                     if(e.type === 'touchmove') {
                         eventY1 = e.changedTouches[0].clientY;
-                        scrollBoxY = getScrollBoxDragY(scrollBoxY0, eventY0, eventY1);
-                        var naturalScrollBoxY = scrollBoxYMax - scrollBoxY; // inverted for natural-scroll
-                        scrollHandler(naturalScrollBoxY, scrollBarHeight, scrollRatio);
+                        scrollBoxY = getNaturalDragY(scrollBoxY0, eventY0, eventY1);
+                        scrollHandler(scrollBoxY, scrollBarHeight, scrollRatio);
                     }
                 });
                 scrollBox.call(scrollBoxTouchDrag);