fix annotation drag on date axes, and test date/log annotations

Author: alexcjohnson

src/components/annotations/draw.js

@@ -579,21 +579,21 @@ function drawOne(gd, index, opt, value) {
                         ann.call(Lib.setTranslate, xcenter, ycenter);
 
                         update[annbase + '.x'] = xa ?
-                            (options.x + dx / xa._m) :
+                            xa.l2r(xa.p2l(xa.l2p(xa.r2l(options.x)) + dx)) :
                             ((arrowX + dx - gs.l) / gs.w);
                         update[annbase + '.y'] = ya ?
-                            (options.y + dy / ya._m) :
+                            ya.l2r(ya.p2l(ya.l2p(ya.r2l(options.y)) + dy)) :
                             (1 - ((arrowY + dy - gs.t) / gs.h));
 
                         if(options.axref === options.xref) {
                             update[annbase + '.ax'] = xa ?
-                              (options.ax + dx / xa._m) :
+                              xa.l2r(xa.p2l(xa.l2p(xa.r2l(options.ax)) + dx)) :
                               ((arrowX + dx - gs.l) / gs.w);
                         }
 
                         if(options.ayref === options.yref) {
                             update[annbase + '.ay'] = ya ?
-                              (options.ay + dy / ya._m) :
+                              ya.l2r(ya.p2l(ya.l2p(ya.r2l(options.ay)) + dy)) :
                               (1 - ((arrowY + dy - gs.t) / gs.h));
                         }
 
@@ -640,13 +640,13 @@ function drawOne(gd, index, opt, value) {
                     var csr = 'pointer';
                     if(options.showarrow) {
                         if(options.axref === options.xref) {
-                            update[annbase + '.ax'] = xa.p2l(xa.l2p(options.ax) + dx);
+                            update[annbase + '.ax'] = xa.l2r(xa.p2l(xa.l2p(xa.r2l(options.ax)) + dx));
                         } else {
                             update[annbase + '.ax'] = options.ax + dx;
                         }
 
                         if(options.ayref === options.yref) {
-                            update[annbase + '.ay'] = ya.p2l(ya.l2p(options.ay) + dy);
+                            update[annbase + '.ay'] = ya.l2r(ya.p2l(ya.l2p(ya.r2l(options.ay)) + dy));
                         } else {
                             update[annbase + '.ay'] = options.ay + dy;
                         }

test/image/baselines/annotations-autorange.png

@@ -20,7 +20,8 @@
             "anchor":"y2",
             "mirror":true,
             "zeroline":false,
-            "showline":true
+            "showline":true,
+            "type": "date"
         },
         "xaxis3":{
             "domain":[0.7,1],
@@ -38,7 +39,8 @@
             "anchor":"x2",
             "mirror":true,
             "zeroline":false,
-            "showline":true
+            "showline":true,
+            "type": "log"
         },
         "yaxis3":{
             "anchor":"x3",
@@ -54,10 +56,10 @@
             {"ay":0,"ax":-50,"x":2,"y":1.5,"text":"Right"},
             {"x":1.5,"y":2,"text":"Top","ay":50,"ax":0},
             {"x":1.5,"y":1,"text":"Bottom","ay":-50,"ax":0},
-            {"xref":"x2","yref":"y2","text":"From left","y":1.5,"ax":-50,"ay":0,"x":1},
-            {"xref":"x2","yref":"y2","text":"From right","y":1.5,"x":2,"ay":0,"ax":50},
-            {"xref":"x2","yref":"y2","text":"From top","y":2,"ax":0,"ay":-50,"x":1.5},
-            {"xref":"x2","yref":"y2","text":"From Bottom","y":1,"ax":0,"ay":50,"x":1.5},
+            {"xref":"x2","yref":"y2","text":"From left","y":2,"ax":-50,"ay":0,"x":"2001-01-01"},
+            {"xref":"x2","yref":"y2","text":"From right","y":2,"x":"2001-03-01","ay":0,"ax":50},
+            {"xref":"x2","yref":"y2","text":"From top","y":3,"ax":0,"ay":-50,"x":"2001-02-01"},
+            {"xref":"x2","yref":"y2","text":"From Bottom","y":1,"ax":0,"ay":50,"x":"2001-02-01"},
             {"xref":"x3","yref":"y3","text":"Left<br>no<br>arrow","y":1.5,"x":1,"showarrow":false},
             {"xref":"x3","yref":"y3","text":"Right<br>no<br>arrow","y":1.5,"x":2,"showarrow":false},
             {"xref":"x3","yref":"y3","text":"Bottom<br>no<br>arrow","y":1,"x":1.5,"showarrow":false},