Update shapes_test after adding shift param to getDataToPixel

If the passed shift param is undefined, use shift 0 instead.

Author: my-tien

src/components/shapes/display_labels.js

@@ -93,8 +93,8 @@ module.exports = function drawLabel(gd, index, options, shapeGroup) {
         var ya = Axes.getFromId(gd, options.yref);
         var yRefType = Axes.getRefType(options.yref);
         var yShift = options.y_shift;
-        var x2p = helpers.getDataToPixel(gd, xa, false, xRefType, xShift);
-        var y2p = helpers.getDataToPixel(gd, ya, true, yRefType, yShift);
+        var x2p = helpers.getDataToPixel(gd, xa, xShift, false, xRefType);
+        var y2p = helpers.getDataToPixel(gd, ya, yShift, true, yRefType);
         shapex0 = x2p(options.x0);
         shapex1 = x2p(options.x1);
         shapey0 = y2p(options.y0);

src/components/shapes/draw.js

@@ -225,10 +225,12 @@ function setupDragElement(gd, shapePath, shapeOptions, index, shapeLayer, editHe
     // setup conversion functions
     var xa = Axes.getFromId(gd, shapeOptions.xref);
     var xRefType = Axes.getRefType(shapeOptions.xref);
+    var xShift = shapeOptions.x_shift;
     var ya = Axes.getFromId(gd, shapeOptions.yref);
     var yRefType = Axes.getRefType(shapeOptions.yref);
-    var x2p = helpers.getDataToPixel(gd, xa, false, xRefType);
-    var y2p = helpers.getDataToPixel(gd, ya, true, yRefType);
+    var yShift = shapeOptions.y_shift;
+    var x2p = helpers.getDataToPixel(gd, xa, xShift, false, xRefType);
+    var y2p = helpers.getDataToPixel(gd, ya, yShift, true, yRefType);
     var p2x = helpers.getPixelToData(gd, xa, false, xRefType);
     var p2y = helpers.getPixelToData(gd, ya, true, yRefType);
 

src/components/shapes/helpers.js

@@ -53,7 +53,7 @@ exports.extractPathCoords = function(path, paramsToUse, isRaw) {
     return extractedCoordinates;
 };
 
-exports.getDataToPixel = function(gd, axis, isVertical, refType, shift) {
+exports.getDataToPixel = function(gd, axis, shift, isVertical, refType) {
     var gs = gd._fullLayout._size;
     var dataToPixel;
 
@@ -74,7 +74,7 @@ exports.getDataToPixel = function(gd, axis, isVertical, refType, shift) {
                         shiftPixels = axis.r2p(d2r(0.5, true)) * shift;
                     }
                 }
-                return axis._offset + axis.r2p(d2r(v, true)) + shiftPixels;
+                return axis._offset + axis.r2p(d2r(v, true)) + (shiftPixels || 0);
             };
 
             if(axis.type === 'date') dataToPixel = exports.decodeDate(dataToPixel);

test/jasmine/tests/shapes_test.js

@@ -1487,8 +1487,8 @@ describe('Test shapes', function() {
     function testShapeDrag(dx, dy, layoutShape, node) {
         var xa = Axes.getFromId(gd, layoutShape.xref);
         var ya = Axes.getFromId(gd, layoutShape.yref);
-        var x2p = helpers.getDataToPixel(gd, xa);
-        var y2p = helpers.getDataToPixel(gd, ya, true);
+        var x2p = helpers.getDataToPixel(gd, xa, layoutShape.x_shift);
+        var y2p = helpers.getDataToPixel(gd, ya, layoutShape.y_shift, true);
 
         var initialCoordinates = getShapeCoordinates(layoutShape, x2p, y2p);
 
@@ -1514,8 +1514,8 @@ describe('Test shapes', function() {
     function testPathDrag(dx, dy, layoutShape, node) {
         var xa = Axes.getFromId(gd, layoutShape.xref);
         var ya = Axes.getFromId(gd, layoutShape.yref);
-        var x2p = helpers.getDataToPixel(gd, xa);
-        var y2p = helpers.getDataToPixel(gd, ya, true);
+        var x2p = helpers.getDataToPixel(gd, xa, layoutShape.x_shift);
+        var y2p = helpers.getDataToPixel(gd, ya, layoutShape.y_shift, true);
 
         var initialPath = layoutShape.path;
         var initialCoordinates = getPathCoordinates(initialPath, x2p, y2p);
@@ -1546,8 +1546,8 @@ describe('Test shapes', function() {
     function testShapeResize(direction, dx, dy, layoutShape, node) {
         var xa = Axes.getFromId(gd, layoutShape.xref);
         var ya = Axes.getFromId(gd, layoutShape.yref);
-        var x2p = helpers.getDataToPixel(gd, xa);
-        var y2p = helpers.getDataToPixel(gd, ya, true);
+        var x2p = helpers.getDataToPixel(gd, xa, layoutShape.x_shift);
+        var y2p = helpers.getDataToPixel(gd, ya, layoutShape.y_shift, true);
 
         var initialCoordinates = getShapeCoordinates(layoutShape, x2p, y2p);
 
@@ -1590,9 +1590,8 @@ describe('Test shapes', function() {
 
         var xa = Axes.getFromId(gd, layoutShape.xref);
         var ya = Axes.getFromId(gd, layoutShape.yref);
-        var x2p = helpers.getDataToPixel(gd, xa);
-        var y2p = helpers.getDataToPixel(gd, ya, true);
-
+        var x2p = helpers.getDataToPixel(gd, xa, layoutShape.x_shift);
+        var y2p = helpers.getDataToPixel(gd, ya, layoutShape.y_shift, true);
 
         promise = promise.then(function() {
             var dragHandle = pointToMove === 'start' ?