move getTransform function to Lib and use it in bar and treemap

archmoj · archmoj · commit 57dec380c6c8 · 2019-09-14T16:35:31.000-04:00
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -1179,3 +1179,32 @@ lib.isHidden = function(gd) {
     var display = window.getComputedStyle(gd).display;
     return !display || display === 'none';
 };
+
+lib.getTextTransform = function(opts) {
+    var textX = opts.textX;
+    var textY = opts.textY;
+    var targetX = opts.targetX;
+    var targetY = opts.targetY;
+    var scale = opts.scale;
+    var rotate = opts.rotate;
+
+    var transformScale;
+    var transformRotate;
+    var transformTranslate;
+
+    if(scale < 1) transformScale = 'scale(' + scale + ') ';
+    else {
+        scale = 1;
+        transformScale = '';
+    }
+
+    transformRotate = (rotate) ?
+        'rotate(' + rotate + ' ' + textX + ' ' + textY + ') ' : '';
+
+    // Note that scaling also affects the center of the text box
+    var translateX = (targetX - scale * textX);
+    var translateY = (targetY - scale * textY);
+    transformTranslate = 'translate(' + translateX + ' ' + translateY + ')';
+
+    return transformTranslate + transformScale + transformRotate;
+};
diff --git a/src/traces/bar/plot.js b/src/traces/bar/plot.js
@@ -342,7 +342,7 @@ function appendBarText(gd, plotinfo, bar, calcTrace, i, x0, x1, y0, y1, opts) {
             trace.constraintext === 'both' ||
             trace.constraintext === 'outside';
 
-        transform = getTransform(toMoveOutsideBar(x0, x1, y0, y1, textBB, {
+        transform = Lib.getTextTransform(toMoveOutsideBar(x0, x1, y0, y1, textBB, {
             isHorizontal: isHorizontal,
             constrained: constrained,
             angle: trace.textangle
@@ -352,7 +352,7 @@ function appendBarText(gd, plotinfo, bar, calcTrace, i, x0, x1, y0, y1, opts) {
             trace.constraintext === 'both' ||
             trace.constraintext === 'inside';
 
-        transform = getTransform(toMoveInsideBar(x0, x1, y0, y1, textBB, {
+        transform = Lib.getTextTransform(toMoveInsideBar(x0, x1, y0, y1, textBB, {
             isHorizontal: isHorizontal,
             constrained: constrained,
             angle: trace.textangle,
@@ -510,35 +510,6 @@ function toMoveOutsideBar(x0, x1, y0, y1, textBB, opts) {
     };
 }
 
-function getTransform(opts) {
-    var textX = opts.textX;
-    var textY = opts.textY;
-    var targetX = opts.targetX;
-    var targetY = opts.targetY;
-    var scale = opts.scale;
-    var rotate = opts.rotate;
-
-    var transformScale;
-    var transformRotate;
-    var transformTranslate;
-
-    if(scale < 1) transformScale = 'scale(' + scale + ') ';
-    else {
-        scale = 1;
-        transformScale = '';
-    }
-
-    transformRotate = (rotate) ?
-        'rotate(' + rotate + ' ' + textX + ' ' + textY + ') ' : '';
-
-    // Note that scaling also affects the center of the text box
-    var translateX = (targetX - scale * textX);
-    var translateY = (targetY - scale * textY);
-    transformTranslate = 'translate(' + translateX + ' ' + translateY + ')';
-
-    return transformTranslate + transformScale + transformRotate;
-}
-
 function getText(fullLayout, calcTrace, index, xa, ya) {
     var trace = calcTrace[0].trace;
     var texttemplate = trace.texttemplate;
@@ -695,7 +666,6 @@ function calcTextinfo(calcTrace, index, xa, ya) {
 
 module.exports = {
     plot: plot,
-    getTransform: getTransform,
     toMoveInsideBar: toMoveInsideBar,
     toMoveOutsideBar: toMoveOutsideBar
 };
diff --git a/src/traces/funnelarea/plot.js b/src/traces/funnelarea/plot.js
@@ -15,7 +15,6 @@ var Lib = require('../../lib');
 var svgTextUtils = require('../../lib/svg_text_utils');
 
 var barPlot = require('../bar/plot');
-var getTransform = barPlot.getTransform;
 var toMoveInsideBar = barPlot.toMoveInsideBar;
 
 var pieHelpers = require('../pie/helpers');
@@ -115,7 +114,7 @@ module.exports = function plot(gd, cdModule) {
                     x0 = Math.max(pt.TL[0], pt.BL[0]);
                     x1 = Math.min(pt.TR[0], pt.BR[0]);
 
-                    transform = getTransform(toMoveInsideBar(x0, x1, y0, y1, textBB, {
+                    transform = Lib.getTextTransform(toMoveInsideBar(x0, x1, y0, y1, textBB, {
                         isHorizontal: true,
                         constrained: true,
                         angle: 0,
diff --git a/src/traces/sunburst/helpers.js b/src/traces/sunburst/helpers.js
@@ -11,7 +11,6 @@
 var Lib = require('../../lib');
 var Color = require('../../components/color');
 var setCursor = require('../../lib/setcursor');
-var getTransform = require('../bar/plot').getTransform;
 
 function hasLabel(label) {
     return label || label === 0;
@@ -154,17 +153,6 @@ exports.hasTransition = function(transitionOpts) {
     return !!(transitionOpts && transitionOpts.duration > 0);
 };
 
-exports.strTransform = function(d) {
-    return getTransform({
-        textX: d.transform.textX,
-        textY: d.transform.textY,
-        targetX: d.transform.targetX,
-        targetY: d.transform.targetY,
-        scale: d.transform.scale,
-        rotate: d.transform.rotate
-    });
-};
-
 exports.getMaxDepth = function(trace) {
     return trace.maxdepth >= 0 ? trace.maxdepth : Infinity;
 };
diff --git a/src/traces/treemap/draw_ancestors.js b/src/traces/treemap/draw_ancestors.js
@@ -29,6 +29,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
     var viewY = opts.viewY;
     var pathSlice = opts.pathSlice;
     var toMoveInsideSlice = opts.toMoveInsideSlice;
+    var strTransform = opts.strTransform;
     var hasTransition = opts.hasTransition;
     var handleSlicesExit = opts.handleSlicesExit;
     var makeUpdateSliceInterpolator = opts.makeUpdateSliceInterpolator;
@@ -170,10 +171,10 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
         if(hasTransition) {
             sliceText.transition().attrTween('transform', function(pt2) {
                 var interp = makeUpdateTextInterpolator(pt2, upDown, refRect, [width, height]);
-                return function(t) { return helpers.strTransform(interp(t)); };
+                return function(t) { return strTransform(interp(t)); };
             });
         } else {
-            sliceText.attr('transform', helpers.strTransform(pt));
+            sliceText.attr('transform', strTransform(pt));
         }
     });
 };
diff --git a/src/traces/treemap/draw_descendants.js b/src/traces/treemap/draw_descendants.js
@@ -29,6 +29,7 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
     var viewY = opts.viewY;
     var pathSlice = opts.pathSlice;
     var toMoveInsideSlice = opts.toMoveInsideSlice;
+    var strTransform = opts.strTransform;
     var hasTransition = opts.hasTransition;
     var handleSlicesExit = opts.handleSlicesExit;
     var makeUpdateSliceInterpolator = opts.makeUpdateSliceInterpolator;
@@ -170,10 +171,10 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
         if(hasTransition) {
             sliceText.transition().attrTween('transform', function(pt2) {
                 var interp = makeUpdateTextInterpolator(pt2, upDown, getRefRect(), [width, height]);
-                return function(t) { return helpers.strTransform(interp(t)); };
+                return function(t) { return strTransform(interp(t)); };
             });
         } else {
-            sliceText.attr('transform', helpers.strTransform(pt));
+            sliceText.attr('transform', strTransform(pt));
         }
     });
 };
diff --git a/src/traces/treemap/plot.js b/src/traces/treemap/plot.js
@@ -431,6 +431,17 @@ function plotOne(gd, cd, element, transitionOpts) {
         }
     };
 
+    var strTransform = function(d) {
+        return Lib.getTextTransform({
+            textX: d.transform.textX,
+            textY: d.transform.textY,
+            targetX: d.transform.targetX,
+            targetY: d.transform.targetY,
+            scale: d.transform.scale,
+            rotate: d.transform.rotate
+        });
+    };
+
     var gTrace = d3.select(element);
     var selAncestors = gTrace.selectAll('g.pathbar');
     var selDescendants = gTrace.selectAll('g.slice');
@@ -477,7 +488,8 @@ function plotOne(gd, cd, element, transitionOpts) {
         makeUpdateTextInterpolator: makeUpdateTextInterpolator,
 
         handleSlicesExit: handleSlicesExit,
-        hasTransition: hasTransition
+        hasTransition: hasTransition,
+        strTransform: strTransform
     });
 
     if(trace.pathbar.visible) {
@@ -496,7 +508,8 @@ function plotOne(gd, cd, element, transitionOpts) {
             makeUpdateTextInterpolator: makeUpdateTextInterpolator,
 
             handleSlicesExit: handleSlicesExit,
-            hasTransition: hasTransition
+            hasTransition: hasTransition,
+            strTransform: strTransform
         });
     }
 }
