move all uniformtext functions to bar/uniform_text.js

plotly · archmoj · Jan 6, 2020 · Dec 25, 2019 · Dec 26, 2019 · Dec 26, 2019
commit ba1ae6f5439f0f206d338b0afc078b5f1ca34c37
diff --git a/src/traces/bar/plot.js b/src/traces/bar/plot.js
@@ -19,6 +19,7 @@ var Drawing = require('../../components/drawing');
 var Registry = require('../../registry');
 var tickText = require('../../plots/cartesian/axes').tickText;
 
+var uniformText = require('./uniform_text');
 var style = require('./style');
 var helpers = require('./helpers');
 var constants = require('./constants');
@@ -93,7 +94,7 @@ function plot(gd, plotinfo, cdModule, traceLayer, opts, makeOnCompleteCallback)
         };
 
         // don't clear bar when this is called from waterfall or funnel
-        clearMinTextSize('bar', fullLayout);
+        uniformText.clearMinTextSize('bar', fullLayout);
     }
 
     var bartraces = Lib.makeTraceGroups(traceLayer, cdModule, 'trace bars').each(function(cd) {
@@ -409,47 +410,13 @@ function appendBarText(gd, plotinfo, bar, cd, i, x0, x1, y0, y1, opts, makeOnCom
     }
 
     transform.fontSize = font.size;
-    recordMinTextSize(trace.type, transform, fullLayout);
+    uniformText.recordMinTextSize(trace.type, transform, fullLayout);
     calcBar.transform = transform;
 
     transition(textSelection, fullLayout, opts, makeOnCompleteCallback)
         .attr('transform', Lib.getTextTransform(transform));
 }
 
-function recordMinTextSize(
-    traceType, // in
-    transform, // inout
-    fullLayout // inout
-) {
-    if(fullLayout.uniformtext.mode) {
-        var minKey = getMinKey(traceType);
-        var minSize = fullLayout.uniformtext.minsize;
-        var size = transform.scale * transform.fontSize;
-
-        transform.hide = size < minSize;
-
-        fullLayout[minKey] = fullLayout[minKey] || Infinity;
-        if(!transform.hide) {
-            fullLayout[minKey] = Math.min(
-                fullLayout[minKey],
-                Math.max(size, minSize)
-            );
-        }
-    }
-}
-
-function clearMinTextSize(
-    traceType, // in
-    fullLayout // inout
-) {
-    var minKey = getMinKey(traceType);
-    fullLayout[minKey] = undefined;
-}
-
-function getMinKey(traceType) {
-    return '_' + traceType + 'Text_minsize';
-}
-
 function getRotateFromAngle(angle) {
     return (angle === 'auto') ? 0 : angle;
 }
@@ -769,7 +736,5 @@ function calcTextinfo(cd, index, xa, ya) {
 
 module.exports = {
     plot: plot,
-    toMoveInsideBar: toMoveInsideBar,
-    recordMinTextSize: recordMinTextSize,
-    clearMinTextSize: clearMinTextSize
+    toMoveInsideBar: toMoveInsideBar
 };
diff --git a/src/traces/bar/style.js b/src/traces/bar/style.js
@@ -14,44 +14,13 @@ var Drawing = require('../../components/drawing');
 var Lib = require('../../lib');
 var Registry = require('../../registry');
 
+var resizeText = require('./uniform_text').resizeText;
 var attributes = require('./attributes');
 var attributeTextFont = attributes.textfont;
 var attributeInsideTextFont = attributes.insidetextfont;
 var attributeOutsideTextFont = attributes.outsidetextfont;
 var helpers = require('./helpers');
 
-function resizeText(gd, gTrace, traceType) {
-    var fullLayout = gd._fullLayout;
-    var minSize = fullLayout['_' + traceType + 'Text_minsize'];
-    if(minSize) {
-        var shouldHide = fullLayout.uniformtext.mode === 'hide';
-
-        var selector;
-        switch(traceType) {
-            case 'funnelarea' :
-            case 'pie' :
-            case 'sunburst' :
-                selector = 'g.slice';
-                break;
-            case 'treemap' :
-                selector = 'g.slice, g.pathbar';
-                break;
-            default :
-                selector = 'g.points > g.point';
-        }
-
-        gTrace.selectAll(selector).each(function(d) {
-            var transform = d.transform;
-            if(transform) {
-                transform.scale = (shouldHide && transform.hide) ? 0 : minSize / transform.fontSize;
-
-                var el = d3.select(this).select('text');
-                el.attr('transform', Lib.getTextTransform(transform));
-            }
-        });
-    }
-}
-
 function style(gd) {
     var s = d3.select(gd).selectAll('g.barlayer').selectAll('g.trace');
     resizeText(gd, s, 'bar');

diff --git a/src/traces/bar/uniform_text.js b/src/traces/bar/uniform_text.js
@@ -0,0 +1,84 @@
+/**
+* Copyright 2012-2020, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+var d3 = require('d3');
+var Lib = require('../../lib');
+
+function resizeText(gd, gTrace, traceType) {
+    var fullLayout = gd._fullLayout;
+    var minSize = fullLayout['_' + traceType + 'Text_minsize'];
+    if(minSize) {
+        var shouldHide = fullLayout.uniformtext.mode === 'hide';
+
+        var selector;
+        switch(traceType) {
+            case 'funnelarea' :
+            case 'pie' :
+            case 'sunburst' :
+                selector = 'g.slice';
+                break;
+            case 'treemap' :
+                selector = 'g.slice, g.pathbar';
+                break;
+            default :
+                selector = 'g.points > g.point';
+        }
+
+        gTrace.selectAll(selector).each(function(d) {
+            var transform = d.transform;
+            if(transform) {
+                transform.scale = (shouldHide && transform.hide) ? 0 : minSize / transform.fontSize;
+
+                var el = d3.select(this).select('text');
+                el.attr('transform', Lib.getTextTransform(transform));
+            }
+        });
+    }
+}
+
+function recordMinTextSize(
+    traceType, // in
+    transform, // inout
+    fullLayout // inout
+) {
+    if(fullLayout.uniformtext.mode) {
+        var minKey = getMinKey(traceType);
+        var minSize = fullLayout.uniformtext.minsize;
+        var size = transform.scale * transform.fontSize;
+
+        transform.hide = size < minSize;
+
+        fullLayout[minKey] = fullLayout[minKey] || Infinity;
+        if(!transform.hide) {
+            fullLayout[minKey] = Math.min(
+                fullLayout[minKey],
+                Math.max(size, minSize)
+            );
+        }
+    }
+}
+
+function clearMinTextSize(
+    traceType, // in
+    fullLayout // inout
+) {
+    var minKey = getMinKey(traceType);
+    fullLayout[minKey] = undefined;
+}
+
+function getMinKey(traceType) {
+    return '_' + traceType + 'Text_minsize';
+}
+
+module.exports = {
+    recordMinTextSize: recordMinTextSize,
+    clearMinTextSize: clearMinTextSize,
+    resizeText: resizeText
+};
diff --git a/src/traces/funnel/plot.js b/src/traces/funnel/plot.js
@@ -12,7 +12,7 @@ var d3 = require('d3');
 var Lib = require('../../lib');
 var Drawing = require('../../components/drawing');
 var barPlot = require('../bar/plot');
-var clearMinTextSize = barPlot.clearMinTextSize;
+var clearMinTextSize = require('../bar/uniform_text').clearMinTextSize;
 
 module.exports = function plot(gd, plotinfo, cdModule, traceLayer) {
     var fullLayout = gd._fullLayout;

diff --git a/src/traces/funnel/style.js b/src/traces/funnel/style.js
@@ -14,7 +14,7 @@ var Drawing = require('../../components/drawing');
 var Color = require('../../components/color');
 var DESELECTDIM = require('../../constants/interactions').DESELECTDIM;
 var barStyle = require('../bar/style');
-var resizeText = barStyle.resizeText;
+var resizeText = require('../bar/uniform_text').resizeText;
 var styleTextPoints = barStyle.styleTextPoints;
 
 function style(gd, cd, sel) {

diff --git a/src/traces/funnelarea/plot.js b/src/traces/funnelarea/plot.js
@@ -16,9 +16,9 @@ var svgTextUtils = require('../../lib/svg_text_utils');
 
 var barPlot = require('../bar/plot');
 var toMoveInsideBar = barPlot.toMoveInsideBar;
-var recordMinTextSize = barPlot.recordMinTextSize;
-var clearMinTextSize = barPlot.clearMinTextSize;
-
+var uniformText = require('../bar/uniform_text');
+var recordMinTextSize = uniformText.recordMinTextSize;
+var clearMinTextSize = uniformText.clearMinTextSize;
 var pieHelpers = require('../pie/helpers');
 var piePlot = require('../pie/plot');
 

diff --git a/src/traces/funnelarea/style.js b/src/traces/funnelarea/style.js
@@ -11,7 +11,7 @@
 var d3 = require('d3');
 
 var styleOne = require('../pie/style_one');
-var resizeText = require('../bar/style').resizeText;
+var resizeText = require('../bar/uniform_text').resizeText;
 
 module.exports = function style(gd) {
     var s = gd._fullLayout._funnelarealayer.selectAll('.trace');

diff --git a/src/traces/pie/plot.js b/src/traces/pie/plot.js
@@ -16,9 +16,9 @@ var Color = require('../../components/color');
 var Drawing = require('../../components/drawing');
 var Lib = require('../../lib');
 var svgTextUtils = require('../../lib/svg_text_utils');
-var barPlot = require('../bar/plot');
-var recordMinTextSize = barPlot.recordMinTextSize;
-var clearMinTextSize = barPlot.clearMinTextSize;
+var uniformText = require('../bar/uniform_text');
+var recordMinTextSize = uniformText.recordMinTextSize;
+var clearMinTextSize = uniformText.clearMinTextSize;
 
 var helpers = require('./helpers');
 var eventData = require('./event_data');

diff --git a/src/traces/pie/style.js b/src/traces/pie/style.js
@@ -11,7 +11,7 @@
 var d3 = require('d3');
 
 var styleOne = require('./style_one');
-var resizeText = require('../bar/style').resizeText;
+var resizeText = require('../bar/uniform_text').resizeText;
 
 module.exports = function style(gd) {
     var s = gd._fullLayout._pielayer.selectAll('.trace');

diff --git a/src/traces/sunburst/plot.js b/src/traces/sunburst/plot.js
@@ -14,9 +14,9 @@ var d3Hierarchy = require('d3-hierarchy');
 var Drawing = require('../../components/drawing');
 var Lib = require('../../lib');
 var svgTextUtils = require('../../lib/svg_text_utils');
-var barPlot = require('../bar/plot');
-var recordMinTextSize = barPlot.recordMinTextSize;
-var clearMinTextSize = barPlot.clearMinTextSize;
+var uniformText = require('../bar/uniform_text');
+var recordMinTextSize = uniformText.recordMinTextSize;
+var clearMinTextSize = uniformText.clearMinTextSize;
 var piePlot = require('../pie/plot');
 var computeTransform = piePlot.computeTransform;
 var transformInsideText = piePlot.transformInsideText;

diff --git a/src/traces/sunburst/style.js b/src/traces/sunburst/style.js
@@ -11,7 +11,7 @@
 var d3 = require('d3');
 var Color = require('../../components/color');
 var Lib = require('../../lib');
-var resizeText = require('../bar/style').resizeText;
+var resizeText = require('../bar/uniform_text').resizeText;
 
 function style(gd) {
     var s = gd._fullLayout._sunburstlayer.selectAll('.trace');

diff --git a/src/traces/treemap/plot.js b/src/traces/treemap/plot.js
@@ -16,8 +16,9 @@ var Lib = require('../../lib');
 var TEXTPAD = require('../bar/constants').TEXTPAD;
 var barPlot = require('../bar/plot');
 var toMoveInsideBar = barPlot.toMoveInsideBar;
-var recordMinTextSize = barPlot.recordMinTextSize;
-var clearMinTextSize = barPlot.clearMinTextSize;
+var uniformText = require('../bar/uniform_text');
+var recordMinTextSize = uniformText.recordMinTextSize;
+var clearMinTextSize = uniformText.clearMinTextSize;
 var resizeText = require('../bar/style').resizeText;
 var constants = require('./constants');
 var drawDescendants = require('./draw_descendants');

diff --git a/src/traces/treemap/style.js b/src/traces/treemap/style.js
@@ -12,7 +12,7 @@ var d3 = require('d3');
 var Color = require('../../components/color');
 var Lib = require('../../lib');
 var helpers = require('../sunburst/helpers');
-var resizeText = require('../bar/style').resizeText;
+var resizeText = require('../bar/uniform_text').resizeText;
 
 function style(gd) {
     var s = gd._fullLayout._treemaplayer.selectAll('.trace');

diff --git a/src/traces/waterfall/plot.js b/src/traces/waterfall/plot.js
@@ -12,7 +12,7 @@ var d3 = require('d3');
 var Lib = require('../../lib');
 var Drawing = require('../../components/drawing');
 var barPlot = require('../bar/plot');
-var clearMinTextSize = barPlot.clearMinTextSize;
+var clearMinTextSize = require('../bar/uniform_text').clearMinTextSize;
 
 module.exports = function plot(gd, plotinfo, cdModule, traceLayer) {
     var fullLayout = gd._fullLayout;

diff --git a/src/traces/waterfall/style.js b/src/traces/waterfall/style.js
@@ -14,7 +14,7 @@ var Drawing = require('../../components/drawing');
 var Color = require('../../components/color');
 var DESELECTDIM = require('../../constants/interactions').DESELECTDIM;
 var barStyle = require('../bar/style');
-var resizeText = barStyle.resizeText;
+var resizeText = require('../bar/uniform_text').resizeText;
 var styleTextPoints = barStyle.styleTextPoints;
 
 function style(gd, cd, sel) {