@widergy/energy-ui 3.10.0 → 3.10.1

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [3.10.1](https://github.com/widergy/energy-ui/compare/v3.10.0...v3.10.1) (2024-06-18)
+
+
+### Bug Fixes
+
+* adjust scale range ([4d7de48](https://github.com/widergy/energy-ui/commit/4d7de4815f634e0878a250a7a1597751ba9f7ca7))
+* constant ([6fb884e](https://github.com/widergy/energy-ui/commit/6fb884eca4f36a16de899d4136fc7b8fec55db92))
+* refactor ([5d526f5](https://github.com/widergy/energy-ui/commit/5d526f5c1d0e1c7ff52ccb952153c2120d6e6ee5))
+
 # [3.10.0](https://github.com/widergy/energy-ui/compare/v3.9.1...v3.10.0) (2024-06-07)
 
 

package/dist/components/UTBarChart/components/YAxis/index.js

@@ -50,9 +50,7 @@ const YAxis = _ref => {
     x: x,
     y: unitSubtitleYPosition
   }, unitSubtitle), axis.map(index => {
-    const newMaxValue = (0, _utils.yAxisMaxValueRounder)(maxValue, yAxisTicks);
     const value = Math.round((maxValue - index * maxValue / (yAxisTicks - 1)) * 100) / 100;
-    const labelValue = Math.round((newMaxValue - index * newMaxValue / (yAxisTicks - 1)) * 100) / 100;
     return /*#__PURE__*/_react.default.createElement(_AxisElement.default, {
       className: classes.yAxisLabel,
       setRef: (0, _utils.applyToIndex)(0, index, labelRef),
@@ -60,7 +58,7 @@ const YAxis = _ref => {
       graphYStart: graphYStart,
       x: x,
       value: value,
-      label: valueDecorator((0, _numeral.default)(labelValue).format(labelValue < 1 && labelValue > 0 ? '0,0.00' : '0,0')),
+      label: valueDecorator((0, _numeral.default)(value).format(value < 1 && value > 0 ? '0,0.00' : '0,0')),
       height: height
     });
   }));

package/dist/components/UTBarChart/components/YAxis/utils.js

@@ -3,12 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.yAxisMaxValueRounder = exports.applyToIndex = void 0;
+exports.applyToIndex = void 0;
 const applyToIndex = function (targetIndex, currentIndex, prop) {
   let defaultValue = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
   return currentIndex === targetIndex ? prop : defaultValue;
 };
-exports.applyToIndex = applyToIndex;
-const TICKS_MULTIPLIER_DISTANCE = 5;
-const yAxisMaxValueRounder = (maxValue, yAxisTicks) => maxValue < 25 ? maxValue : Math.ceil(maxValue / (yAxisTicks - 1) / TICKS_MULTIPLIER_DISTANCE) * TICKS_MULTIPLIER_DISTANCE * (yAxisTicks - 1);
-exports.yAxisMaxValueRounder = yAxisMaxValueRounder;
+exports.applyToIndex = applyToIndex;

package/dist/components/UTBarChart/constants.js

@@ -3,8 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_SCROLL_PADDING = exports.DEFAULT_MAX_VALUE = exports.DEFAULT_MARGIN_TOP = exports.DEFAULT_AXIS_PADDING = void 0;
+exports.TICKS_MULTIPLIER_DISTANCE = exports.LOWER_BOUND_DEFAULT = exports.LIMIT_MAX_VALUE_ROUNDER = exports.DEFAULT_SCROLL_PADDING = exports.DEFAULT_MAX_VALUE = exports.DEFAULT_MARGIN_TOP = exports.DEFAULT_AXIS_PADDING = void 0;
 const DEFAULT_AXIS_PADDING = exports.DEFAULT_AXIS_PADDING = 10;
 const DEFAULT_SCROLL_PADDING = exports.DEFAULT_SCROLL_PADDING = 20;
 const DEFAULT_MARGIN_TOP = exports.DEFAULT_MARGIN_TOP = 40;
-const DEFAULT_MAX_VALUE = exports.DEFAULT_MAX_VALUE = 100;
+const DEFAULT_MAX_VALUE = exports.DEFAULT_MAX_VALUE = 100;
+const TICKS_MULTIPLIER_DISTANCE = exports.TICKS_MULTIPLIER_DISTANCE = 5;
+const LOWER_BOUND_DEFAULT = exports.LOWER_BOUND_DEFAULT = 0;
+const LIMIT_MAX_VALUE_ROUNDER = exports.LIMIT_MAX_VALUE_ROUNDER = 25;

package/dist/components/UTBarChart/index.js

@@ -123,15 +123,16 @@ const UTBarChart = _ref => {
     GRAPH_Y_END,
     GRAPH_Y_START
   } = (0, _utils.getGraphAttributes)(containerWidth, containerHeight, marginLeft, marginRight, marginBottom, pagination ? 0 : minBarWidth, formattedData[0].length, barPadding, groups, spacingOptions);
-  const roundedMaxBarValue = Math.round(maxBarValue);
-  const roundedMaxLinearValue = Math.round(maxLinearValue);
-  const maxAbsoluteValue = Math.max(roundedMaxBarValue, roundedMaxLinearValue);
-  const yAxis = d3.scaleLinear().domain([0, singleYAxis ? maxAbsoluteValue : roundedMaxBarValue]).range([GRAPH_Y_START, GRAPH_Y_END]);
+  const [linearLowerBound, linearUpperBound] = (0, _utils.getBounds)(maxLinearValue, yAxisTicks);
+  const [barLowerBound, barUpperBound] = (0, _utils.getBounds)(maxBarValue, yAxisTicks);
+  const maxAbsoluteValue = Math.max(linearUpperBound, barUpperBound);
+  const barMaxValue = singleYAxis ? maxAbsoluteValue : barUpperBound;
+  const yAxis = d3.scaleLinear().domain([barLowerBound, barMaxValue]).range([GRAPH_Y_START, GRAPH_Y_END]);
   const xAxis = d3.scaleBand().domain(d3.range(formattedData[0].length)).range([GRAPH_X_START, GRAPH_X_END]).padding(barPadding);
   const groupWidth = xAxis.bandwidth();
   const xSubAxis = d3.scaleBand().domain(d3.range(groups)).range([0, groupWidth]).padding(barPadding);
   const barWidth = xSubAxis.bandwidth();
-  const linearYAxis = singleYAxis ? yAxis : d3.scaleLinear().domain([0, roundedMaxLinearValue]).range([GRAPH_Y_START, GRAPH_Y_END]);
+  const linearYAxis = singleYAxis ? yAxis : d3.scaleLinear().domain([linearLowerBound, linearUpperBound]).range([GRAPH_Y_START, GRAPH_Y_END]);
   (0, _react.useEffect)(() => {
     setCurrentPage(0);
   }, [barData]);
@@ -168,7 +169,7 @@ const UTBarChart = _ref => {
     graphXEnd: GRAPH_X_END,
     graphXStart: GRAPH_X_START,
     graphYStart: GRAPH_Y_START,
-    levels: (0, _utils.getGrid)(yAxisTicks, singleYAxis ? maxAbsoluteValue : roundedMaxBarValue),
+    levels: (0, _utils.getGrid)(yAxisTicks, barMaxValue),
     yAxis: yAxis
   }), formattedData.map((data, group) => /*#__PURE__*/_react.default.createElement(_Bars.default, {
     barBorderRadius: barBorderRadius,
@@ -181,7 +182,7 @@ const UTBarChart = _ref => {
     groups: groups,
     groupWidth: groupWidth,
     highlightWidth: highlightWidth,
-    maxBarValue: roundedMaxBarValue,
+    maxBarValue: barUpperBound,
     onBarClick: onBarClick,
     padding: barPadding,
     selectable: selectable,
@@ -222,7 +223,7 @@ const UTBarChart = _ref => {
     classes: classes,
     graphYEnd: GRAPH_Y_END,
     graphYStart: GRAPH_Y_START,
-    maxValue: singleYAxis ? maxAbsoluteValue : roundedMaxBarValue,
+    maxValue: barMaxValue,
     setRef: marginLeftRef,
     textAnchor: "end",
     unit: barUnit,
@@ -236,7 +237,7 @@ const UTBarChart = _ref => {
     classes: classes,
     graphYEnd: GRAPH_Y_END,
     graphYStart: GRAPH_Y_START,
-    maxValue: roundedMaxLinearValue,
+    maxValue: linearUpperBound,
     setRef: marginRightRef,
     textAnchor: "start",
     unit: linearUnit,

package/dist/components/UTBarChart/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getPages = exports.getMinValue = exports.getMaxValues = exports.getMaxValue = exports.getGrid = exports.getGraphAttributes = exports.getFormattedLinearData = exports.getFormattedDecorators = exports.getFormattedData = exports.flattenData = exports.flattenAndReduceBarData = void 0;
+exports.getPages = exports.getMinValue = exports.getMaxValues = exports.getMaxValue = exports.getGrid = exports.getGraphAttributes = exports.getFormattedLinearData = exports.getFormattedDecorators = exports.getFormattedData = exports.getBounds = exports.flattenData = exports.flattenAndReduceBarData = void 0;
 var _array = require("@widergy/web-utils/lib/array");
 var d3 = _interopRequireWildcard(require("d3"));
 var _constants = require("./constants");
@@ -161,4 +161,7 @@ const getGrid = (ticks, maxValue) => new Array(ticks).fill(0).map((_, index) =>
   } = _ref11;
   return !!value;
 });
-exports.getGrid = getGrid;
+exports.getGrid = getGrid;
+const yAxisMaxValueRounder = (maxValue, yAxisTicks) => maxValue < _constants.LIMIT_MAX_VALUE_ROUNDER ? maxValue : Math.ceil(maxValue / (yAxisTicks - 1) / _constants.TICKS_MULTIPLIER_DISTANCE) * _constants.TICKS_MULTIPLIER_DISTANCE * (yAxisTicks - 1);
+const getBounds = (maxValue, yAxisTicks) => [_constants.LOWER_BOUND_DEFAULT, yAxisMaxValueRounder(maxValue, yAxisTicks)];
+exports.getBounds = getBounds;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widergy/energy-ui",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "description": "Widergy Web Components",
   "author": "widergy",
   "license": "MIT",