standardize default yanchor behavior between shape and draw_newshape

Author: emilykl

src/components/shapes/defaults.js

@@ -15,9 +15,9 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
     });
 };
 
-function dfltLabelYanchor(shapeType, labelTextPosition) {
+function dfltLabelYanchor(isLine, labelTextPosition) {
     var dfltYanchor;
-    if(shapeType === 'line') {
+    if(isLine) {
         dfltYanchor = 'bottom';
     } else {
         if(labelTextPosition.indexOf('top') !== -1) {
@@ -134,21 +134,13 @@ function handleShapeDefaults(shapeIn, shapeOut, fullLayout) {
     }
 
     // Label options
+    var isLine = shapeType === 'line';
     coerce('label.text');
-    coerce('label.textangle', shapeType === 'line' ? 'auto' : 0);
-<<<<<<< HEAD
-    var labelTextPosition = coerce(
-        'label.textposition',
-        shapeType === 'line' ? 'middle' : 'middle center'
-    );
+    coerce('label.textangle', isLine ? 'auto' : 0);
+    var labelTextPosition = coerce('label.textposition', isLine ? 'middle' : 'middle center');
     coerce('label.xanchor');
     // Default yanchor value depends on shape type and label textposition
-    coerce('label.yanchor', dfltLabelYanchor(shapeType, labelTextPosition));
-=======
-    coerce('label.textposition', shapeType === 'line' ? 'middle' : 'middle center');
-    coerce('label.xanchor');
-    coerce('label.yanchor');
->>>>>>> dfb608eb8a3a7a139b2f418edbc9e74c96782091
+    coerce('label.yanchor', dfltLabelYanchor(isLine, labelTextPosition));
     coerce('label.padding');
     Lib.coerceFont(coerce, 'label.font', fullLayout.font);
 }

src/components/shapes/draw_newshape/defaults.js

@@ -3,6 +3,23 @@
 var Color = require('../../color');
 var Lib = require('../../../lib');
 
+
+function dfltLabelYanchor(isLine, labelTextPosition) {
+    var dfltYanchor;
+    if(isLine) {
+        dfltYanchor = 'bottom';
+    } else {
+        if(labelTextPosition.indexOf('top') !== -1) {
+            dfltYanchor = 'top';
+        } else if(labelTextPosition.indexOf('bottom') !== -1) {
+            dfltYanchor = 'bottom';
+        } else {
+            dfltYanchor = 'middle';
+        }
+    }
+    return dfltYanchor;
+}
+
 module.exports = function supplyDrawNewShapeDefaults(layoutIn, layoutOut, coerce) {
     coerce('newshape.drawdirection');
     coerce('newshape.layer');
@@ -19,9 +36,9 @@ module.exports = function supplyDrawNewShapeDefaults(layoutIn, layoutOut, coerce
     var isLine = layoutIn.dragmode === 'drawline';
     coerce('newshape.label.text');
     coerce('newshape.label.textangle', isLine ? 'auto' : 0);
-    coerce('newshape.label.textposition', isLine ? 'middle' : 'middle center');
+    var labelTextPosition = coerce('newshape.label.textposition', isLine ? 'middle' : 'middle center');
     coerce('newshape.label.xanchor');
-    coerce('newshape.label.yanchor');
+    coerce('newshape.label.yanchor', dfltLabelYanchor(isLine, labelTextPosition));
     coerce('newshape.label.padding');
     Lib.coerceFont(coerce, 'newshape.label.font', layoutOut.font);