move align period step to traces so that we could record original positions for hover

Author: archmoj

src/plots/cartesian/align_period.js

@@ -18,6 +18,8 @@ var ONEAVGMONTH = constants.ONEAVGMONTH;
 var ONEAVGYEAR = constants.ONEAVGYEAR;
 
 module.exports = function alignPeriod(trace, ax, axLetter, vals) {
+    if(ax.type !== 'date') return vals;
+
     var alignment = trace[axLetter + 'periodalignment'];
     if(!alignment) return vals;
 

src/plots/cartesian/axes.js

@@ -1334,10 +1334,6 @@ function formatDate(ax, out, hover, extraPrecision) {
     var tr = ax._tickround;
     var fmt = (hover && ax.hoverformat) || axes.getTickFormat(ax);
 
-    if(ax.ticklabelmode === 'period') {
-        extraPrecision = false;
-    }
-
     if(extraPrecision) {
         // second or sub-second precision: extra always shows max digits.
         // for other fields, extra precision just adds one field.

src/plots/cartesian/set_convert.js

@@ -30,8 +30,6 @@ var ONEMIN = numConstants.ONEMIN;
 var ONESEC = numConstants.ONESEC;
 
 var axisIds = require('./axis_ids');
-var alignPeriod = require('./align_period');
-
 var constants = require('./constants');
 var HOUR_PATTERN = constants.HOUR_PATTERN;
 var WEEKDAY_PATTERN = constants.WEEKDAY_PATTERN;
@@ -848,10 +846,6 @@ module.exports = function setConvert(ax, fullLayout) {
             }
         }
 
-        if(axType === 'date') {
-            arrayOut = alignPeriod(trace, ax, axLetter, arrayOut);
-        }
-
         return arrayOut;
     };
 

src/traces/bar/calc.js

@@ -9,6 +9,7 @@
 'use strict';
 
 var Axes = require('../../plots/cartesian/axes');
+var alignPeriod = require('../../plots/cartesian/align_period');
 var hasColorscale = require('../../components/colorscale/helpers').hasColorscale;
 var colorscaleCalc = require('../../components/colorscale/calc');
 var arraysToCalcdata = require('./arrays_to_calcdata');
@@ -26,9 +27,11 @@ module.exports = function calc(gd, trace) {
     if(trace.orientation === 'h') {
         size = xa.makeCalcdata(trace, 'x', sizeOpts);
         pos = ya.makeCalcdata(trace, 'y');
+        pos = alignPeriod(trace, ya, 'y', pos);
     } else {
         size = ya.makeCalcdata(trace, 'y', sizeOpts);
         pos = xa.makeCalcdata(trace, 'x');
+        pos = alignPeriod(trace, xa, 'x', pos);
     }
 
     // create the "calculated data" to plot

src/traces/box/calc.js

@@ -11,6 +11,7 @@
 var isNumeric = require('fast-isnumeric');
 
 var Axes = require('../../plots/cartesian/axes');
+var alignPeriod = require('../../plots/cartesian/align_period');
 var Lib = require('../../lib');
 
 var BADNUM = require('../../constants/numerical').BADNUM;
@@ -309,7 +310,9 @@ function getPos(trace, posLetter, posAxis, num) {
     var hasPosStep = 'd' + posLetter in trace;
 
     if(hasPosArray || (hasPos0 && hasPosStep)) {
-        return posAxis.makeCalcdata(trace, posLetter);
+        var pos = posAxis.makeCalcdata(trace, posLetter);
+        pos = alignPeriod(trace, posAxis, posLetter, pos);
+        return pos;
     }
 
     var pos0;

src/traces/candlestick/calc.js

@@ -10,6 +10,7 @@
 
 var Lib = require('../../lib');
 var Axes = require('../../plots/cartesian/axes');
+var alignPeriod = require('../../plots/cartesian/align_period');
 
 var calcCommon = require('../ohlc/calc').calcCommon;
 
@@ -19,6 +20,7 @@ module.exports = function(gd, trace) {
     var ya = Axes.getFromId(gd, trace.yaxis);
 
     var x = xa.makeCalcdata(trace, 'x');
+    x = alignPeriod(trace, xa, 'x', x);
 
     var cd = calcCommon(gd, trace, x, ya, ptFunc);
 

src/traces/funnel/calc.js

@@ -9,6 +9,7 @@
 'use strict';
 
 var Axes = require('../../plots/cartesian/axes');
+var alignPeriod = require('../../plots/cartesian/align_period');
 var arraysToCalcdata = require('./arrays_to_calcdata');
 var calcSelection = require('../scatter/calc_selection');
 var BADNUM = require('../../constants/numerical').BADNUM;
@@ -21,9 +22,11 @@ module.exports = function calc(gd, trace) {
     if(trace.orientation === 'h') {
         size = xa.makeCalcdata(trace, 'x');
         pos = ya.makeCalcdata(trace, 'y');
+        pos = alignPeriod(trace, ya, 'y', pos);
     } else {
         size = ya.makeCalcdata(trace, 'y');
         pos = xa.makeCalcdata(trace, 'x');
+        pos = alignPeriod(trace, xa, 'x', pos);
     }
 
     // create the "calculated data" to plot

src/traces/heatmap/calc.js

@@ -11,6 +11,7 @@
 var Registry = require('../../registry');
 var Lib = require('../../lib');
 var Axes = require('../../plots/cartesian/axes');
+var alignPeriod = require('../../plots/cartesian/align_period');
 
 var histogram2dCalc = require('../histogram2d/calc');
 var colorscaleCalc = require('../../components/colorscale/calc');
@@ -62,7 +63,11 @@ module.exports = function calc(gd, trace) {
             zIn = trace._z;
         } else {
             x = trace._x = trace.x ? xa.makeCalcdata(trace, 'x') : [];
-            y = trace._y = trace.y ? ya.makeCalcdata(trace, 'y') : [];
+            y = trace.y ? ya.makeCalcdata(trace, 'y') : [];
+            x = alignPeriod(trace, xa, 'x', x);
+            y = alignPeriod(trace, ya, 'y', y);
+            trace._x = x;
+            trace._y = y;
         }
 
         x0 = trace.x0;

src/traces/heatmap/convert_column_xyz.js

@@ -11,11 +11,15 @@
 
 var Lib = require('../../lib');
 var BADNUM = require('../../constants/numerical').BADNUM;
+var alignPeriod = require('../../plots/cartesian/align_period');
 
 module.exports = function convertColumnData(trace, ax1, ax2, var1Name, var2Name, arrayVarNames) {
     var colLen = trace._length;
     var col1 = ax1.makeCalcdata(trace, var1Name);
     var col2 = ax2.makeCalcdata(trace, var2Name);
+    col1 = alignPeriod(trace, ax1, var1Name, col1);
+    col2 = alignPeriod(trace, ax2, var2Name, col2);
+
     var textCol = trace.text;
     var hasColumnText = (textCol !== undefined && Lib.isArray1D(textCol));
     var hoverTextCol = trace.hovertext;

src/traces/histogram/calc.js

@@ -13,6 +13,7 @@ var isNumeric = require('fast-isnumeric');
 var Lib = require('../../lib');
 var Registry = require('../../registry');
 var Axes = require('../../plots/cartesian/axes');
+var alignPeriod = require('../../plots/cartesian/align_period');
 
 var arraysToCalcdata = require('../bar/arrays_to_calcdata');
 var binFunctions = require('./bin_functions');
@@ -272,7 +273,9 @@ function calcAllAutoBins(gd, trace, pa, mainData, _overlayEdgeCase) {
 
             if(tracei.visible) {
                 var mainDatai = binOpts.dirs[i];
-                pos0 = tracei['_' + mainDatai + 'pos0'] = pa.makeCalcdata(tracei, mainDatai);
+                pos0 = pa.makeCalcdata(tracei, mainDatai);
+                pos0 = alignPeriod(trace, pa, mainData, pos0);
+                tracei['_' + mainDatai + 'pos0'] = pos0;
 
                 allPos = Lib.concat(allPos, pos0);
                 delete tracei['_' + mainData + 'autoBinFinished'];