use existing fullLayout._d3locale instead of package d3-format

Author: antoinerg

package-lock.json

@@ -66,7 +66,6 @@
     "country-regex": "^1.1.0",
     "d3": "^3.5.12",
     "d3-force": "^1.0.6",
-    "d3-format": "^1.3.2",
     "d3-interpolate": "1",
     "d3-sankey-circular": "0.32.0",
     "delaunay-triangulate": "^1.1.6",

package.json

@@ -971,15 +971,15 @@ function createHoverText(hoverData, opts, gd) {
         }
 
         // hovertemplate
-        var locale = gd._fullLayout._format;
+        var d3locale = gd._fullLayout._d3locale;
         var hovertemplate = d.hovertemplate || false;
         var hovertemplateLabels = d.hovertemplateLabels || d;
         var eventData = d.eventData[0] || {};
         if(hovertemplate) {
             text = Lib.hovertemplateString(
                 hovertemplate,
                 hovertemplateLabels,
-                locale,
+                d3locale,
                 eventData,
                 {meta: fullLayout.meta}
             );

src/components/fx/hover.js

@@ -10,7 +10,6 @@
 'use strict';
 
 var d3 = require('d3');
-var d3format = require('d3-format');
 var isNumeric = require('fast-isnumeric');
 
 var numConstants = require('../constants/numerical');
@@ -1036,14 +1035,14 @@ var maximumNumberOfHoverTemplateWarnings = 10;
  *  Lib.hovertemplateString('name: %{trace[0].name}', {trace: [{name: 'asdf'}]}) --> 'name: asdf'
  *  Lib.hovertemplateString('price: %{y:$.2f}', {y: 1}) --> 'price: $1.00'
  *
- * @param {obj}     data object containing the locale
+ * @param {obj}     d3 locale
  * @param {string}  input string containing %{...:...} template strings
  * @param {obj}     data object containing fallback text when no formatting is specified, ex.: {yLabel: 'formattedYValue'}
  * @param {obj}     data objects containing substitution values
  *
  * @return {string} templated string
  */
-lib.hovertemplateString = function(string, labels, locale) {
+lib.hovertemplateString = function(string, labels, d3locale) {
     var args = arguments;
     // Not all that useful, but cache nestedProperty instantiation
     // just in case it speeds things up *slightly*:
@@ -1078,9 +1077,13 @@ lib.hovertemplateString = function(string, labels, locale) {
         }
 
         if(format) {
-            var fmt = d3format;
-            if(locale) fmt = fmt.formatLocale(locale);
-            value = fmt.format(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
+            var fmt;
+            if(d3locale) {
+                fmt = d3locale.numberFormat;
+            } else {
+                fmt = d3.format;
+            }
+            value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
         } else {
             if(labels.hasOwnProperty(key + 'Label')) value = labels[key + 'Label'];
         }

src/lib/index.js

@@ -372,7 +372,6 @@ plots.supplyDefaults = function(gd, opts) {
 
     newFullLayout._d3locale = getFormatter(formatObj, newFullLayout.separators);
     newFullLayout._extraFormat = getFormatObj(gd, extraFormatKeys);
-    newFullLayout._format = formatObj;
 
     newFullLayout._initialAutoSizeIsDone = true;
 

src/plots/plots.js

@@ -2241,18 +2241,6 @@ describe('Test lib.js:', function() {
             }
             expect(Lib.warn.calls.count()).toBe(10);
         });
-
-        describe('support different locale as argument', function() {
-            var locale = {
-                decimal: ',',
-                thousands: ' ',
-                currency: ['£', ''],
-                grouping: [3]
-            };
-            it('formats value using d3 mini-language', function() {
-                expect(Lib.hovertemplateString('a: %{a:$010,.2f}', {}, locale, {a: 1253})).toEqual('a: £001 253,00');
-            });
-        });
     });
 
     describe('relativeAttr()', function() {