pass calc'ed text to heatmap calcdata item

etpinard · etpinard · commit ec277a34d518 · 2017-02-24T14:34:10.000-05:00
- and use that to determine the text label on hover
- in the case of XYZ column traces calc'3d has a
  different structure then fullData text, so it becomes
  important to use calc'ed text to hover text to work after
  non-do-calc interaction (e.g. zoom).
diff --git a/src/traces/heatmap/calc.js b/src/traces/heatmap/calc.js
@@ -121,7 +121,7 @@ module.exports = function calc(gd, trace) {
         Axes.expand(ya, yArray);
     }
 
-    var cd0 = {x: xArray, y: yArray, z: z};
+    var cd0 = {x: xArray, y: yArray, z: z, text: trace.text};
 
     // auto-z and autocolorscale if applicable
     colorscaleCalc(trace, z, '', 'z');
diff --git a/src/traces/heatmap/hover.js b/src/traces/heatmap/hover.js
@@ -96,8 +96,8 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
     if(zmask && !zmask[ny][nx]) zVal = undefined;
 
     var text;
-    if(Array.isArray(trace.text) && Array.isArray(trace.text[ny])) {
-        text = trace.text[ny][nx];
+    if(Array.isArray(cd0.text) && Array.isArray(cd0.text[ny])) {
+        text = cd0.text[ny][nx];
     }
 
     return [Lib.extendFlat(pointData, {

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ module.exports = function calc(gd, trace) {`
`121`	`121`	`Axes.expand(ya, yArray);`
`122`	`122`	`}`
`123`	`123`
`124`		`- var cd0 = {x: xArray, y: yArray, z: z};`
	`124`	`+ var cd0 = {x: xArray, y: yArray, z: z, text: trace.text};`
`125`	`125`
`126`	`126`	`// auto-z and autocolorscale if applicable`
`127`	`127`	`colorscaleCalc(trace, z, '', 'z');`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)`
`96`	`96`	`if(zmask && !zmask[ny][nx]) zVal = undefined;`
`97`	`97`
`98`	`98`	`var text;`
`99`		`- if(Array.isArray(trace.text) && Array.isArray(trace.text[ny])) {`
`100`		`- text = trace.text[ny][nx];`
	`99`	`+ if(Array.isArray(cd0.text) && Array.isArray(cd0.text[ny])) {`
	`100`	`+ text = cd0.text[ny][nx];`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`return [Lib.extendFlat(pointData, {`