Fix gl2d_click & gl_plot_interact tests

Author: dy

src/lib/str2rgbarray.js

@@ -9,11 +9,11 @@
 
 'use strict';
 
-var rgba = require('color-rgba');
+var rgba = require('color-normalize');
 
 function str2RgbaArray(color) {
-    var colorOut = rgba(color);
-    return colorOut.length ? colorOut : [0, 0, 0, 1];
+    if(!color) return [0, 0, 0, 1];
+    return rgba(color);
 }
 
 module.exports = str2RgbaArray;

src/traces/scattergl/index.js

@@ -1146,7 +1146,9 @@ ScatterGl.selectPoints = function select(searchInfo, polygon) {
         trace = cd[0].trace,
         stash = cd[0].t,
         x = stash.x,
-        y = stash.y;
+        y = stash.y,
+        rawx = stash.rawx,
+        rawy = stash.rawy;
 
     var scene = stash.scene;
 
@@ -1165,8 +1167,8 @@ ScatterGl.selectPoints = function select(searchInfo, polygon) {
                 els.push(i);
                 selection.push({
                     pointNumber: i,
-                    x: x[i],
-                    y: y[i]
+                    x: rawx ? rawx[i] : x[i],
+                    y: rawy ? rawy[i] : y[i]
                 });
             }
             else {

test/jasmine/tests/gl2d_click_test.js

@@ -358,11 +358,11 @@ describe('Test hover and click interactions', function() {
             y: 18,
             curveNumber: 2,
             pointNumber: 0,
-            bgcolor: 'rgb(44, 160, 44)',
-            bordercolor: 'rgb(255, 255, 255)',
+            bgcolor: 'rgb(255, 127, 14)',
+            bordercolor: 'rgb(68, 68, 68)',
             fontSize: 13,
             fontFamily: 'Arial',
-            fontColor: 'rgb(255, 255, 255)'
+            fontColor: 'rgb(68, 68, 68)'
         }, {
             msg: 'scattergl after visibility restyle'
         });
@@ -406,11 +406,11 @@ describe('Test hover and click interactions', function() {
             y: 18,
             curveNumber: 2,
             pointNumber: 0,
-            bgcolor: 'rgb(44, 160, 44)',
-            bordercolor: 'rgb(255, 255, 255)',
+            bgcolor: 'rgb(255, 127, 14)',
+            bordercolor: 'rgb(68, 68, 68)',
             fontSize: 13,
             fontFamily: 'Arial',
-            fontColor: 'rgb(255, 255, 255)'
+            fontColor: 'rgb(68, 68, 68)'
         }, {
             msg: 'scattergl fancy after visibility restyle'
         });
@@ -465,9 +465,10 @@ describe('@noCI Test gl2d lasso/select:', function() {
     });
 
     var gd;
-    var selectPath = [[103, 193], [113, 193]];
+    var selectPath = [[98, 193], [108, 193]];
+    var selectPath2 = [[118, 193], [128, 193]];
     var lassoPath = [[316, 171], [318, 239], [335, 243], [328, 169]];
-    var lassoPath2 = [[93, 193], [143, 193], [143, 500], [93, 500], [93, 193]];
+    var lassoPath2 = [[98, 193], [108, 193], [108, 500], [98, 500], [98, 193]];
 
     afterEach(function() {
         Plotly.purge(gd);
@@ -522,6 +523,7 @@ describe('@noCI Test gl2d lasso/select:', function() {
 
             return select(selectPath);
         })
+        .then(delay(100))
         .then(function(eventData) {
             assertEventData(eventData, {
                 points: [
@@ -546,6 +548,7 @@ describe('@noCI Test gl2d lasso/select:', function() {
         .then(function() {
             return select(lassoPath2);
         })
+        .then(delay(100))
         .then(function(eventData) {
             assertEventData(eventData, {
                 points: [
@@ -567,8 +570,9 @@ describe('@noCI Test gl2d lasso/select:', function() {
         Plotly.plot(gd, _mock)
         .then(delay(100))
         .then(function() {
-            return select(selectPath);
+            return select(selectPath2);
         })
+        .then(delay(100))
         .then(function(eventData) {
             assertEventData(eventData, {
                 points: [{x: 0.004, y: 12.5}]

test/jasmine/tests/gl_plot_interact_test.js

@@ -861,10 +861,10 @@ describe('Test gl2d plots', function() {
         var relayoutCallback = jasmine.createSpy('relayoutCallback');
 
         var originalX = [-0.3037383177570093, 5.303738317757009];
-        var originalY = [-0.5532219548705213, 6.191112269783224];
-        var newX = [-0.5373831775700935, 5.070093457943925];
-        var newY = [-1.7575673521301185, 4.986766872523626];
-        var precision = 5;
+        var originalY = [-0.5, 6.1];
+        var newX = [-0.5, 5];
+        var newY = [-1.7, 4.95];
+        var precision = 1;
 
         Plotly.plot(gd, _mock)
         .then(delay(20))
@@ -952,7 +952,7 @@ describe('Test gl2d plots', function() {
             return Plotly.restyle(gd, 'visible', 'legendonly');
         })
         .then(function() {
-            expect(readPixel(gd.querySelector('.gl-canvas-context'), 108, 100)[0]).toBe(0);
+            expect(gd.querySelector('.gl-canvas-context')).toBe(null);
 
             return Plotly.restyle(gd, 'visible', true);
         })
@@ -962,7 +962,7 @@ describe('Test gl2d plots', function() {
             return Plotly.restyle(gd, 'visible', false);
         })
         .then(function() {
-            expect(gd.querySelector('.gl-canvas-context')).not.toBe(null);
+            expect(gd.querySelector('.gl-canvas-context')).toBe(null);
 
             return Plotly.restyle(gd, 'visible', true);
         })
@@ -1087,8 +1087,8 @@ describe('Test gl2d plots', function() {
             });
         })
         .then(function() {
-            expect(gd.layout.xaxis.range).toBeCloseToArray([-8.091954022988505, 24.091954022988503], 3);
-            expect(gd.layout.yaxis.range).toBeCloseToArray([-0.04597701149425282, 16.04597701149425], 3);
+            expect(gd.layout.xaxis.range).toBeCloseToArray([-7.6, 23.6], 1);
+            expect(gd.layout.yaxis.range).toBeCloseToArray([0.2, 15.8], 1);
         })
         .catch(fail)
         .then(done);
@@ -1360,8 +1360,8 @@ describe('Test gl2d interactions', function() {
             var ann = d3.select('g.annotation-text-g').select('g');
             var translate = Drawing.getTranslate(ann);
 
-            expect(translate.x).toBeWithin(xy[0], 3.5);
-            expect(translate.y).toBeWithin(xy[1], 3.5);
+            expect(translate.x).toBeWithin(xy[0], 4.5);
+            expect(translate.y).toBeWithin(xy[1], 4.5);
         }
 
         Plotly.plot(gd, [{