set selection.index during gl3d trace handlePick

- so that it reflect the user input indices for surface traces
  (not the refined indices)
- use `selection.index` for other gl3d trace type for consistency
  (even though selection.data.index worked fine)
- add hover test for surface traces

Author: etpinard

src/plots/gl3d/scene.js

@@ -68,6 +68,7 @@ function render(scene) {
         var pdata = project(scene.glplot.cameraParams, selection.dataCoordinate);
         trace = lastPicked.data;
         var hoverinfo = trace.hoverinfo;
+        var ptNumber = selection.index;
 
         var xVal = formatter('xaxis', selection.traceCoordinate[0]),
             yVal = formatter('yaxis', selection.traceCoordinate[1]),
@@ -105,7 +106,7 @@ function render(scene) {
                 data: trace._input,
                 fullData: trace,
                 curveNumber: trace.index,
-                pointNumber: selection.data.index
+                pointNumber: ptNumber
             }]
         };
 

src/traces/mesh3d/convert.js

@@ -32,7 +32,7 @@ var proto = Mesh3DTrace.prototype;
 
 proto.handlePick = function(selection) {
     if(selection.object === this.mesh) {
-        var selectIndex = selection.data.index;
+        var selectIndex = selection.index = selection.data.index;
 
         selection.traceCoordinate = [
             this.data.x[selectIndex],

src/traces/scatter3d/convert.js

@@ -67,7 +67,7 @@ proto.handlePick = function(selection) {
         }
         else selection.textLabel = '';
 
-        var selectIndex = selection.data.index;
+        var selectIndex = selection.index = selection.data.index;
         selection.traceCoordinate = [
             this.data.x[selectIndex],
             this.data.y[selectIndex],

src/traces/surface/convert.js

@@ -33,7 +33,7 @@ var proto = SurfaceTrace.prototype;
 
 proto.handlePick = function(selection) {
     if(selection.object === this.surface) {
-        var selectIndex = [
+        var selectIndex = selection.index = [
             Math.min(
                 Math.round(selection.data.index[0] / this.dataScale - 1)|0,
                 this.data.z[0].length - 1

src/traces/surface/index.js

@@ -20,7 +20,7 @@ Surface.plot = require('./convert');
 Surface.moduleType = 'trace';
 Surface.name = 'surface';
 Surface.basePlotModule = require('../../plots/gl3d');
-Surface.categories = ['gl3d', 'noOpacity'];
+Surface.categories = ['gl3d', '2dMap', 'noOpacity'];
 Surface.meta = {
     description: [
         'The data the describes the coordinates of the surface is set in `z`.',

test/jasmine/tests/gl_plot_interact_test.js

@@ -42,9 +42,7 @@ describe('Test gl3d plots', function() {
     mock2.data[0].surfaceaxis = 2;
     mock2.layout.showlegend = true;
 
-    function mouseEventScatter3d(type, opts) {
-        mouseEvent(type, 605, 271, opts);
-    }
+    var mock3 = require('@mocks/gl3d_autocolorscale');
 
     function assertHoverText(xLabel, yLabel, zLabel, textLabel) {
         var node = d3.selectAll('g.hovertext');
@@ -83,11 +81,11 @@ describe('Test gl3d plots', function() {
         destroyGraphDiv();
     });
 
-    it('@noCI should display correct hover labels and emit correct event data', function(done) {
+    it('@noCI should display correct hover labels and emit correct event data (scatter3d case)', function(done) {
         var _mock = Lib.extendDeep({}, mock2);
 
         function _hover() {
-            mouseEventScatter3d('mouseover');
+            mouseEvent('mouseover', 605, 271);
             return delay();
         }
 
@@ -150,16 +148,39 @@ describe('Test gl3d plots', function() {
             assertHoverText('x: 二 6, 2017', 'y: c', 'z: 100k', 'Clementine');
         })
         .then(done);
+    });
+
+    it('@noCI should display correct hover labels and emit correct event data (surface case)', function(done) {
+        var _mock = Lib.extendDeep({}, mock3);
+
+        function _hover() {
+            mouseEvent('mouseover', 605, 271);
+            return delay();
+        }
 
+        Plotly.plot(gd, _mock)
+        .then(delay)
+        .then(function() {
+            gd.on('plotly_hover', function(eventData) {
+                ptData = eventData.points[0];
+            });
+        })
+        .then(_hover)
+        .then(delay)
+        .then(function() {
+            assertHoverText('x: 1', 'y: 2', 'z: 43', 'one two');
+            assertEventData(1, 2, 43, 0, [1, 2]);
+        })
+        .then(done);
     });
 
-    it('@noCI should emit correct event data on click', function(done) {
+    it('@noCI should emit correct event data on click (scatter3d case)', function(done) {
         var _mock = Lib.extendDeep({}, mock2);
 
         // N.B. gl3d click events are 'mouseover' events
         // with button 1 pressed
         function _click() {
-            mouseEventScatter3d('mouseover', {buttons: 1});
+            mouseEvent('mouseover', 605, 271, {buttons: 1});
             return delay();
         }