only coerce label properties if label text is given

Author: emilykl

src/components/shapes/defaults.js

@@ -135,12 +135,13 @@ function handleShapeDefaults(shapeIn, shapeOut, fullLayout) {
 
     // Label options
     var isLine = shapeType === 'line';
-    coerce('label.text');
-    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(isLine, labelTextPosition));
-    coerce('label.padding');
-    Lib.coerceFont(coerce, 'label.font', fullLayout.font);
+    var labelText = coerce('label.text');
+    if(labelText) {
+        coerce('label.textangle', isLine ? 'auto' : 0);
+        var labelTextPosition = coerce('label.textposition', isLine ? 'middle' : 'middle center');
+        coerce('label.xanchor');
+        coerce('label.yanchor', dfltLabelYanchor(isLine, labelTextPosition));
+        coerce('label.padding');
+        Lib.coerceFont(coerce, 'label.font', fullLayout.font);
+    }
 }

src/components/shapes/draw_newshape/defaults.js

@@ -34,13 +34,15 @@ module.exports = function supplyDrawNewShapeDefaults(layoutIn, layoutOut, coerce
     }
 
     var isLine = layoutIn.dragmode === 'drawline';
-    coerce('newshape.label.text');
-    coerce('newshape.label.textangle', isLine ? 'auto' : 0);
-    var labelTextPosition = coerce('newshape.label.textposition', isLine ? 'middle' : 'middle center');
-    coerce('newshape.label.xanchor');
-    coerce('newshape.label.yanchor', dfltLabelYanchor(isLine, labelTextPosition));
-    coerce('newshape.label.padding');
-    Lib.coerceFont(coerce, 'newshape.label.font', layoutOut.font);
+    var labelText = coerce('newshape.label.text');
+    if(labelText) {
+        coerce('newshape.label.textangle', isLine ? 'auto' : 0);
+        var labelTextPosition = coerce('newshape.label.textposition', isLine ? 'middle' : 'middle center');
+        coerce('newshape.label.xanchor');
+        coerce('newshape.label.yanchor', dfltLabelYanchor(isLine, labelTextPosition));
+        coerce('newshape.label.padding');
+        Lib.coerceFont(coerce, 'newshape.label.font', layoutOut.font);
+    }
 
     coerce('activeshape.fillcolor');
     coerce('activeshape.opacity');