@easyv/charts 1.3.10 → 1.3.11

package/lib/utils/index.js

@@ -26,8 +26,7 @@ var _server = require("react-dom/server");
 
 var _svgPoints = require("svg-points");
 
-var _excluded = ["backgroundSize"],
-    _excluded2 = ["vote", "value"];
+var _excluded = ["backgroundSize"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -821,43 +820,61 @@ exports.sortPie = sortPie;
 var getDataWithPercent = function getDataWithPercent() {
   var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var precision = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  var digits = Math.pow(10, precision);
-  var targetSeats = digits * 100;
-  var total = (0, _d3v.sum)(data, function (d) {
-    return d.value;
-  }) || 1;
-  var votesPerQuota = data.map(function (d, index) {
-    return _objectSpread(_objectSpread({}, d), {}, {
-      vote: Math.round(d.value / total * digits * 100),
-      index: index
+  var objData = [];
+
+  function getPercentWithPrecision(valueList, idx, precision) {
+    if (!valueList[idx]) {
+      return 0;
+    }
+
+    var sum = valueList.reduce(function (acc, val) {
+      return acc + val.data.y;
+    }, 0);
+
+    if (sum === 0) {
+      return 0;
+    }
+
+    var digits = Math.pow(10, precision);
+    var votesPerQuota = valueList.map(function (val) {
+      return val.data.y / sum * digits * 100;
     });
-  });
-  var currentSum = (0, _d3v.sum)(votesPerQuota, function (d) {
-    return d.vote;
-  });
-  var remainder = targetSeats - currentSum;
-  votesPerQuota.sort(function (_ref25, _ref26) {
-    var a = _ref25.value;
-    var b = _ref26.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 obj = _objectSpread(_objectSpread({}, data), {}, {
-      value: value,
-      percent: (0, _utils2.toFixed)((vote + (value && value != 0 ? remainder : 0)) / digits, precision)
+    var targetSeats = digits * 100;
+    var seats = votesPerQuota.map(function (votes) {
+      return Math.floor(votes);
+    });
+    var currentSum = seats.reduce(function (acc, val) {
+      return acc + val;
+    }, 0);
+    var remainder = votesPerQuota.map(function (votes, idx) {
+      return votes - seats[idx];
     });
 
-    if (value && value != 0) {
-      remainder = 0;
+    while (currentSum < targetSeats) {
+      var max = Number.NEGATIVE_INFINITY;
+      var maxId = null;
+
+      for (var i = 0, len = remainder.length; i < len; ++i) {
+        if (remainder[i] > max) {
+          max = remainder[i];
+          maxId = i;
+        }
+      }
+
+      ++seats[maxId];
+      remainder[maxId] = 0;
+      ++currentSum;
     }
 
-    return obj;
+    return seats[idx] / digits;
+  }
+
+  data.forEach(function (d, i) {
+    objData.push(_objectSpread(_objectSpread({}, d), {}, {
+      percent: getPercentWithPrecision(data, i, precision)
+    }));
   });
-  return tmp;
+  return objData;
 };
 
 exports.getDataWithPercent = getDataWithPercent;

package/package.json

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

package/src/utils/index.js

@@ -655,36 +655,53 @@ const sortPie = (data, order) => {
 // };
 
 const getDataWithPercent = (data = [], precision = 0) => {
-  const digits = Math.pow(10, precision);
-  const targetSeats = digits * 100;
-
-  const total = sum(data, (d) => d.value) || 1;
-
-  const votesPerQuota = data.map((d, index) => ({
-    ...d,
-    vote: Math.round((d.value / total) * digits * 100),
-    index,
-  }));
-  const currentSum = sum(votesPerQuota, (d) => d.vote);
-
-  let remainder = targetSeats - currentSum;
-  votesPerQuota.sort(({ value: a }, { value: b }) => (a % total) - (b % total));
-
-  const tmp = votesPerQuota.map(({ vote, value, ...data }, index) => {
-    let obj = {
-      ...data,
-      value,
-      percent: toFixed(
-        (vote + (value && value != 0 ? remainder : 0)) / digits,
-        precision
-      ),
-    };
-    if (value && value != 0) {
-      remainder = 0;
+  let objData = [];
+  function getPercentWithPrecision(valueList, idx, precision) {
+    if (!valueList[idx]) {
+      return 0;
+    }
+    const sum = valueList.reduce( function (acc, val) {
+      return acc + val.data.y;
+    }, 0);
+    if (sum === 0) {
+      return 0;
     }
-    return obj;
+    const digits = Math.pow(10, precision);
+    const votesPerQuota = valueList.map(function (val) {
+      return val.data.y / sum * digits * 100;
+    });
+    const targetSeats = digits * 100;
+    const seats = votesPerQuota.map(function (votes) {
+      return Math.floor(votes);
+    });
+    let currentSum = seats.reduce( function (acc, val) {
+      return acc + val;
+    }, 0);
+    const remainder = votesPerQuota.map(function (votes, idx) {
+      return votes - seats[idx];
+    });
+    while (currentSum < targetSeats) {
+      let max = Number.NEGATIVE_INFINITY;
+      let maxId = null;
+      for (let i = 0, len = remainder.length; i < len; ++i) {
+        if (remainder[i] > max) {
+          max = remainder[i];
+          maxId = i;
+        }
+      }
+      ++seats[maxId];
+      remainder[maxId] = 0;
+      ++currentSum;
+    }
+    return seats[idx] / digits;
+  }
+  data.forEach((d, i) => {
+    objData.push({
+      ...d,
+      percent: getPercentWithPrecision(data, i, precision)
+    })
   });
-  return tmp;
+  return objData
 };
 
 const excludeTypes = ['array', 'object', 'group', 'modal', 'colors'];