@oliasoft-open-source/charts-library 2.10.0-beta-2 → 2.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oliasoft-open-source/charts-library",
-  "version": "2.10.0-beta-2",
+  "version": "2.10.0",
   "description": "React Chart Library (based on Chart.js and react-chart-js-2)",
   "main": "index.js",
   "scripts": {
@@ -83,7 +83,8 @@
     "react-dom": "^17.0"
   },
   "dependencies": {
-    "@oliasoft-open-source/react-ui-library": "^3.1",
+    "@oliasoft-open-source/react-ui-library": "^3.3",
+    "@oliasoft-open-source/units": "2.0.1",
     "chart.js": "^3.9.1",
     "chartjs-plugin-annotation": "^1.4.0",
     "chartjs-plugin-datalabels": "^2.1.0",

package/release-notes.md

@@ -1,4 +1,24 @@
-# Charts Library Release Notes 
+# Charts Library Release Notes
+
+## 2.10.0
+
+- Switch to standard `round()` function from units repo [OW-10972](https://oliasoft.atlassian.net/browse/OW-10972)
+
+## 2.9.4
+
+- Updated version of UI Library
+
+## 2.9.3
+
+- Add @oliasoft-open-source/units package and update pase method in BarChart ([OW-10670](https://oliasoft.atlassian.net/browse/OW-10670))
+
+## 2.9.2
+
+- Fix missing axis scale when in dataset is one point with negative values ([OW-10616](https://oliasoft.atlassian.net/browse/OW-10616))
+
+## 2.9.1
+
+- Fix decimal values in BarChart in tooltips for locales with comma decimal ([OW-10632](https://oliasoft.atlassian.net/browse/OW-10632))
 
 ## 2.9.0
 

package/src/components/bar-chart/get-bar-chart-tooltips.js

@@ -1,3 +1,4 @@
+import { toNum } from '@oliasoft-open-source/units';
 import {
   afterLabelCallback,
   getTooltipLabel,
@@ -46,7 +47,8 @@ const getBarChartToolTips = (options) => {
 
     const getTooltipItemValue = () => {
       const { formattedValue } = tooltipItem;
-      const labelNumber = Number(formattedValue);
+      const formattedValueWithDotSeparator = formattedValue.replace(',', '.');
+      const labelNumber = toNum(formattedValueWithDotSeparator);
 
       let labelNumberFormatted;
       if (Math.abs(labelNumber) < 1) {

package/src/helpers/chart-utils.js

@@ -1,3 +1,4 @@
+import { round } from '@oliasoft-open-source/units';
 import { defaults } from 'chart.js';
 import cx from 'classnames';
 import { chartMinorGridlinesPlugin } from '../components/line-chart/line-chart.minor-gridlines-plugin';
@@ -151,7 +152,7 @@ export const getLegend = (options, clickHandler, state = null) => {
 
 export const afterLabelCallback = (tooltipItem) => {
   const { error } = tooltipItem.dataset.data[tooltipItem?.dataIndex];
-  return error ? `Error: ${Math.round(error * 10000) / 10000}` : '';
+  return error ? `Error: ${round(error, 4)}` : '';
 };
 
 export const getTooltipLabel = (tooltipItem, showLabelsInTooltips) => {

package/src/helpers/numbers/numbers.js

@@ -1,25 +1,6 @@
+import { round } from '@oliasoft-open-source/units';
 import { DECIMAL_POINT_TOLERANCE } from '../chart-consts';
 
-/**
- * Rounds a number to N decimal places
- *
- * @param {number} v value
- * @param {number} n decimal count
- * @returns {number}
- */
-export const roundN = (v, n) => {
-  const factor = 10 ** n;
-  return Math.round(v * factor) / factor;
-};
-
-/**
- * Rounds a number to DECIMAL_POINT_TOLERANCE decimal places
- *
- * @param {number} v value
- * @returns {number}
- */
-export const round = (v) => roundN(v, DECIMAL_POINT_TOLERANCE);
-
 /**
  * Determines whether two numbers are close in value with a tolerance
  * (mitigates excess JavaScript floating point precision quirks)
@@ -37,7 +18,7 @@ export const isEqualWithTolerance = (a, b) => {
   if (typeof a == 'number' && typeof b === typeof a) {
     const tolerance = 10 ** -DECIMAL_POINT_TOLERANCE;
     const difference = Math.abs(b - a);
-    const roundedDifference = roundN(difference, DECIMAL_POINT_TOLERANCE);
+    const roundedDifference = round(difference, DECIMAL_POINT_TOLERANCE);
     return roundedDifference <= tolerance;
   }
   return false;

package/src/helpers/range/range.js

@@ -1,4 +1,6 @@
-import { isEqualWithTolerance, round } from '../numbers/numbers';
+import { round } from '@oliasoft-open-source/units';
+import { isEqualWithTolerance } from '../numbers/numbers';
+import { DECIMAL_POINT_TOLERANCE } from '../chart-consts';
 
 const whiteSpacePercentage = 0.05; // relative amount of white space on each "side" of the data points
 
@@ -54,9 +56,11 @@ export const getSuggestedAxisRange = ({
     const padding = point * whiteSpacePercentage;
     const minAxisValue = beginAtZero && !isNegative ? 0 : point - padding;
     const maxAxisValue = beginAtZero && isNegative ? 0 : point + padding;
+    const roundedMinAxisValue = round(maxAxisValue, DECIMAL_POINT_TOLERANCE);
+    const roundedMaxAxisValue = round(minAxisValue, DECIMAL_POINT_TOLERANCE);
     return {
-      min: round(minAxisValue),
-      max: round(maxAxisValue),
+      min: roundedMinAxisValue < 0 ? roundedMinAxisValue : roundedMaxAxisValue,
+      max: roundedMaxAxisValue < 0 ? roundedMaxAxisValue : roundedMinAxisValue,
     };
   }
 
@@ -89,7 +93,7 @@ export const getSuggestedAxisRange = ({
       : dataMax + padding;
 
   return {
-    min: round(minAxisValue),
-    max: round(maxAxisValue),
+    min: round(minAxisValue, DECIMAL_POINT_TOLERANCE),
+    max: round(maxAxisValue, DECIMAL_POINT_TOLERANCE),
   };
 };