Original shapes test now passing

nicholas-esterer · nicholas-esterer · commit bf90246f8a13 · 2021-08-09T17:19:25.000-04:00
diff --git a/src/components/shapes/calc_autorange.js b/src/components/shapes/calc_autorange.js
@@ -93,6 +93,7 @@ function shapeBounds(ax, v0, v1, path, paramsToUse) {
     var val;
 
     if(ax.type === 'date') convertVal = helpers.decodeDate(convertVal);
+    if(ax.type === 'category') convertVal = helpers.castNumericStringsToNumbers(convertVal);
 
     for(i = 0; i < segments.length; i++) {
         segment = segments[i];
diff --git a/src/components/shapes/draw.js b/src/components/shapes/draw.js
@@ -383,27 +383,44 @@ function setupDragElement(gd, shapePath, shapeOptions, index, shapeLayer, editHe
         removeVisualCues(shapeLayer);
     }
 
-    function moveShape(dx, dy) {
-        if(shapeOptions.type === 'path') {
-            var noOp = function(coord) { return coord; };
-            var moveX = noOp;
-            var moveY = noOp;
+    // Compute moveX or moveY, ax is xa or ya, p2xy is p2x or p2y, xy2p is x2p
+    // or y2p, dxy is dx or dy
+    function computeMove(ax, p2xy, xy2p, dxy) {
+        var move = function(xy) { return p2xy(xy2p(xy) + dxy); };
+        if(ax && ax.type === 'date') {
+            move = helpers.encodeDate(move);
+        }
+        if(ax && ax.type === 'category') {
+            move = function(xy) {
+                return p2xy(helpers.castNumericStringsToNumbers(xy2p)(xy) + dxy);
+            };
+        }
+        return move;
+    }
 
-            if(xPixelSized) {
-                modifyItem('xanchor', shapeOptions.xanchor = p2x(xAnchor + dx));
-            } else {
-                moveX = function moveX(x) { return p2x(x2p(x) + dx); };
-                if(xa && xa.type === 'date') moveX = helpers.encodeDate(moveX);
-            }
+    function doPathMoveOrResize(dx, dy) {
+        var noOp = function(coord) { return coord; };
+        var moveX = noOp;
+        var moveY = noOp;
 
-            if(yPixelSized) {
-                modifyItem('yanchor', shapeOptions.yanchor = p2y(yAnchor + dy));
-            } else {
-                moveY = function moveY(y) { return p2y(y2p(y) + dy); };
-                if(ya && ya.type === 'date') moveY = helpers.encodeDate(moveY);
-            }
+        if(xPixelSized) {
+            modifyItem('xanchor', shapeOptions.xanchor = p2x(xAnchor + dx));
+        } else {
+            moveX = computeMove(xa, p2x, x2p, dx);
+        }
+
+        if(yPixelSized) {
+            modifyItem('yanchor', shapeOptions.yanchor = p2y(yAnchor + dy));
+        } else {
+            moveY = computeMove(ya, p2y, y2p, dy);
+        }
+
+        modifyItem('path', shapeOptions.path = movePath(pathIn, moveX, moveY));
+    }
 
-            modifyItem('path', shapeOptions.path = movePath(pathIn, moveX, moveY));
+    function moveShape(dx, dy) {
+        if(shapeOptions.type === 'path') {
+            doPathMoveOrResize(dx, dy);
         } else {
             if(xPixelSized) {
                 modifyItem('xanchor', shapeOptions.xanchor = p2x(xAnchor + dx));
@@ -426,26 +443,7 @@ function setupDragElement(gd, shapePath, shapeOptions, index, shapeLayer, editHe
 
     function resizeShape(dx, dy) {
         if(isPath) {
-            // TODO: implement path resize, don't forget to update dragMode code
-            var noOp = function(coord) { return coord; };
-            var moveX = noOp;
-            var moveY = noOp;
-
-            if(xPixelSized) {
-                modifyItem('xanchor', shapeOptions.xanchor = p2x(xAnchor + dx));
-            } else {
-                moveX = function moveX(x) { return p2x(x2p(x) + dx); };
-                if(xa && xa.type === 'date') moveX = helpers.encodeDate(moveX);
-            }
-
-            if(yPixelSized) {
-                modifyItem('yanchor', shapeOptions.yanchor = p2y(yAnchor + dy));
-            } else {
-                moveY = function moveY(y) { return p2y(y2p(y) + dy); };
-                if(ya && ya.type === 'date') moveY = helpers.encodeDate(moveY);
-            }
-
-            modifyItem('path', shapeOptions.path = movePath(pathIn, moveX, moveY));
+            doPathMoveOrResize(dx, dy);
         } else if(isLine) {
             if(dragMode === 'resize-over-start-point') {
                 var newX0 = x0 + dx;
diff --git a/src/components/shapes/helpers.js b/src/components/shapes/helpers.js
@@ -74,6 +74,7 @@ exports.getDataToPixel = function(gd, axis, isVertical, refType) {
             };
 
             if(axis.type === 'date') dataToPixel = exports.decodeDate(dataToPixel);
+            if(axis.type === 'category') dataToPixel = exports.castNumericStringsToNumbers(dataToPixel);
         }
     } else if(isVertical) {
         dataToPixel = function(v) { return gs.t + gs.h * (1 - v); };

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ exports.getDataToPixel = function(gd, axis, isVertical, refType) {`
`74`	`74`	`};`
`75`	`75`
`76`	`76`	`if(axis.type === 'date') dataToPixel = exports.decodeDate(dataToPixel);`
	`77`	`+ if(axis.type === 'category') dataToPixel = exports.castNumericStringsToNumbers(dataToPixel);`
`77`	`78`	`}`
`78`	`79`	`} else if(isVertical) {`
`79`	`80`	`dataToPixel = function(v) { return gs.t + gs.h * (1 - v); };`