(hover|text)template: pie/funnel/waterfall fix attribute definition

Author: antoinerg

Diff for: src/traces/funnel/attributes.js

@@ -27,7 +27,7 @@ module.exports = {
 
     hovertext: barAttrs.hovertext,
     hovertemplate: hovertemplateAttrs({}, {
-        keys: constants.eventDataKeys.concat(['label', 'value', 'text'])
+        keys: constants.eventDataKeys
     }),
 
     hoverinfo: extendFlat({}, plotAttrs.hoverinfo, {
@@ -47,8 +47,9 @@ module.exports = {
             'are computed separately (per trace).'
         ].join(' ')
     },
+    // TODO: incorporate `label` and `value` in the eventData
     texttemplate: texttemplateAttrs({editType: 'plot'}, {
-        keys: constants.eventDataKeys.concat(['label', 'value', 'text'])
+        keys: constants.eventDataKeys.concat(['label', 'value'])
     }),
 
     text: barAttrs.text,

Diff for: src/traces/pie/attributes.js

@@ -106,7 +106,7 @@ module.exports = {
 
     text: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'plot',
         description: [
             'Sets text elements associated with each sector.',
             'If trace `textinfo` contains a *text* flag, these elements will be seen',

Diff for: src/traces/waterfall/attributes.js

@@ -99,8 +99,9 @@ module.exports = {
             'are computed separately (per trace).'
         ].join(' ')
     },
+    // TODO: incorporate `label` and `value` in the eventData
     texttemplate: texttemplateAttrs({editType: 'plot'}, {
-        keys: ['label', 'text', 'initial', 'delta', 'final']
+        keys: constants.eventDataKeys.concat(['label'])
     }),
     text: barAttrs.text,
     textposition: barAttrs.textposition,

Diff for: test/image/baselines/waterfall_funnel_texttemplate_date.png

@@ -0,0 +1,73 @@
+{
+    "data": [{
+        "type": "waterfall",
+        "x": [
+            "2010-01-01",
+            "2010-07-01",
+            "2011-01-01",
+            "2012-01-01"
+        ],
+        "y": [1, -2, 3, 0],
+        "textinfo": "label",
+        "textposition": "inside"
+    }, {
+        "type": "waterfall",
+        "x": [
+            "2010-01-01",
+            "2010-07-01",
+            "2011-01-01",
+            "2012-01-01"
+        ],
+        "y": [1, -2, 3, 0],
+        "texttemplate": "%{label}",
+        "textposition": "inside",
+        "xaxis": "x1",
+        "yaxis": "y1"
+    }, {
+        "type": "funnel",
+        "orientation": "v",
+        "x": [
+            "2010-01-01",
+            "2010-07-01",
+            "2011-01-01",
+            "2012-01-01"
+        ],
+        "y": [10, 7, 3, 0],
+        "textinfo": "label",
+        "textposition": "inside",
+        "xaxis": "x2",
+        "yaxis": "y2"
+    }, {
+        "type": "funnel",
+        "orientation": "v",
+        "x": [
+            "2010-01-01",
+            "2010-07-01",
+            "2011-01-01",
+            "2012-01-01"
+        ],
+        "y": [10, 7, 3, 0],
+        "texttemplate": "%{label}",
+        "textposition": "inside",
+        "xaxis": "x2",
+        "yaxis": "y2"
+    }],
+    "layout": {
+        "title": {
+          "text": "textinfo: 'label' versus texttemplate: '%{label}'"
+        },
+        "xaxis": {
+          "type": "date"
+        },
+        "margin": {"t": 40, "b": 20, "l": 20, "r": 20},
+        "width": 800,
+        "height": 400,
+        "grid": {
+          "rows": 1,
+          "columns": 2,
+          "pattern": "independent",
+          "xgap": 5,
+          "ygap": 5
+        }
+    }
+}