@easyv/charts 1.3.1 → 1.3.4

package/lib/components/Chart.js

@@ -83,7 +83,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
         }
       });
     }
-  }, [onRelative, emitEvent, JSON.stringify(interaction)]);
+  }, [JSON.stringify(interaction)]);
   var onEmit = (0, _react.useCallback)(function () {
     var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'click';
     var data = arguments.length > 1 ? arguments[1] : undefined;

package/lib/components/Label.js

@@ -49,18 +49,17 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
   var _useContext = (0, _react.useContext)(_context.chartContext),
       width = _useContext.width,
-      height = _useContext.height;
-
-  var _getSeriesInfo = (0, _utils.getSeriesInfo)({
-    step: step,
-    bandLength: bandLength,
-    paddingInner: paddingInner,
-    paddingOuter: paddingOuter
-  }),
-      seriesStep = _getSeriesInfo.seriesStep,
-      seriesWidth = _getSeriesInfo.seriesWidth,
-      seriesStart = _getSeriesInfo.seriesStart;
+      height = _useContext.height; // const { seriesStep, seriesWidth, seriesStart } = getSeriesInfo({
+  //   step,
+  //   bandLength,
+  //   paddingInner,
+  //   paddingOuter,
+  // });
 
+
+  var seriesStep = (1 + paddingInner) * step,
+      seriesWidth = step,
+      seriesStart = paddingOuter * step;
   var isVertical = direction === 'vertical';
   var _position = label.position;
   return /*#__PURE__*/React.createElement("g", {

package/lib/utils/index.js

@@ -408,15 +408,15 @@ function band() {
   };
 
   scale.range = function (_) {
-    var _ref11;
+    var _ref11, _ref12;
 
-    return arguments.length ? ((_ref11 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref11[0], r1 = _ref11[1]), r0 = +r0, r1 = +r1, rescale()) : [r0, r1];
+    return arguments.length ? ((_ref11 = _, _ref12 = (0, _slicedToArray2["default"])(_ref11, 2), r0 = _ref12[0], r1 = _ref12[1], _ref11), r0 = +r0, r1 = +r1, rescale()) : [r0, r1];
   };
 
   scale.rangeRound = function (_) {
-    var _ref12;
+    var _ref13, _ref14;
 
-    return (_ref12 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref12[0], r1 = _ref12[1]), r0 = +r0, r1 = +r1, round = true, rescale();
+    return (_ref13 = _, _ref14 = (0, _slicedToArray2["default"])(_ref13, 2), r0 = _ref14[0], r1 = _ref14[1], _ref13), r0 = +r0, r1 = +r1, round = true, rescale();
   };
 
   scale.bandwidth = function () {
@@ -481,14 +481,14 @@ function initRange(domain, range) {
 
 var getStacks = function getStacks(series) {
   var tmp = [];
-  series.forEach(function (_ref13, name) {
-    var type = _ref13.type,
-        stack = _ref13.stack,
-        yOrZ = _ref13.yOrZ;
-    var current = tmp.find(function (_ref14) {
-      var _type = _ref14.type,
-          _stack = _ref14.stack,
-          _yOrZ = _ref14.yOrZ;
+  series.forEach(function (_ref15, name) {
+    var type = _ref15.type,
+        stack = _ref15.stack,
+        yOrZ = _ref15.yOrZ;
+    var current = tmp.find(function (_ref16) {
+      var _type = _ref16.type,
+          _stack = _ref16.stack,
+          _yOrZ = _ref16.yOrZ;
       return _type == type && stack && _stack == stack && yOrZ == _yOrZ;
     });
 
@@ -523,9 +523,9 @@ var getStacks = function getStacks(series) {
 
 exports.getStacks = getStacks;
 
-var dataYOrZ = function dataYOrZ(data, _ref15) {
-  var seriesY = _ref15.y,
-      seriesZ = _ref15.z;
+var dataYOrZ = function dataYOrZ(data, _ref17) {
+  var seriesY = _ref17.y,
+      seriesZ = _ref17.z;
   var tmp = {
     y: [],
     z: []
@@ -577,11 +577,11 @@ var resetStacks = function resetStacks(stacks) {
 exports.resetStacks = resetStacks;
 
 var getCurrentStack = function getCurrentStack(stack, stackMap) {
-  return stackMap.find(function (_ref16) {
-    var _stack = _ref16.stack,
-        _type = _ref16.type,
-        _yOrZ = _ref16.yOrZ,
-        _s = _ref16.s;
+  return stackMap.find(function (_ref18) {
+    var _stack = _ref18.stack,
+        _type = _ref18.type,
+        _yOrZ = _ref18.yOrZ,
+        _s = _ref18.s;
     return _type == stack.type && _stack == stack.stack && _yOrZ == stack.yOrZ && _s.includes(stack.name);
   });
 };
@@ -609,10 +609,10 @@ var getBandwidth = function getBandwidth(step, paddingOuter) {
 
 exports.getBandwidth = getBandwidth;
 
-var getBandSeriesStepAndWidth = function getBandSeriesStepAndWidth(_ref17) {
-  var width = _ref17.width,
-      paddingInner = _ref17.paddingInner,
-      bandLength = _ref17.bandLength;
+var getBandSeriesStepAndWidth = function getBandSeriesStepAndWidth(_ref19) {
+  var width = _ref19.width,
+      paddingInner = _ref19.paddingInner,
+      bandLength = _ref19.bandLength;
   var seriesStep = width / (bandLength == 0 ? 1 : bandLength);
   var seriesWidth = seriesStep * (1 - paddingInner);
   return {
@@ -623,14 +623,14 @@ var getBandSeriesStepAndWidth = function getBandSeriesStepAndWidth(_ref17) {
 
 exports.getBandSeriesStepAndWidth = getBandSeriesStepAndWidth;
 
-var getSeriesInfo = function getSeriesInfo(_ref18) {
-  var step = _ref18.step,
-      _ref18$bandLength = _ref18.bandLength,
-      bandLength = _ref18$bandLength === void 0 ? 1 : _ref18$bandLength,
-      _ref18$paddingInner = _ref18.paddingInner,
-      paddingInner = _ref18$paddingInner === void 0 ? 0 : _ref18$paddingInner,
-      _ref18$paddingOuter = _ref18.paddingOuter,
-      paddingOuter = _ref18$paddingOuter === void 0 ? 0 : _ref18$paddingOuter;
+var getSeriesInfo = function getSeriesInfo(_ref20) {
+  var step = _ref20.step,
+      _ref20$bandLength = _ref20.bandLength,
+      bandLength = _ref20$bandLength === void 0 ? 1 : _ref20$bandLength,
+      _ref20$paddingInner = _ref20.paddingInner,
+      paddingInner = _ref20$paddingInner === void 0 ? 0 : _ref20$paddingInner,
+      _ref20$paddingOuter = _ref20.paddingOuter,
+      paddingOuter = _ref20$paddingOuter === void 0 ? 0 : _ref20$paddingOuter;
   if (bandLength == 0) return {
     seriesWidth: step,
     seriesStep: step,
@@ -767,27 +767,27 @@ var sortPie = function sortPie(data, order) {
 
   switch (order) {
     case '':
-      _data.sort(function (_ref19, _ref20) {
-        var a = _ref19.index;
-        var b = _ref20.index;
+      _data.sort(function (_ref21, _ref22) {
+        var a = _ref21.index;
+        var b = _ref22.index;
         return (0, _d3v.ascending)(a, b);
       });
 
       break;
 
     case 'desc':
-      _data.sort(function (_ref21, _ref22) {
-        var a = _ref21.value;
-        var b = _ref22.value;
+      _data.sort(function (_ref23, _ref24) {
+        var a = _ref23.value;
+        var b = _ref24.value;
         return (0, _d3v.descending)(a, b);
       });
 
       break;
 
     case 'asc':
-      _data.sort(function (_ref23, _ref24) {
-        var a = _ref23.value;
-        var b = _ref24.value;
+      _data.sort(function (_ref25, _ref26) {
+        var a = _ref25.value;
+        var b = _ref26.value;
         return (0, _d3v.ascending)(a, b);
       });
 
@@ -836,15 +836,15 @@ var getDataWithPercent = function getDataWithPercent() {
     return d.vote;
   });
   var remainder = targetSeats - currentSum;
-  votesPerQuota.sort(function (_ref25, _ref26) {
-    var a = _ref25.value;
-    var b = _ref26.value;
+  votesPerQuota.sort(function (_ref27, _ref28) {
+    var a = _ref27.value;
+    var b = _ref28.value;
     return a % total - b % total;
   });
-  var tmp = votesPerQuota.map(function (_ref27, index) {
-    var vote = _ref27.vote,
-        value = _ref27.value,
-        data = (0, _objectWithoutProperties2["default"])(_ref27, _excluded2);
+  var tmp = votesPerQuota.map(function (_ref29, index) {
+    var vote = _ref29.vote,
+        value = _ref29.value,
+        data = (0, _objectWithoutProperties2["default"])(_ref29, _excluded2);
 
     var obj = _objectSpread(_objectSpread({}, data), {}, {
       value: value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.3.1",
+  "version": "1.3.4",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/components/Chart.js

@@ -65,7 +65,7 @@ const Chart = memo(
             });
         }
       },
-      [onRelative, emitEvent, JSON.stringify(interaction)]
+      [ JSON.stringify(interaction)]
     );
 
     const onEmit = useCallback(

package/src/components/Label.js

@@ -26,13 +26,16 @@ export default memo(
 
     if (!(data.length && (showIcon || showLabel))) return null;
     const { width, height } = useContext(chartContext);
-    const { seriesStep, seriesWidth, seriesStart } = getSeriesInfo({
-      step,
-      bandLength,
-      paddingInner,
-      paddingOuter,
-    });
 
+    // const { seriesStep, seriesWidth, seriesStart } = getSeriesInfo({
+    //   step,
+    //   bandLength,
+    //   paddingInner,
+    //   paddingOuter,
+    // });
+
+    const seriesStep = (1 + paddingInner) * step,
+      seriesWidth = step, seriesStart = paddingOuter * step;
     const isVertical = direction === 'vertical';
     const _position = label.position;
     return (