fix & 🔒 scattergl text visible toggles

Author: etpinard

src/traces/scattergl/index.js

@@ -242,7 +242,7 @@ function sceneUpdate(gd, subplot) {
             if(scene.error2d) scene.error2d.update(opts.concat(opts));
             if(scene.select2d) scene.select2d.update(opts);
             if(scene.glText) {
-                for(i = 0; i < scene.glText.length; i++) {
+                for(i = 0; i < scene.count; i++) {
                     scene.glText[i].update(opts[i]);
                 }
             }
@@ -273,6 +273,9 @@ function sceneUpdate(gd, subplot) {
                     // traces in no-selection mode
                     scene.scatter2d.draw(i);
                 }
+                if(scene.glText[i] && scene.textOptions[i]) {
+                    scene.glText[i].render();
+                }
             }
 
             // draw traces in selection mode
@@ -281,12 +284,6 @@ function sceneUpdate(gd, subplot) {
                 scene.scatter2d.draw(scene.unselectBatch);
             }
 
-            if(scene.glText.length) {
-                scene.glText.forEach(function(text) {
-                    text.render();
-                });
-            }
-
             scene.dirty = false;
         };
 
@@ -333,9 +330,7 @@ function sceneUpdate(gd, subplot) {
             if(scene.line2d) scene.line2d.destroy();
             if(scene.select2d) scene.select2d.destroy();
             if(scene.glText) {
-                scene.glText.forEach(function(text) {
-                    text.destroy();
-                });
+                scene.glText.forEach(function(text) { text.destroy(); });
             }
 
             scene.lineOptions = null;
@@ -409,15 +404,15 @@ function plot(gd, subplot, cdata) {
             scene.fill2d = createLine(regl);
         }
         if(scene.glText === true) {
-            scene.glText = [];
-            for(i = 0; i < scene.textOptions.length; i++) {
+            scene.glText = new Array(scene.count);
+            for(i = 0; i < scene.count; i++) {
                 scene.glText[i] = new Text(regl);
             }
         }
 
         // update main marker options
         if(scene.glText) {
-            for(i = 0; i < scene.textOptions.length; i++) {
+            for(i = 0; i < scene.count; i++) {
                 scene.glText[i].update(scene.textOptions[i]);
             }
         }

test/jasmine/tests/gl2d_plot_interact_test.js

@@ -389,7 +389,9 @@ describe('@gl Test gl2d plots', function() {
         Plotly.newPlot(gd, [{
             // a trace with all regl2d objects
             type: 'scattergl',
+            mode: 'lines+markers+text',
             y: [1, 2, 1],
+            text: ['a', 'b', 'c'],
             error_x: {value: 10},
             error_y: {value: 10},
             fill: 'tozeroy'
@@ -404,6 +406,7 @@ describe('@gl Test gl2d plots', function() {
             spyOn(scene.line2d, 'draw');
             spyOn(scene.error2d, 'draw');
             spyOn(scene.scatter2d, 'draw');
+            spyOn(scene.glText[0], 'render');
 
             return Plotly.restyle(gd, 'visible', 'legendonly', [0]);
         })
@@ -412,6 +415,7 @@ describe('@gl Test gl2d plots', function() {
             expect(scene.fill2d.draw).toHaveBeenCalledTimes(0);
             expect(scene.line2d.draw).toHaveBeenCalledTimes(0);
             expect(scene.error2d.draw).toHaveBeenCalledTimes(0);
+            expect(scene.glText[0].render).toHaveBeenCalledTimes(0);
             expect(scene.scatter2d.draw).toHaveBeenCalledTimes(1);
 
             return Plotly.restyle(gd, 'visible', true, [0]);
@@ -421,6 +425,7 @@ describe('@gl Test gl2d plots', function() {
             expect(scene.fill2d.draw).toHaveBeenCalledTimes(1);
             expect(scene.line2d.draw).toHaveBeenCalledTimes(1);
             expect(scene.error2d.draw).toHaveBeenCalledTimes(2, 'twice for x AND y');
+            expect(scene.glText[0].render).toHaveBeenCalledTimes(1);
             expect(scene.scatter2d.draw).toHaveBeenCalledTimes(3, 'both traces have markers');
         })
         .catch(failTest)