@visactor/vchart 1.12.16 → 1.12.18

package/build/index.js

@@ -18756,10 +18756,7 @@
         const {
           context: context
         } = drawContext;
-        context.highPerformanceSave();
-        const t1 = graphic.parent.globalTransMatrix,
-          t2 = graphic.stage.window.getViewBoxTransform().clone().multiply(t1.a, t1.b, t1.c, t1.d, t1.e, t1.f);
-        if (graphic.parent && context.setTransformFromMatrix(t2, !0), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds) {
+        if (context.highPerformanceSave(), context.transformFromMatrix(graphic.transMatrix, !0), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds) {
           tempDirtyBounds.copy(drawContribution.dirtyBounds), tempBackupDirtyBounds.copy(drawContribution.backupDirtyBounds);
           const m = graphic.globalTransMatrix.getInverse();
           drawContribution.dirtyBounds.copy(drawContribution.backupDirtyBounds).transformWithMatrix(m), drawContribution.backupDirtyBounds.copy(drawContribution.dirtyBounds);
@@ -33994,6 +33991,52 @@
       zIndex: 1
     };
 
+    function genNormalBounds(item) {
+      const bounds = item.AABBBounds;
+      return {
+        x1: bounds.x1,
+        x2: bounds.x2,
+        y1: bounds.y1,
+        y2: bounds.y2,
+        centerX: item.attribute.x,
+        centerY: item.attribute.y,
+        angle: item.attribute.angle
+      };
+    }
+    function genRotateBounds(items) {
+      items.forEach(item => {
+        if (item.rotatedBounds || !item.attribute.angle) return;
+        const bounds = genNormalBounds(item),
+          rotatedCenter = rotatePoint({
+            x: item.attribute.x,
+            y: item.attribute.y
+          }, bounds.angle, {
+            x: bounds.centerX,
+            y: bounds.centerY
+          }),
+          deltaX = rotatedCenter.x - bounds.centerX,
+          deltaY = rotatedCenter.y - bounds.centerY;
+        bounds.x1 += deltaX, bounds.x2 += deltaX, bounds.y1 += deltaY, bounds.y2 += deltaY, bounds.centerX += deltaX, bounds.centerY += deltaY, item.rotatedBounds = bounds;
+      });
+    }
+    function itemIntersect(item1, item2) {
+      var _a, _b;
+      return (null === (_a = item1.OBBBounds) || void 0 === _a ? void 0 : _a.empty()) || (null === (_b = item2.OBBBounds) || void 0 === _b ? void 0 : _b.empty()) ? isRectIntersect(item1.AABBBounds, item2.AABBBounds, !1) && (!item1.rotatedBounds || !item2.rotatedBounds || isRotateAABBIntersect(item1.rotatedBounds, item2.rotatedBounds, !0)) : item1.OBBBounds.intersects(item2.OBBBounds);
+    }
+    const DELTA_ANGLE = Math.sin(Math.PI / 10);
+    function isAngleVertical(angle) {
+      let delta = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DELTA_ANGLE;
+      const hasAngle = !isNil$1(angle) && 0 !== angle,
+        cos = hasAngle ? Math.cos(angle) : 1;
+      return hasAngle && Math.abs(cos) <= delta;
+    }
+    function isAngleHorizontal(angle) {
+      let delta = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DELTA_ANGLE;
+      const hasAngle = !isNil$1(angle) && 0 !== angle,
+        sin = hasAngle ? Math.sin(angle) : 0;
+      return !hasAngle || Math.abs(sin) <= delta;
+    }
+
     function getCircleLabelPosition(tickPosition, tickVector) {
       return {
         x: tickPosition.x + tickVector[0],
@@ -34064,9 +34107,11 @@
       }), closed && (path += "Z")), path;
     }
     function textIntersect(textA, textB, sep) {
-      let a = textA.OBBBounds,
-        b = textB.OBBBounds;
-      return a && b && !a.empty() && !b.empty() ? a.intersects(b) : (a = textA.AABBBounds, b = textB.AABBBounds, sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2));
+      var _a;
+      let a, b;
+      const angle = null === (_a = textA.attribute) || void 0 === _a ? void 0 : _a.angle,
+        isAABBIntersects = (textA, textB, sep) => (a = textA.AABBBounds, b = textB.AABBBounds, sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2));
+      return isAngleHorizontal(angle, Number.EPSILON) ? isAABBIntersects(textA, textB, sep) : (a = textA.OBBBounds, b = textB.OBBBounds, !a || !b || a.empty() || b.empty() ? isAABBIntersects(textA, textB, sep) : a.intersects(b));
     }
     function hasOverlap$1(items, pad) {
       for (let b, i = 1, n = items.length, a = items[0]; i < n; a = b, ++i) if (b = items[i], textIntersect(a, b, pad)) return !0;
@@ -34450,50 +34495,6 @@
       });
     }
 
-    function genNormalBounds(item) {
-      const bounds = item.AABBBounds;
-      return {
-        x1: bounds.x1,
-        x2: bounds.x2,
-        y1: bounds.y1,
-        y2: bounds.y2,
-        centerX: item.attribute.x,
-        centerY: item.attribute.y,
-        angle: item.attribute.angle
-      };
-    }
-    function genRotateBounds(items) {
-      items.forEach(item => {
-        if (item.rotatedBounds || !item.attribute.angle) return;
-        const bounds = genNormalBounds(item),
-          rotatedCenter = rotatePoint({
-            x: item.attribute.x,
-            y: item.attribute.y
-          }, bounds.angle, {
-            x: bounds.centerX,
-            y: bounds.centerY
-          }),
-          deltaX = rotatedCenter.x - bounds.centerX,
-          deltaY = rotatedCenter.y - bounds.centerY;
-        bounds.x1 += deltaX, bounds.x2 += deltaX, bounds.y1 += deltaY, bounds.y2 += deltaY, bounds.centerX += deltaX, bounds.centerY += deltaY, item.rotatedBounds = bounds;
-      });
-    }
-    function itemIntersect(item1, item2) {
-      var _a, _b;
-      return (null === (_a = item1.OBBBounds) || void 0 === _a ? void 0 : _a.empty()) || (null === (_b = item2.OBBBounds) || void 0 === _b ? void 0 : _b.empty()) ? isRectIntersect(item1.AABBBounds, item2.AABBBounds, !1) && (!item1.rotatedBounds || !item2.rotatedBounds || isRotateAABBIntersect(item1.rotatedBounds, item2.rotatedBounds, !0)) : item1.OBBBounds.intersects(item2.OBBBounds);
-    }
-    const DELTA_ANGLE = Math.sin(Math.PI / 10);
-    function isAngleVertical(angle) {
-      const hasAngle = !isNil$1(angle) && 0 !== angle,
-        cos = hasAngle ? Math.cos(angle) : 1;
-      return hasAngle && Math.abs(cos) <= DELTA_ANGLE;
-    }
-    function isAngleHorizontal(angle) {
-      const hasAngle = !isNil$1(angle) && 0 !== angle,
-        sin = hasAngle ? Math.sin(angle) : 0;
-      return !hasAngle || Math.abs(sin) <= DELTA_ANGLE;
-    }
-
     function autoRotate(items, rotateConfig) {
       if (isEmpty(items)) return;
       const {
@@ -61934,7 +61935,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.12.16";
+    const version = "1.12.18";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();