bring parts of the previous logic - use (x|y)End instead of pEnd etc.

Author: archmoj

src/components/fx/hover.js

@@ -1993,14 +1993,13 @@ function getCoord(axLetter, winningPoint, fullLayout) {
     var ax = winningPoint[axLetter + 'a'];
     var val = winningPoint[axLetter + 'Val'];
 
-    var trace = winningPoint.trace;
-    var cd = winningPoint.cd;
-    var d = cd[winningPoint.index];
+    var cd0 = winningPoint.cd[0];
 
     if(ax.type === 'category') val = ax._categoriesMap[val];
     else if(ax.type === 'date') {
-        var periodalignment = trace[axLetter + 'periodalignment'];
+        var periodalignment = winningPoint.trace[axLetter + 'periodalignment'];
         if(periodalignment) {
+            var d = winningPoint.cd[winningPoint.index];
             var start = d[axLetter + 'Start'];
             var end = d[axLetter + 'End'];
             var diff = end - start;
@@ -2014,7 +2013,6 @@ function getCoord(axLetter, winningPoint, fullLayout) {
         val = ax.d2c(val);
     }
 
-    var cd0 = cd[0];
     if(cd0 && cd0.t && cd0.t.posLetter === ax._id) {
         if(
             fullLayout.boxmode === 'group' ||

src/traces/bar/calc.js

@@ -10,7 +10,7 @@ var calcSelection = require('../scatter/calc_selection');
 module.exports = function calc(gd, trace) {
     var xa = Axes.getFromId(gd, trace.xaxis || 'x');
     var ya = Axes.getFromId(gd, trace.yaxis || 'y');
-    var size, pos, origPos, pObj, hasPeriod;
+    var size, pos, origPos, pObj, hasPeriod, pLetter;
 
     var sizeOpts = {
         msUTC: !!(trace.base || trace.base === 0)
@@ -21,11 +21,13 @@ module.exports = function calc(gd, trace) {
         origPos = ya.makeCalcdata(trace, 'y');
         pObj = alignPeriod(trace, ya, 'y', origPos);
         hasPeriod = !!trace.yperiodalignment;
+        pLetter = 'y';
     } else {
         size = ya.makeCalcdata(trace, 'y', sizeOpts);
         origPos = xa.makeCalcdata(trace, 'x');
         pObj = alignPeriod(trace, xa, 'x', origPos);
         hasPeriod = !!trace.xperiodalignment;
+        pLetter = 'x';
     }
     pos = pObj.vals;
 
@@ -39,8 +41,8 @@ module.exports = function calc(gd, trace) {
 
         if(hasPeriod) {
             cd[i].orig_p = origPos[i]; // used by hover
-            cd[i].pEnd = pObj.ends[i];
-            cd[i].pStart = pObj.starts[i];
+            cd[i][pLetter + 'End'] = pObj.ends[i];
+            cd[i][pLetter + 'Start'] = pObj.starts[i];
         }
 
         if(trace.ids) {

src/traces/bar/cross_trace_calc.js

@@ -448,7 +448,7 @@ function setBarCenterAndWidth(pa, sieve) {
 
             if(isPeriod) {
                 calcBar.wPeriod =
-                    calcBar.pEnd - calcBar.pStart;
+                    calcBar[pLetter + 'End'] - calcBar[pLetter + 'Start'];
             }
         }
     }

src/traces/bar/hover.js

@@ -63,11 +63,14 @@ function hoverOnBars(pointData, xval, yval, hovermode, opts) {
         return di[posLetter] + sgn * w / 2;
     }
 
+    function periodLength(di) {
+        return di[posLetter + 'End'] - di[posLetter + 'Start'];
+    }
+
     var minPos = isClosest ?
         thisBarMinPos : period ?
         function(di) {
-            var diff = di.pEnd - di.pStart;
-            return di.p + diff / 2 - di.wPeriod;
+            return di.p + periodLength(di) / 2 - di.wPeriod;
         } :
         function(di) {
             /*
@@ -88,8 +91,7 @@ function hoverOnBars(pointData, xval, yval, hovermode, opts) {
     var maxPos = isClosest ?
         thisBarMaxPos : period ?
         function(di) {
-            var diff = di.pEnd - di.pStart;
-            return di.p + diff / 2;
+            return di.p + periodLength(di) / 2;
         } :
         function(di) {
             return Math.max(thisBarMaxPos(di), di.p + t.bardelta / 2);

src/traces/funnel/calc.js

@@ -9,18 +9,20 @@ var BADNUM = require('../../constants/numerical').BADNUM;
 module.exports = function calc(gd, trace) {
     var xa = Axes.getFromId(gd, trace.xaxis || 'x');
     var ya = Axes.getFromId(gd, trace.yaxis || 'y');
-    var size, pos, origPos, pObj, hasPeriod, i, cdi;
+    var size, pos, origPos, pObj, hasPeriod, pLetter, i, cdi;
 
     if(trace.orientation === 'h') {
         size = xa.makeCalcdata(trace, 'x');
         origPos = ya.makeCalcdata(trace, 'y');
         pObj = alignPeriod(trace, ya, 'y', origPos);
         hasPeriod = !!trace.yperiodalignment;
+        pLetter = 'y';
     } else {
         size = ya.makeCalcdata(trace, 'y');
         origPos = xa.makeCalcdata(trace, 'x');
         pObj = alignPeriod(trace, xa, 'x', origPos);
         hasPeriod = !!trace.xperiodalignment;
+        pLetter = 'x';
     }
     pos = pObj.vals;
 
@@ -55,8 +57,8 @@ module.exports = function calc(gd, trace) {
 
         if(hasPeriod) {
             cd[i].orig_p = origPos[i]; // used by hover
-            cd[i].pEnd = pObj.ends[i];
-            cd[i].pStart = pObj.starts[i];
+            cd[i][pLetter + 'End'] = pObj.ends[i];
+            cd[i][pLetter + 'Start'] = pObj.starts[i];
         }
 
         if(trace.ids) {

src/traces/waterfall/calc.js

@@ -17,18 +17,20 @@ function isTotal(a) {
 module.exports = function calc(gd, trace) {
     var xa = Axes.getFromId(gd, trace.xaxis || 'x');
     var ya = Axes.getFromId(gd, trace.yaxis || 'y');
-    var size, pos, origPos, pObj, hasPeriod;
+    var size, pos, origPos, pObj, hasPeriod, pLetter;
 
     if(trace.orientation === 'h') {
         size = xa.makeCalcdata(trace, 'x');
         origPos = ya.makeCalcdata(trace, 'y');
         pObj = alignPeriod(trace, ya, 'y', origPos);
         hasPeriod = !!trace.yperiodalignment;
+        pLetter = 'y';
     } else {
         size = ya.makeCalcdata(trace, 'y');
         origPos = xa.makeCalcdata(trace, 'x');
         pObj = alignPeriod(trace, xa, 'x', origPos);
         hasPeriod = !!trace.xperiodalignment;
+        pLetter = 'x';
     }
     pos = pObj.vals;
 
@@ -85,8 +87,8 @@ module.exports = function calc(gd, trace) {
 
         if(hasPeriod) {
             cd[i].orig_p = origPos[i]; // used by hover
-            cd[i].pEnd = pObj.ends[i];
-            cd[i].pStart = pObj.starts[i];
+            cd[i][pLetter + 'End'] = pObj.ends[i];
+            cd[i][pLetter + 'Start'] = pObj.starts[i];
         }
 
         if(trace.ids) {