@easyv/charts 1.10.31 → 1.10.33

package/lib/components/PieChart.js

@@ -27,8 +27,8 @@ var _excluded = ["startAngle", "endAngle", "antiClockwise"],
   _excluded2 = ["padAngle", "innerRadius", "outerRadius", "cornerRadius", "startAngle", "endAngle"],
   _excluded3 = ["formatter"],
   _excluded4 = ["startAngle", "endAngle"];
-/**
- * 饼环图
+/**
+ * 饼环图
  */
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }

package/lib/components/Tooltip.js

@@ -66,21 +66,24 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
       x: translateTip.x + position + marginLeft
     });
     if (!isVertical && translate3d.x + tooltipSize.width > width) {
-      var newPositon = position + marginLeft - tooltipSize.width - translateTip.x;
-      translate3d.x = newPositon >= 0 ? newPositon : 0;
+      translate3d.x = position + marginLeft - tooltipSize.width - translateTip.x;
+      translate3d.x = translate3d.x >= 0 ? translate3d.x : 0;
+      translate3d.x = translate3d.x + tooltipSize.width > width ? width - tooltipSize.width : translate3d.x;
+      translate3d.x = translate3d.x >= 0 ? translate3d.x : 0;
     }
     if (isVertical && translate3d.y + tooltipSize.height > height) {
-      var _newPositon = position + marginTop - tooltipSize.height - translateTip.y;
-      translate3d.y = _newPositon <= 0 ? _newPositon : height - tooltipSize.height;
+      translate3d.y = position + marginTop - tooltipSize.height - translateTip.y;
+      translate3d.y = translate3d.y >= 0 ? translate3d.y : 0;
+      translate3d.y = translate3d.y + tooltipSize.height > height ? height - tooltipSize.height : translate3d.y;
+      translate3d.y = translate3d.y >= 0 ? translate3d.y : 0;
     }
     return (0, _utils.getTranslate3d)(translate3d);
-  }, [width, height, marginLeft, marginTop, position, tooltipSize, translateTip]);
+  }, [isVertical, width, height, marginLeft, marginTop, position, tooltipSize, translateTip]);
   (0, _react.useEffect)(function () {
     if (tooltipRef.current && (manual || auto)) {
-      var rect = tooltipRef.current.getBoundingClientRect();
       setTooltipSize({
-        width: rect.width,
-        height: rect.height
+        width: tooltipRef.current.offsetWidth,
+        height: tooltipRef.current.offsetHeight
       });
     }
   }, [manual, auto, formatter, data, series, x]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.10.31",
+  "version": "1.10.33",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -55,4 +55,4 @@
       "commit": true
     }
   }
-}
+}