Expose `formatNumber` as a helper (#8683)

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 427316c32b6ebed80c8ba979eac46528ae546142..713b035d434a622d7a53590d530df9587d38f538 100644 (file)
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -1,6 +1,6 @@
 import DatasetController from '../core/core.datasetController';
-import {formatNumber} from '../core/core.intl';
 import {isArray, toPercentage, toDimension, valueOrDefault} from '../helpers/helpers.core';
+import {formatNumber} from '../helpers/helpers.intl';
 import {toRadians, PI, TAU, HALF_PI, _angleBetween} from '../helpers/helpers.math';
 
 /**

diff --git a/src/core/core.ticks.js b/src/core/core.ticks.js
index 8e4086574c697487a2ae033a8c33b99772aafc30..59ad7a835d00b5c98a475b2b0ac954963b1f8413 100644 (file)
--- a/src/core/core.ticks.js
+++ b/src/core/core.ticks.js
@@ -1,6 +1,6 @@
 import {isArray} from '../helpers/helpers.core';
+import {formatNumber} from '../helpers/helpers.intl';
 import {log10} from '../helpers/helpers.math';
-import {formatNumber} from './core.intl';
 
 /**
  * Namespace to hold formatters for different types of ticks

diff --git a/src/core/core.intl.js b/src/helpers/helpers.intl.js
similarity index 88%
rename from src/core/core.intl.js
rename to src/helpers/helpers.intl.js
index 176e346be9443cf26149d7c33d6f97dd7673e432..83374f971afc396f6f84e1bff138b9356f917166 100644 (file)
--- a/src/core/core.intl.js
+++ b/src/helpers/helpers.intl.js
@@ -1,7 +1,7 @@
 
 const intlCache = new Map();
 
-export function getNumberFormat(locale, options) {
+function getNumberFormat(locale, options) {
   options = options || {};
   const cacheKey = locale + JSON.stringify(options);
   let formatter = intlCache.get(cacheKey);

diff --git a/src/helpers/index.js b/src/helpers/index.js
index 9861601c4da7ef3c55e07ffac41e640b8fe5022c..ea8120ee08a82f48cbf2b497e55bd3b9fc47464a 100644 (file)
--- a/src/helpers/index.js
+++ b/src/helpers/index.js
@@ -6,6 +6,7 @@ export * from './helpers.curve';
 export * from './helpers.dom';
 export {default as easingEffects} from './helpers.easing';
 export * from './helpers.interpolation';
+export * from './helpers.intl';
 export * from './helpers.options';
 export * from './helpers.math';
 export * from './helpers.rtl';

diff --git a/src/scales/scale.linearbase.js b/src/scales/scale.linearbase.js
index be5b0508cefa0b42f579e2b2747fb315423296ab..e8a122199af4a187e96f1047cf619931d40a24dc 100644 (file)
--- a/src/scales/scale.linearbase.js
+++ b/src/scales/scale.linearbase.js
@@ -1,7 +1,7 @@
 import {isNullOrUndef} from '../helpers/helpers.core';
 import {almostEquals, almostWhole, niceNum, _decimalPlaces, _setMinAndMaxByKey, sign} from '../helpers/helpers.math';
 import Scale from '../core/core.scale';
-import {formatNumber} from '../core/core.intl';
+import {formatNumber} from '../helpers/helpers.intl';
 import {_addGrace} from '../helpers/helpers.options';
 
 /**

diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js
index f88b02c2d554777e121875dc2ce29b6e0de8b7ec..66751af7aeea6b3a8de516f94f2f8c248786df23 100644 (file)
--- a/src/scales/scale.logarithmic.js
+++ b/src/scales/scale.logarithmic.js
@@ -1,9 +1,9 @@
 import {finiteOrDefault, isFinite} from '../helpers/helpers.core';
+import {formatNumber} from '../helpers/helpers.intl';
 import {_setMinAndMaxByKey, log10} from '../helpers/helpers.math';
 import Scale from '../core/core.scale';
 import LinearScaleBase from './scale.linearbase';
 import Ticks from '../core/core.ticks';
-import {formatNumber} from '../core/core.intl';
 
 function isMajor(tickVal) {
   const remain = tickVal / (Math.pow(10, Math.floor(log10(tickVal))));

diff --git a/types/helpers/helpers.intl.d.ts b/types/helpers/helpers.intl.d.ts
new file mode 100644 (file)
index 0000000..3a896f4
--- /dev/null
+++ b/types/helpers/helpers.intl.d.ts
@@ -0,0 +1,7 @@
+/**
+ * Format a number using a localized number formatter.
+ * @param num The number to format
+ * @param locale The locale to pass to the Intl.NumberFormat constructor
+ * @param options Number format options
+ */
+export function formatNumber(num: number, locale: string, options: Intl.NumberFormatOptions): string;

diff --git a/types/helpers/index.d.ts b/types/helpers/index.d.ts
index a37e063e3a67ece8aaf0aafa64ef5416eaf06284..013326924a7abc3a8e1109499fc8d66dfbd98713 100644 (file)
--- a/types/helpers/index.d.ts
+++ b/types/helpers/index.d.ts
@@ -7,6 +7,7 @@ export * from './helpers.dom';
 export * from './helpers.easing';
 export * from './helpers.extras';
 export * from './helpers.interpolation';
+export * from './helpers.intl';
 export * from './helpers.math';
 export * from './helpers.options';
 export * from './helpers.canvas';