plotly · archmoj · May 27, 2021 · May 25, 2021 · May 25, 2021 · May 25, 2021
diff --git a/src/components/legend/style.js b/src/components/legend/style.js
@@ -145,7 +145,7 @@ module.exports = function style(s, gd, legend) {
 
         // with fill and no markers or text, move the line and fill up a bit
         // so it's more centered
-        var markersOrText = subTypes.hasMarkers(trace) || subTypes.hasText(trace);
+        var markersOrText = subTypes.hasMarkers(trace) || subTypes.isText(trace);
         var anyFill = showFill || showGradientFill;
         var anyLine = showLine || showGradientLine;
         var pathStart = (markersOrText || !anyFill) ? 'M5,0' :
@@ -187,7 +187,7 @@ module.exports = function style(s, gd, legend) {
         var d0 = d[0];
         var trace = d0.trace;
         var showMarkers = subTypes.hasMarkers(trace);
-        var showText = subTypes.hasText(trace);
+        var showText = subTypes.isText(trace);
         var showLines = subTypes.hasLines(trace);
         var dMod, tMod;
 

diff --git a/src/traces/scatter/subtypes.js b/src/traces/scatter/subtypes.js
@@ -21,6 +21,10 @@ module.exports = {
             trace.mode.indexOf('text') !== -1;
     },
 
+    isText: function(trace) {
+        return trace.visible && trace.mode === 'text';
+    },
+
     isBubble: function(trace) {
         return Lib.isPlainObject(trace.marker) &&
             Lib.isArrayOrTypedArray(trace.marker.size);

diff --git a/test/image/baselines/cliponaxis_false-dates-log.png b/test/image/baselines/cliponaxis_false-dates-log.png
diff --git a/test/image/baselines/geo_africa-insets.png b/test/image/baselines/geo_africa-insets.png
diff --git a/test/image/baselines/geo_legendonly.png b/test/image/baselines/geo_legendonly.png
diff --git a/test/image/baselines/gl2d_point-selection.png b/test/image/baselines/gl2d_point-selection.png
diff --git a/test/image/baselines/gl2d_text_chart_arrays.png b/test/image/baselines/gl2d_text_chart_arrays.png
diff --git a/test/image/baselines/gl2d_text_chart_invalid-arrays.png b/test/image/baselines/gl2d_text_chart_invalid-arrays.png
diff --git a/test/image/baselines/gl3d_scatter3d-align-texts.png b/test/image/baselines/gl3d_scatter3d-align-texts.png
diff --git a/test/image/baselines/gl3d_scatter3d-blank-text.png b/test/image/baselines/gl3d_scatter3d-blank-text.png
diff --git a/test/image/baselines/gl3d_scatter3d-texttemplate.png b/test/image/baselines/gl3d_scatter3d-texttemplate.png
diff --git a/test/image/baselines/legend-constant-itemsizing.png b/test/image/baselines/legend-constant-itemsizing.png
diff --git a/test/image/baselines/mathjax.png b/test/image/baselines/mathjax.png
diff --git a/test/image/baselines/point-selection.png b/test/image/baselines/point-selection.png
diff --git a/test/image/baselines/scattercarpet-text.png b/test/image/baselines/scattercarpet-text.png
diff --git a/test/image/baselines/text_chart_arrays.png b/test/image/baselines/text_chart_arrays.png
diff --git a/test/image/baselines/text_chart_invalid-arrays.png b/test/image/baselines/text_chart_invalid-arrays.png
diff --git a/test/image/baselines/texttemplate.png b/test/image/baselines/texttemplate.png
diff --git a/test/jasmine/tests/scatter_test.js b/test/jasmine/tests/scatter_test.js
@@ -796,7 +796,6 @@ describe('end-to-end scatter tests', function() {
                 var hasFills = name.indexOf('fill') !== -1;
                 var hasLines = name.indexOf('lines') !== -1;
                 var hasMarkers = name.indexOf('markers') !== -1;
-                var hasText = name.indexOf('text') !== -1;
                 var tracei, prefix;
 
             // construct the expected ordering based on case name
@@ -814,7 +813,6 @@ describe('end-to-end scatter tests', function() {
                     }
                     if(hasLines) selectorArray.push(prefix + '.js-line');
                     if(hasMarkers) selectorArray.push(prefix + '.point');
-                    if(hasText) selectorArray.push(prefix + '.textpoint');
                 }
 
             // ordering in the legend
@@ -823,7 +821,6 @@ describe('end-to-end scatter tests', function() {
                     if(hasFills) selectorArray.push(prefix + '.js-fill');
                     if(hasLines) selectorArray.push(prefix + '.js-line');
                     if(hasMarkers) selectorArray.push(prefix + '.scatterpts');
-                    if(hasText) selectorArray.push(prefix + '.pointtext');
                 }
 
                 var msg = i ? ('from ' + cases[indices[i - 1]].name + ' to ') : 'from default to ';