merge shapes/defaults.js

Author: emilykl

src/components/shapes/defaults.js

@@ -136,13 +136,19 @@ function handleShapeDefaults(shapeIn, shapeOut, fullLayout) {
     // Label options
     coerce('label.text');
     coerce('label.textangle', shapeType === 'line' ? 'auto' : 0);
+<<<<<<< HEAD
     var labelTextPosition = coerce(
         'label.textposition',
         shapeType === 'line' ? '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.padding');
     Lib.coerceFont(coerce, 'label.font', fullLayout.font);
 }

src/components/shapes/draw_newshape/attributes.js

@@ -83,10 +83,11 @@ module.exports = {
             text: {
                 valType: 'string',
                 dflt: '',
+                editType: 'none',
                 description: 'Sets the text to display with shape.'
             },
             font: fontAttrs({
-                editType: 'calc+arraydraw',
+                editType: 'none',
                 description: 'Sets the shape label text font.'
             }),
             textposition: {
@@ -97,6 +98,7 @@ module.exports = {
                     'bottom left', 'bottom center', 'bottom right',
                     'start', 'middle', 'end',
                 ],
+                editType: 'none',
                 description: 'Sets the position of the label text relative to the shape.'
             },
             textangle: {

src/components/shapes/draw_newshape/defaults.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Color = require('../../color');
-
+var Lib = require('../../../lib');
 
 module.exports = function supplyDrawNewShapeDefaults(layoutIn, layoutOut, coerce) {
     coerce('newshape.drawdirection');
@@ -16,6 +16,15 @@ module.exports = function supplyDrawNewShapeDefaults(layoutIn, layoutOut, coerce
         coerce('newshape.line.dash');
     }
 
+    var isLine = layoutIn.dragmode === 'drawline';
+    coerce('newshape.label.text');
+    coerce('newshape.label.textangle', isLine ? 'auto' : 0);
+    coerce('newshape.label.textposition', isLine ? 'middle' : 'middle center');
+    coerce('newshape.label.xanchor');
+    coerce('newshape.label.yanchor');
+    coerce('newshape.label.padding');
+    Lib.coerceFont(coerce, 'newshape.label.font', layoutOut.font);
+
     coerce('activeshape.fillcolor');
     coerce('activeshape.opacity');
 };

src/components/shapes/draw_newshape/newshapes.js

@@ -77,6 +77,8 @@ module.exports = function newShapes(outlines, dragOptions) {
     var newShape = {
         editable: true,
 
+        label: newStyle.label,
+
         xref: xPaper ? 'paper' : xaxis._id,
         yref: yPaper ? 'paper' : yaxis._id,
 

test/image/mocks/zz-text_on_shapes_reversed_axes.json

@@ -119,7 +119,13 @@
                 "fillcolor": "yellow",
                 "path": "M300,70C300,10 380,10 380,70C380,90 300,90 300,70ZM320,60C320,50 332,50 332,60ZM348,60C348,50 360,50 360,60ZM320,70C326,80 354,80 360,70Z"
             }
-        ]
+        ],
+        "dragmode": "drawline",
+        "newshape": {
+            "label": {
+                "text": "TEXT"
+            }
+        }
     },
     "config": {
         "editable": false,

test/plot-schema.json

@@ -3577,21 +3577,21 @@
      "editType": "none",
      "font": {
       "color": {
-       "editType": "calc+arraydraw",
+       "editType": "none",
        "valType": "color"
       },
       "description": "Sets the shape label text font.",
-      "editType": "calc+arraydraw",
+      "editType": "none",
       "family": {
        "description": "HTML font family - the typeface that will be applied by the web browser. The web browser will only be able to apply a font if it is available on the system which it operates. Provide multiple font families, separated by commas, to indicate the preference in which to apply fonts if they aren't available on the system. The Chart Studio Cloud (at https://chart-studio.plotly.com or on-premise) generates images on a server, where only a select number of fonts are installed and supported. These include *Arial*, *Balto*, *Courier New*, *Droid Sans*,, *Droid Serif*, *Droid Sans Mono*, *Gravitas One*, *Old Standard TT*, *Open Sans*, *Overpass*, *PT Sans Narrow*, *Raleway*, *Times New Roman*.",
-       "editType": "calc+arraydraw",
+       "editType": "none",
        "noBlank": true,
        "strict": true,
        "valType": "string"
       },
       "role": "object",
       "size": {
-       "editType": "calc+arraydraw",
+       "editType": "none",
        "min": 1,
        "valType": "number"
       }
@@ -3606,6 +3606,7 @@
      "text": {
       "description": "Sets the text to display with shape.",
       "dflt": "",
+      "editType": "none",
       "valType": "string"
      },
      "textangle": {
@@ -3615,6 +3616,7 @@
      },
      "textposition": {
       "description": "Sets the position of the label text relative to the shape.",
+      "editType": "none",
       "valType": "enumerated",
       "values": [
        "top left",