Merge branch 'add-text-to-shapes' of https://github.com/plotly/plotly.js into add-text-to-shapes

Author: emilykl

src/components/shapes/draw_newshape/attributes.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var fontAttrs = require('../../../plots/font_attributes');
-var annAttrs = require('../../annotations/attributes');
 var dash = require('../../drawing/attributes').dash;
 var extendFlat = require('../../../lib/extend').extendFlat;
 
@@ -102,25 +101,35 @@ module.exports = {
             },
             textangle: {
                 valType: 'angle',
-                editType: 'calc+arraydraw',
+                editType: 'none',
                 description: [
                     'Sets the angle at which the label text is drawn',
                     'with respect to the horizontal. For lines, the default textangle is `auto`,',
                     'which displays the text at the same angle as the line. For all other shapes,',
                     'the default textangle is 0 (horizontal).'
                 ].join(' ')
             },
-            xanchor: extendFlat({}, annAttrs.xanchor, {
+            xanchor: {
+                valType: 'enumerated',
+                values: ['auto', 'left', 'center', 'right'],
+                dflt: 'auto',
+                editType: 'none',
                 description: 'Sets the text box\'s horizontal position anchor.',
-            }),
-            yanchor: extendFlat({}, annAttrs.yanchor, {
+            },
+            yanchor: {
+                valType: 'enumerated',
+                values: ['auto', 'top', 'middle', 'bottom'],
+                dflt: 'auto',
+                editType: 'none',
                 description: 'Sets the text box\'s vertical position anchor.',
-            }),
+            },
             padding: {
                 valType: 'number',
                 dflt: 3,
+                editType: 'none',
                 description: 'Sets padding between edge of label and xanchor / yanchor.'
             },
+            editType: 'none'
         },
         editType: 'none'
     },

test/plot-schema.json

@@ -3574,6 +3574,7 @@
      ]
     },
     "label": {
+     "editType": "none",
      "font": {
       "color": {
        "editType": "calc+arraydraw",
@@ -3598,6 +3599,7 @@
      "padding": {
       "description": "Sets padding between edge of label and xanchor / yanchor.",
       "dflt": 3,
+      "editType": "none",
       "valType": "number"
      },
      "role": "object",
@@ -3608,7 +3610,7 @@
      },
      "textangle": {
       "description": "Sets the angle at which the label text is drawn with respect to the horizontal. For lines, the default textangle is `auto`, which displays the text at the same angle as the line. For all other shapes, the default textangle is 0 (horizontal).",
-      "editType": "calc+arraydraw",
+      "editType": "none",
       "valType": "angle"
      },
      "textposition": {
@@ -3632,7 +3634,7 @@
      "xanchor": {
       "description": "Sets the text box's horizontal position anchor.",
       "dflt": "auto",
-      "editType": "calc+arraydraw",
+      "editType": "none",
       "valType": "enumerated",
       "values": [
        "auto",
@@ -3644,7 +3646,7 @@
      "yanchor": {
       "description": "Sets the text box's vertical position anchor.",
       "dflt": "auto",
-      "editType": "calc+arraydraw",
+      "editType": "none",
       "valType": "enumerated",
       "values": [
        "auto",