@easyv/charts 1.10.32 → 1.10.34

package/src/components/Tooltip.js

@@ -44,74 +44,6 @@ export default memo(
     auto,
     manual,
   }) => {
-    const getBigScreenScale = () => {
-      // 优先使用全局提供的方法
-      if (typeof window.getScreenScale === "function") {
-        try {
-          const result = window.getScreenScale();
-          if (Array.isArray(result) && result.length >= 6) {
-            return result;
-          }
-        } catch (e) {
-          console.error("调用全局 getScreenScale 出错:", e);
-        }
-      }
-
-      // 获取容器元素
-      const bigscreenDom = document.getElementById("bigscreen-container");
-
-      // 元素不存在时的处理
-      if (!bigscreenDom) {
-        return [1, 1, window.innerWidth, window.innerHeight, 0, 0];
-      }
-
-      // 确保元素可见（未被隐藏）
-      const isVisible =
-        window.getComputedStyle(bigscreenDom).display !== "none" &&
-        window.getComputedStyle(bigscreenDom).visibility !== "hidden";
-      if (!isVisible) {
-        return [1, 1, window.innerWidth, window.innerHeight, 0, 0];
-      }
-
-      // 获取元素的布局矩形（最可靠的尺寸获取方式）
-      const rect = bigscreenDom.getBoundingClientRect();
-
-      // 提取基础尺寸（从布局矩形获取，不受样式影响）
-      const screenWidth = rect.width || window.innerWidth;
-      const screenHeight = rect.height || window.innerHeight;
-      const screenLeft = rect.left || 0;
-      const screenTop = rect.top || 0;
-
-      // 处理缩放
-      let scaleX = 1;
-      let scaleY = 1;
-
-      try {
-        const computedStyle = window.getComputedStyle(bigscreenDom);
-        const transform = computedStyle.transform;
-
-        if (transform && transform !== "none") {
-          // 解析 transform matrix
-          const matrix = new DOMMatrix(transform);
-          scaleX = matrix.a; // 缩放X因子
-          scaleY = matrix.d; // 缩放Y因子
-        }
-      } catch (e) {
-        console.error("解析缩放样式出错:", e);
-      }
-
-      // 最终返回值（确保不会有undefined）
-      const result = [
-        isNaN(scaleX) ? 1 : scaleX,
-        isNaN(scaleY) ? 1 : scaleY,
-        isNaN(screenWidth) ? window.innerWidth : screenWidth,
-        isNaN(screenHeight) ? window.innerHeight : screenHeight,
-        isNaN(screenLeft) ? 0 : screenLeft,
-        isNaN(screenTop) ? 0 : screenTop,
-      ];
-      return result;
-    };
-    const [scaleX, scaleY] = getBigScreenScale();
     const tooltipRef = useRef(null);
     const [tooltipSize, setTooltipSize] = useState({
       width: 0,
@@ -121,46 +53,35 @@ export default memo(
       const translate3d = isVertical
         ? {
             ...translateTip,
-            y: translateTip.y / scaleY + position + marginTop / scaleY,
+            y: translateTip.y + position + marginTop,
           }
         : {
             ...translateTip,
-            x: translateTip.x / scaleX + position + marginLeft / scaleX,
+            x: translateTip.x + position + marginLeft,
           };
-
-      if (
-        !isVertical &&
-        translate3d.x + tooltipSize.width / scaleX > width / scaleX
-      ) {
-        const newPositon =
-          position +
-          marginLeft / scaleX -
-          tooltipSize.width / scaleX -
-          translateTip.x / scaleX;
-        translate3d.x = newPositon >= 0 ? newPositon : 0;
-        console.log("translate3d", translate3d);
-        console.log("scale", scaleX, scaleY);
-        console.log("width", width, height);
-        console.log("position", position, marginLeft, marginTop);
-        console.log("tooltipSize", tooltipSize);
-        console.log("translateTip", translateTip);
+      if (!isVertical && translate3d.x + tooltipSize.width > width) {
+        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 / scaleY > height / scaleY
-      ) {
-        const newPositon =
-          position +
-          marginTop / scaleY -
-          tooltipSize.height / scaleY -
-          translateTip.y / scaleY;
+      if (isVertical && translate3d.y + tooltipSize.height > height) {
+        translate3d.y =
+          position + marginTop - tooltipSize.height - translateTip.y;
+        translate3d.y = translate3d.y >= 0 ? translate3d.y : 0;
         translate3d.y =
-          newPositon <= 0
-            ? newPositon
-            : height / scaleY - tooltipSize.height / scaleY;
+          translate3d.y + tooltipSize.height > height
+            ? height - tooltipSize.height
+            : translate3d.y;
+        translate3d.y = translate3d.y >= 0 ? translate3d.y : 0;
       }
       return getTranslate3d(translate3d);
     }, [
+      isVertical,
       width,
       height,
       marginLeft,
@@ -171,10 +92,9 @@ export default memo(
     ]);
     useEffect(() => {
       if (tooltipRef.current && (manual || auto)) {
-        const 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]);