fix: Fixing issue with calculation

energiency · Sep 15, 2022 · 3fea7c1 · 3fea7c1
1 parent d887495
commit 3fea7c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/custom-defaults.js b/src/custom-defaults.js
@@ -149,7 +149,7 @@ export default {
 	 * @member {Number}
 	 * @default 50 (%)
 	 */
-  maxZoomOutPercentage: 50,
+  maxZoomOutPercentage: 60,
 
   /**
 	 * The count of numbers after the point separator for float values of percent property

diff --git a/src/plugin.js b/src/plugin.js
@@ -48,8 +48,8 @@ export default {
       }
 
       outlabelPlugin.update(el, elements, index);
-      const x = outlabelPlugin.labelRect.x + (!outlabelPlugin.labelRect.isLeft ? 0 : outlabelPlugin.labelRect.width);
-      const y = outlabelPlugin.labelRect.y + (outlabelPlugin.labelRect.isTop ? 0 : outlabelPlugin.labelRect.height);
+      const x = outlabelPlugin.labelRect.x - (!outlabelPlugin.labelRect.isLeft ? 0 : outlabelPlugin.labelRect.width);
+      const y = outlabelPlugin.labelRect.y - (outlabelPlugin.labelRect.isTop ? 0 : outlabelPlugin.labelRect.height);
       if (x < rect.x1) {
         rect.x1 = x;
       }
@@ -71,7 +71,8 @@ export default {
       rect.x2 - chart.chartArea.right,
       rect.y2 - chart.chartArea.bottom
     ];
-    const diff = Math.max(...maxDeltas.filter(x => x > 0), 0);
+    let diff = Math.max(...maxDeltas.filter(x => x > 0));
+    diff = Math.abs(diff) === Infinity ? 0 : diff;
     const percent = diff * 100 / ctrl.outerRadius;
     ctrl.outerRadius -= percent < max ? diff : max * 100 / ctrl.outerRadius;
     ctrl.innerRadius = ctrl.outerRadius / 2;