centralize & reuse hide logic in bars & funnelarea

draftlogs/6335_fix.md

@@ -1 +1 @@
- - Hide pie text on empty slices to avoid PDF exports in MS Word from SVG imports [[#6335](https://github.com/plotly/plotly.js/pull/6335)]
+ - Hide text on empty slices to avoid PDF exports in MS Word from SVG imports [[#6335](https://github.com/plotly/plotly.js/pull/6335)]

src/lib/index.js

@@ -1331,6 +1331,11 @@ lib.getTextTransform = function(transform) {
     );
 };
 
+lib.setTransormAndDisplay = function(s, transform) {
+    s.attr('transform', lib.getTextTransform(transform));
+    s.style('display', transform.scale ? null : 'none');
+};
+
 lib.ensureUniformFontSize = function(gd, baseFont) {
     var out = lib.extendFlat({}, baseFont);
     out.size = Math.max(

src/traces/bar/plot.js

@@ -431,8 +431,8 @@ function appendBarText(gd, plotinfo, bar, cd, i, x0, x1, y0, y1, opts, makeOnCom
     recordMinTextSize(trace.type === 'histogram' ? 'bar' : trace.type, transform, fullLayout);
     calcBar.transform = transform;
 
-    transition(textSelection, fullLayout, opts, makeOnCompleteCallback)
-        .attr('transform', Lib.getTextTransform(transform));
+    var s = transition(textSelection, fullLayout, opts, makeOnCompleteCallback);
+    Lib.setTransormAndDisplay(s, transform);
 }
 
 function getRotateFromAngle(angle) {

src/traces/bar/uniform_text.js

@@ -30,7 +30,7 @@ function resizeText(gd, gTrace, traceType) {
                 transform.scale = (shouldHide && transform.hide) ? 0 : minSize / transform.fontSize;
 
                 var el = d3.select(this).select('text');
-                el.attr('transform', Lib.getTextTransform(transform));
+                Lib.setTransormAndDisplay(el, transform);
             }
         });
     }

src/traces/funnelarea/plot.js

@@ -128,7 +128,7 @@ module.exports = function plot(gd, cdModule) {
                     recordMinTextSize(trace.type, transform, fullLayout);
                     cd[i].transform = transform;
 
-                    sliceText.attr('transform', Lib.getTextTransform(transform));
+                    Lib.setTransormAndDisplay(sliceText, transform);
                 });
             });
 

src/traces/pie/plot.js

@@ -199,10 +199,7 @@ function plot(gd, cdModule) {
                     recordMinTextSize(trace.type, transform, fullLayout);
                     cd[i].transform = transform;
 
-                    sliceText.attr('transform', Lib.getTextTransform(transform));
-
-                    // hide text for empty slices
-                    sliceText.style('display', transform.scale ? null : 'none');
+                    Lib.setTransormAndDisplay(sliceText, transform);
                 });
             });
 
@@ -310,7 +307,7 @@ function plotTextLines(slices, trace) {
         pt.transform.targetX += pt.labelExtraX;
         pt.transform.targetY += pt.labelExtraY;
 
-        sliceText.attr('transform', Lib.getTextTransform(pt.transform));
+        Lib.setTransormAndDisplay(sliceText, pt.transform);
 
         // then add a line to the new location
         var lineStartX = pt.cxFinal + pt.pxmid[0];