heatmap test OK - yaxis questionable

Author: richardnm-2

devtools/test_dashboard/index.html

@@ -150,24 +150,24 @@
       var data = [
         {
           z: [
-            [1, 1, 1, 1, 1, 1, 1],
-            [1, 1, 1, 1, 1, 1, 1],
-            [1, 1, 1, 1, 1, 1, 1],
-            [1, 1, 1, 1, 1, 1, 1],
-            [1, 1, 1, 1, 1, 1, 1],
-            [1, 1, 1, 1, 1, 1, 1],
-            [1, 1, 1, 1, 1, 1, 1],
-            [1, 1, 1, 1, 1, 1, 1],
-            [1, 1, 1, 1, 1, 1, 1],
+            [0.304, 1.465, 2.474, 3.05, 4.38, 5.245, 6.12],
+            [0.3515, 1.326, 2.18, 3.26, 4.41, 5.25, 6.11],
+            [0.3994, 1.167, 2.09, 3.306, 4.305, 5.35, 6.0],
+            [0.297, 1.295, 2.49, 3.428, 4.13, 5.41, 6.38],
+            [0.4602, 1.2256, 2.3356, 3.0667, 4.498, 5.411, 6.29],
+            [0.0197, 1.274, 2.407, 3.22, 4.47, 5.44, 6.28],
+            [0.32, 1.44, 2.303, 3.115, 4.49, 5.25, 6.46],
+            [0.4446, 1.223, 2.367, 3.253, 4.385, 5.08, 6.19],
+            [0.1304, 1.046, 2.45, 3.226, 4.34, 5.4, 6.05],
           ],
           x: [
             ["2017", "2017", "2017", "2017", "2018", "2018", "2018"],
-            ['q1','q2','q3','q4','q1','q2','q3',]
-        ],
+            ["q1", "q2", "q3", "q4", "q1", "q2", "q3"],
+          ],
           y: [
-            ["G1","G1","G1","G2","G2","G2","G3","G3","G3"],
-            ["A","B","C","A","B","C","A","B","C"]
-        ],
+            ["G1", "G1", "G1", "G2", "G2", "G2", "G3", "G3", "G3"],
+            ["A", "B", "C", "A", "B", "C", "A", "B", "C"],
+          ],
           type: "heatmap",
           hoverongaps: false,
         },

src/plots/cartesian/axes.js

@@ -1830,9 +1830,9 @@ function formatMultiCategory(ax, out, hover) {
         cats.forEach(function(text, index) {
             text = String(text);
             if(index < texts.length - 1) {
-                hoverText = hoverText + ' ' + text + ' - ';
+                hoverText = hoverText + text + ' - ';
             } else {
-                hoverText = hoverText + ' ' + text;
+                hoverText = hoverText + text;
             }
         });
 

src/plots/cartesian/set_convert.js

@@ -377,7 +377,7 @@ module.exports = function setConvert(ax, fullLayout) {
                 }
             }
 
-            var xs = [];
+            var axLabels = [];
             var fullObjectList = [];
             var cols = [];
 
@@ -395,8 +395,20 @@ module.exports = function setConvert(ax, fullLayout) {
                         var arrays = arrayIn.map(function(x) {
                             return x;
                         });
-                        arrays.push(trace.y);
 
+                        var valLetter;
+
+                        if(trace.z) {
+                            if(axLetter === 'x') {
+                                arrays.push(sortLib.transpose(trace.z));
+                            } else {
+                                arrays.push(trace.z);
+                            }
+                            valLetter = 'z';
+                        } else {
+                            arrays.push(trace.y);
+                            valLetter = 'y';
+                        }
                         var objList = sortLib.matrixToObjectList(arrays, cols);
 
                         Array.prototype.push.apply(fullObjectList, objList);
@@ -406,19 +418,23 @@ module.exports = function setConvert(ax, fullLayout) {
                         var matrix = sortLib.objectListToList(sortedObjectList);
                         var sortedMatrix = sortLib.sortedMatrix(matrix);
 
-                        xs = sortedMatrix[0].slice();
-                        var y = sortedMatrix[1];
+                        axLabels = sortedMatrix[0].slice();
+                        var axVals = sortedMatrix[1];
 
+                        if(valLetter === 'z' & axLetter === 'x') {
+                            axVals = sortLib.transpose(axVals);
+                        }
                         // Could/should set sorted y axis values for each trace as the sorted values are already available.
                         // Need write access to gd._fullData, bad? Should probably be done right at newPlot, or on setting gd._fullData
-                        var transposedXs = sortLib.transpose(xs);
-                        gd._fullData[i].x = transposedXs;
-                        gd._fullData[i].y = y;
+                        // debugger;
+                        var transposedAxLabels = sortLib.transpose(axLabels);
+                        gd._fullData[i][axLetter] = transposedAxLabels;
+                        gd._fullData[i][valLetter] = axVals;
                     }
                 }
             }
-            ax.levelNr = xs[0].length;
-            ax.levels = xs[0].map(function(_, idx) {return idx;});
+            ax.levelNr = axLabels[0].length;
+            ax.levels = axLabels[0].map(function(_, idx) {return idx;});
 
 
             var fullSortedObjectList = sortLib.sortObjectList(cols, fullObjectList.slice());
@@ -427,6 +443,7 @@ module.exports = function setConvert(ax, fullLayout) {
 
             var fullXs = fullSortedMatrix[0].slice();
 
+            // debugger;
             for(i = 0; i < fullXs.length; i++) {
                 setCategoryIndex(fullXs[i]);
             }