texttemplate: use result of appendArrayPointValue as available variables

Author: antoinerg

src/components/drawing/index.js

@@ -28,6 +28,7 @@ var subTypes = require('../../traces/scatter/subtypes');
 var makeBubbleSizeFn = require('../../traces/scatter/make_bubble_size_func');
 
 var drawing = module.exports = {};
+var appendArrayPointValue = require('../fx/helpers').appendArrayPointValue;
 
 // -----------------------------------------------------
 // styling functions for plot elements
@@ -700,10 +701,9 @@ drawing.textPointStyle = function(s, trace, gd) {
         }
 
         if(template) {
-            var extra = {};
-            if(d.tx) extra.text = d.tx;
-            if(d.data) extra.customdata = d.data;
-            text = Lib.texttemplateString(text, {}, gd._fullLayout._d3locale, d, trace._meta || {}, extra);
+            var pt = {};
+            appendArrayPointValue(pt, trace, d.i);
+            text = Lib.texttemplateString(text, {}, gd._fullLayout._d3locale, pt, d, trace._meta || {});
         }
 
         var pos = d.tp || trace.textposition;

src/traces/bar/plot.js

@@ -26,6 +26,8 @@ var attributes = require('./attributes');
 var attributeText = attributes.text;
 var attributeTextPosition = attributes.textposition;
 
+var appendArrayPointValue = require('../../components/fx/helpers').appendArrayPointValue;
+
 // padding in pixels around text
 var TEXTPAD = 3;
 
@@ -567,8 +569,8 @@ function calcTexttemplate(fullLayout, calcTrace, index, xa, ya) {
     obj.value = cdi.s;
     obj.valueLabel = formatNumber(cdi.s);
 
-    obj.x = cdi.x;
-    obj.y = cdi.y;
+    var pt = {};
+    appendArrayPointValue(pt, trace, cdi.i);
 
     if(isWaterfall) {
         obj.delta = +cdi.rawS || cdi.s;
@@ -593,7 +595,7 @@ function calcTexttemplate(fullLayout, calcTrace, index, xa, ya) {
 
     var customdata = Lib.castOption(trace, cdi.i, 'customdata');
     if(customdata) obj.customdata = customdata;
-    return Lib.texttemplateString(texttemplate, obj, fullLayout._d3locale, obj, trace._meta || {});
+    return Lib.texttemplateString(texttemplate, obj, fullLayout._d3locale, pt, obj, trace._meta || {});
 }
 
 // TODO: calcTextinfo should build a texttemplate pass it to calcTexttemplate()

test/jasmine/tests/bar_test.js

@@ -1108,6 +1108,17 @@ describe('A bar plot', function() {
       [['%{y}', '%{value}', '%{text}'], ['1', '5', 'C']]
     ]);
 
+    checkTextTemplate([{
+        type: 'bar',
+        textposition: 'outside',
+        x: ['2019-01-01', '2019-02-01'],
+        y: [1, 2],
+        hovertemplate: '%{x}',
+        texttemplate: '%{x}'
+    }], 'text.bartext', [
+      ['%{x}', ['2019-01-01', '2019-02-01']]
+    ]);
+
     it('should show bar texts (inside case)', function(done) {
         var data = [{
             y: [10, 20, 30],

test/jasmine/tests/scatterpolar_test.js

@@ -209,7 +209,7 @@ describe('Test scatterpolar texttemplate:', function() {
         'r': [1, 0.5, 1],
         'theta': [0, 90, 180],
     }], 'g.textpoint', [
-        ['%{text}: (%{r:0.2f}, %{theta:0.2f})', ['A: (1.00, 0.00)', 'B: (0.50, 1.57)', 'C: (1.00, 3.14)']],
-        [['', '', '%{theta:0.2f}'], ['', '', '3.14']]
+        ['%{text}: (%{r:0.2f}, %{theta:0.1f})', ['A: (1.00, 0.0)', 'B: (0.50, 90.0)', 'C: (1.00, 180.0)']],
+        [['', 'b%{theta:0.2f}', '%{theta:0.2f}'], ['', 'b90.00', '180.00']]
     ]);
 });

test/jasmine/tests/scatterternary_test.js

@@ -565,6 +565,6 @@ describe('Test scattergeo texttemplate:', function() {
         'mode': 'markers+text',
         'text': ['A', 'B', 'C']
     }], 'g.textpoint', [
-        ['%{text} (%{a:.2f}, %{b:.2f}, %{c:.2f})', ['A (0.30, 0.20, 0.50)', 'B (0.22, 0.56, 0.22)', 'C (0.56, 0.22, 0.22)']]
+        ['%{text} (%{a:.1f}, %{b:.1f}, %{c:.1f})', ['A (3.0, 2.0, 5.0)', 'B (2.0, 5.0, 2.0)', 'C (5.0, 2.0, 2.0)']]
     ]);
 });