mv get(X|Y)anchor to Lib

etpinard · etpinard · commit d943619a7c56 · 2019-09-23T16:46:34.000-04:00
diff --git a/src/components/legend/draw.js b/src/components/legend/draw.js
@@ -102,8 +102,8 @@ module.exports = function draw(gd) {
             var gs = fullLayout._size;
             var bw = opts.borderwidth;
 
-            var lx = gs.l + gs.w * opts.x - FROM_TL[getXanchor(opts)] * opts._width;
-            var ly = gs.t + gs.h * (1 - opts.y) - FROM_TL[getYanchor(opts)] * opts._effHeight;
+            var lx = gs.l + gs.w * opts.x - FROM_TL[Lib.getXanchor(opts)] * opts._width;
+            var ly = gs.t + gs.h * (1 - opts.y) - FROM_TL[Lib.getYanchor(opts)] * opts._effHeight;
 
             if(fullLayout.margin.autoexpand) {
                 var lx0 = lx;
@@ -486,7 +486,7 @@ function computeLegendDimensions(gd, groups, traces) {
     var itemGap = constants.itemGap;
     var endPad = 2 * (bw + itemGap);
 
-    var yanchor = getYanchor(opts);
+    var yanchor = Lib.getYanchor(opts);
     var isBelowPlotArea = opts.y < 0 || (opts.y === 0 && yanchor === 'top');
     var isAbovePlotArea = opts.y > 1 || (opts.y === 1 && yanchor === 'bottom');
 
@@ -520,7 +520,7 @@ function computeLegendDimensions(gd, groups, traces) {
             opts._height += (opts._lgroupsLength - 1) * opts.tracegroupgap;
         }
     } else {
-        var xanchor = getXanchor(opts);
+        var xanchor = Lib.getXanchor(opts);
         var isLeftOfPlotArea = opts.x < 0 || (opts.x === 0 && xanchor === 'right');
         var isRightOfPlotArea = opts.x > 1 || (opts.x === 1 && xanchor === 'left');
         var isBeyondPlotAreaY = isAbovePlotArea || isBelowPlotArea;
@@ -633,8 +633,8 @@ function computeLegendDimensions(gd, groups, traces) {
 function expandMargin(gd) {
     var fullLayout = gd._fullLayout;
     var opts = fullLayout.legend;
-    var xanchor = getXanchor(opts);
-    var yanchor = getYanchor(opts);
+    var xanchor = Lib.getXanchor(opts);
+    var yanchor = Lib.getYanchor(opts);
 
     return Plots.autoMargin(gd, 'legend', {
         x: opts.x,
@@ -645,15 +645,3 @@ function expandMargin(gd) {
         t: opts._effHeight * (FROM_TL[yanchor])
     });
 }
-
-function getXanchor(opts) {
-    return Lib.isRightAnchor(opts) ? 'right' :
-        Lib.isCenterAnchor(opts) ? 'center' :
-        'left';
-}
-
-function getYanchor(opts) {
-    return Lib.isBottomAnchor(opts) ? 'bottom' :
-        Lib.isMiddleAnchor(opts) ? 'middle' :
-        'top';
-}
diff --git a/src/lib/anchor_utils.js b/src/lib/anchor_utils.js
@@ -6,10 +6,8 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
-
 /**
  * Determine the position anchor property of x/y xanchor/yanchor components.
  *
@@ -18,45 +16,67 @@
  * - values > 2/3 align the right at that fraction.
  */
 
-
-exports.isLeftAnchor = function isLeftAnchor(opts) {
+function isLeftAnchor(opts) {
     return (
       opts.xanchor === 'left' ||
       (opts.xanchor === 'auto' && opts.x <= 1 / 3)
     );
-};
+}
 
-exports.isCenterAnchor = function isCenterAnchor(opts) {
+function isCenterAnchor(opts) {
     return (
         opts.xanchor === 'center' ||
         (opts.xanchor === 'auto' && opts.x > 1 / 3 && opts.x < 2 / 3)
     );
-};
+}
 
-exports.isRightAnchor = function isRightAnchor(opts) {
+function isRightAnchor(opts) {
     return (
       opts.xanchor === 'right' ||
       (opts.xanchor === 'auto' && opts.x >= 2 / 3)
     );
-};
+}
 
-exports.isTopAnchor = function isTopAnchor(opts) {
+function isTopAnchor(opts) {
     return (
         opts.yanchor === 'top' ||
         (opts.yanchor === 'auto' && opts.y >= 2 / 3)
     );
-};
+}
 
-exports.isMiddleAnchor = function isMiddleAnchor(opts) {
+function isMiddleAnchor(opts) {
     return (
         opts.yanchor === 'middle' ||
         (opts.yanchor === 'auto' && opts.y > 1 / 3 && opts.y < 2 / 3)
     );
-};
+}
 
-exports.isBottomAnchor = function isBottomAnchor(opts) {
+function isBottomAnchor(opts) {
     return (
       opts.yanchor === 'bottom' ||
       (opts.yanchor === 'auto' && opts.y <= 1 / 3)
     );
+}
+
+function getXanchor(opts) {
+    return isRightAnchor(opts) ? 'right' :
+        isCenterAnchor(opts) ? 'center' :
+        'left';
+}
+
+function getYanchor(opts) {
+    return isBottomAnchor(opts) ? 'bottom' :
+        isMiddleAnchor(opts) ? 'middle' :
+        'top';
+}
+
+module.exports = {
+    isLeftAnchor: isLeftAnchor,
+    isCenterAnchor: isCenterAnchor,
+    isRightAnchor: isRightAnchor,
+    getXanchor: getXanchor,
+    isTopAnchor: isTopAnchor,
+    isMiddleAnchor: isMiddleAnchor,
+    isBottomAnchor: isBottomAnchor,
+    getYanchor: getYanchor
 };
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -106,9 +106,11 @@ var anchorUtils = require('./anchor_utils');
 lib.isLeftAnchor = anchorUtils.isLeftAnchor;
 lib.isCenterAnchor = anchorUtils.isCenterAnchor;
 lib.isRightAnchor = anchorUtils.isRightAnchor;
+lib.getXanchor = anchorUtils.getXanchor;
 lib.isTopAnchor = anchorUtils.isTopAnchor;
 lib.isMiddleAnchor = anchorUtils.isMiddleAnchor;
 lib.isBottomAnchor = anchorUtils.isBottomAnchor;
+lib.getYanchor = anchorUtils.getYanchor;
 
 var geom2dModule = require('./geometry2d');
 lib.segmentsIntersect = geom2dModule.segmentsIntersect;
