@visactor/vchart 1.13.8-alpha.0 → 1.13.8-alpha.2

package/build/index.es.js

@@ -12304,12 +12304,14 @@ class EventSystem {
     }), this.eventsAdded = !0;
   }
   removeEvents() {
+    var _a;
     if (!this.eventsAdded || !this.domElement) return;
     const {
-      globalObj: globalObj,
-      domElement: domElement
-    } = this;
-    this.supportsPointerEvents ? (globalObj.getDocument() ? (globalObj.getDocument().removeEventListener("pointermove", this.onPointerMove, !0), globalObj.getDocument().removeEventListener("pointerup", this.onPointerUp, !0)) : (domElement.removeEventListener("pointermove", this.onPointerMove, !0), domElement.removeEventListener("pointerup", this.onPointerUp, !0)), domElement.removeEventListener("pointerdown", this.onPointerDown, !0), domElement.removeEventListener("pointerleave", this.onPointerOverOut, !0), domElement.removeEventListener("pointerover", this.onPointerOverOut, !0)) : (globalObj.getDocument() ? (globalObj.getDocument().removeEventListener("mousemove", this.onPointerMove, !0), globalObj.getDocument().removeEventListener("mouseup", this.onPointerUp, !0)) : (domElement.removeEventListener("mousemove", this.onPointerMove, !0), domElement.removeEventListener("mouseup", this.onPointerUp, !0)), domElement.removeEventListener("mousedown", this.onPointerDown, !0), domElement.removeEventListener("mouseout", this.onPointerOverOut, !0), domElement.removeEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.removeEventListener("touchstart", this.onPointerDown, !0), domElement.removeEventListener("touchend", this.onPointerUp, !0), domElement.removeEventListener("touchmove", this.onPointerMove, !0)), domElement.removeEventListener("wheel", this.onWheel, !0), this.domElement = null, this.eventsAdded = !1;
+        globalObj: globalObj,
+        domElement: domElement
+      } = this,
+      globalDocument = null !== (_a = globalObj.getDocument()) && void 0 !== _a ? _a : domElement;
+    this.supportsPointerEvents ? (globalDocument.removeEventListener("pointermove", this.onPointerMove, !0), globalDocument.removeEventListener("pointerup", this.onPointerUp, !0), domElement.removeEventListener("pointerdown", this.onPointerDown, !0), domElement.removeEventListener("pointerleave", this.onPointerOverOut, !0), domElement.removeEventListener("pointerover", this.onPointerOverOut, !0)) : (globalDocument.removeEventListener("mousemove", this.onPointerMove, !0), globalDocument.removeEventListener("mouseup", this.onPointerUp, !0), domElement.removeEventListener("mousedown", this.onPointerDown, !0), domElement.removeEventListener("mouseout", this.onPointerOverOut, !0), domElement.removeEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.removeEventListener("touchstart", this.onPointerDown, !0), domElement.removeEventListener("touchend", this.onPointerUp, !0), domElement.removeEventListener("touchmove", this.onPointerMove, !0)), domElement.removeEventListener("wheel", this.onWheel, !0), this.domElement = null, this.eventsAdded = !1;
   }
   mapToViewportPoint(event) {
     return this.domElement.pointTransform ? this.domElement.pointTransform(event.x, event.y) : event;
@@ -26474,13 +26476,13 @@ class Gesture extends EventEmitter {
     const {
       element: element
     } = this;
-    element && (element.addEventListener("pointerdown", this.onStart), element.addEventListener("pointermove", this.onMove), element.addEventListener("pointerup", this.onEnd), element.addEventListener("pointerupoutside", this.onEnd));
+    element && (element.addEventListener("pointerdown", this.onStart), element.addEventListener("pointermove", this.onMove), element.addEventListener("pointerup", this.onEnd), element.addEventListener("pointerleave", this.onEnd), element.addEventListener("pointerupoutside", this.onEnd));
   }
   removeEvents() {
     const {
       element: element
     } = this;
-    element && (element.removeEventListener("pointerdown", this.onStart), element.removeEventListener("pointermove", this.onMove), element.removeEventListener("pointerup", this.onEnd), element.removeEventListener("pointerupoutside", this.onEnd));
+    element && (element.removeEventListener("pointerdown", this.onStart), element.removeEventListener("pointermove", this.onMove), element.removeEventListener("pointerup", this.onEnd), element.removeEventListener("pointerleave", this.onEnd), element.removeEventListener("pointerupoutside", this.onEnd));
   }
   release() {
     this.removeEvents(), this.element = null;
@@ -36569,13 +36571,18 @@ function getAnimationAttributes(textAttribute, type) {
   };
 }
 function updateAnimation(prev, next, animationConfig) {
+  const changeAttributes = (prev, next) => {
+    const changed = {};
+    for (const key in next.attribute) prev.attribute[key] !== next.attribute[key] && (changed[key] = next.attribute[key]);
+    return changed;
+  };
   if (!isArray$1(animationConfig)) {
     const {
       duration: duration,
       easing: easing,
       increaseEffect = !0
     } = animationConfig;
-    return prev.animate().to(next.attribute, duration, easing), void (increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing));
+    return prev.animate().to(changeAttributes(prev, next), duration, easing), void (increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing));
   }
   animationConfig.forEach(cfg => {
     const {
@@ -36587,7 +36594,7 @@ function updateAnimation(prev, next, animationConfig) {
       {
         to: to
       } = update$1(prev, next, channel, cfg.options);
-    isEmpty(to) || prev.animate().to(to, duration, easing), increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing);
+    isEmpty(to) || prev.animate().to(changeAttributes(prev, next), duration, easing), increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing);
   });
 }
 const update$1 = (prev, next, channel, options) => {
@@ -37203,7 +37210,7 @@ class LabelBase extends AbstractComponent {
     return priority && (labels = labels.sort((a, b) => priority(b.attribute.data) - priority(a.attribute.data))), "shiftY" === (null == strategy ? void 0 : strategy.type) ? this._overlapGlobal(labels, option, bmpTool, bitmap) : this._overlapByStrategy(labels, option, bmpTool, bitmap);
   }
   _overlapGlobal(labels, option, bmpTool, bitmap) {
-    let result = labels.filter(label => label.attribute.visible && 0 !== label.attribute.opacity);
+    let result = labels.filter(label => label.attribute.visible && 0 !== label.attribute.opacity && this.isMarkInsideRect(this.getRelatedGraphic(label.attribute), bmpTool));
     const {
       clampForce = !0,
       hideOnHit = !0,
@@ -37287,12 +37294,7 @@ class LabelBase extends AbstractComponent {
       if (!1 === labels[i].attribute.visible) continue;
       const text = labels[i],
         baseMark = this.getRelatedGraphic(text.attribute);
-      if (text.update(), !isRectIntersect(baseMark.AABBBounds, {
-        x1: 0,
-        x2: bmpTool.width,
-        y1: 0,
-        y2: bmpTool.height
-      }, !0)) continue;
+      if (text.update(), !this.isMarkInsideRect(baseMark, bmpTool)) continue;
       if (canPlace(bmpTool, bitmap, text.AABBBounds, clampForce, overlapPadding)) {
         if (!checkBounds) {
           bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
@@ -37321,6 +37323,41 @@ class LabelBase extends AbstractComponent {
     }
     return result;
   }
+  isMarkInsideRect(baseMark, bmpTool) {
+    const {
+        left: left,
+        right: right,
+        top: top,
+        bottom: bottom
+      } = bmpTool.padding,
+      rect = {
+        x1: -left,
+        x2: bmpTool.width + right,
+        y1: -top,
+        y2: bmpTool.height + bottom
+      },
+      bounds = baseMark.AABBBounds;
+    if (0 !== bounds.width() && 0 !== bounds.height()) return isRectIntersect(baseMark.AABBBounds, rect, !0);
+    const {
+      attribute: attribute
+    } = baseMark;
+    if ("rect" === baseMark.type) {
+      const {
+        x: x,
+        x1: x1,
+        y: y,
+        y1: y1
+      } = attribute;
+      return pointInRect({
+        x: null != x ? x : x1,
+        y: null != y ? y : y1
+      }, rect, !0);
+    }
+    return "x" in attribute && "y" in attribute && pointInRect({
+      x: attribute.x,
+      y: attribute.y
+    }, rect, !0);
+  }
   getBaseMarkGroup() {
     const {
       baseMarkGroupName: baseMarkGroupName
@@ -63613,7 +63650,7 @@ const registerVChartCore = () => {
 };
 registerVChartCore();
 
-const version = "1.13.8-alpha.0";
+const version = "1.13.8-alpha.2";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -73775,7 +73812,7 @@ function getDefaultTriggerEventByMode(mode) {
         return {
             start: 'pointerdown',
             move: 'pointermove',
-            end: ['pointerup', 'pointerupoutside'],
+            end: ['pointerup', 'pointerupoutside', 'pointerleave'],
             zoom: 'pinch',
             zoomEnd: 'pinchend',
             scroll: 'pan',
@@ -73826,6 +73863,8 @@ class Zoomable {
         }, this._getRegionOrSeriesLayout(regionOrSeries), false)) {
             return;
         }
+        this._clearDragEvent();
+        this._zoomableTrigger.clearScroll();
         let extendParams = {};
         if (callback) {
             extendParams = callback({ zoomDelta, zoomX, zoomY }, event);
@@ -73907,6 +73946,8 @@ class Zoomable {
         }, this._getRegionOrSeriesLayout(regionOrSeries), false)) {
             return stopBubble;
         }
+        this._clearDragEvent();
+        this._zoomableTrigger.clearZoom();
         if (callback) {
             stopBubble = callback({ scrollX, scrollY }, event);
         }
@@ -74036,6 +74077,8 @@ class Zoomable {
         if (!this._zoomableTrigger.parserDragEvent(params.event)) {
             return;
         }
+        this._zoomableTrigger.clearZoom();
+        this._zoomableTrigger.clearScroll();
         const delayType = (_a = option === null || option === void 0 ? void 0 : option.delayType) !== null && _a !== void 0 ? _a : 'throttle';
         const delayTime = (_b = option === null || option === void 0 ? void 0 : option.delayTime) !== null && _b !== void 0 ? _b : 0;
         const realTime = (_c = option === null || option === void 0 ? void 0 : option.realTime) !== null && _c !== void 0 ? _c : true;

package/build/index.js

@@ -12310,12 +12310,14 @@
         }), this.eventsAdded = !0;
       }
       removeEvents() {
+        var _a;
         if (!this.eventsAdded || !this.domElement) return;
         const {
-          globalObj: globalObj,
-          domElement: domElement
-        } = this;
-        this.supportsPointerEvents ? (globalObj.getDocument() ? (globalObj.getDocument().removeEventListener("pointermove", this.onPointerMove, !0), globalObj.getDocument().removeEventListener("pointerup", this.onPointerUp, !0)) : (domElement.removeEventListener("pointermove", this.onPointerMove, !0), domElement.removeEventListener("pointerup", this.onPointerUp, !0)), domElement.removeEventListener("pointerdown", this.onPointerDown, !0), domElement.removeEventListener("pointerleave", this.onPointerOverOut, !0), domElement.removeEventListener("pointerover", this.onPointerOverOut, !0)) : (globalObj.getDocument() ? (globalObj.getDocument().removeEventListener("mousemove", this.onPointerMove, !0), globalObj.getDocument().removeEventListener("mouseup", this.onPointerUp, !0)) : (domElement.removeEventListener("mousemove", this.onPointerMove, !0), domElement.removeEventListener("mouseup", this.onPointerUp, !0)), domElement.removeEventListener("mousedown", this.onPointerDown, !0), domElement.removeEventListener("mouseout", this.onPointerOverOut, !0), domElement.removeEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.removeEventListener("touchstart", this.onPointerDown, !0), domElement.removeEventListener("touchend", this.onPointerUp, !0), domElement.removeEventListener("touchmove", this.onPointerMove, !0)), domElement.removeEventListener("wheel", this.onWheel, !0), this.domElement = null, this.eventsAdded = !1;
+            globalObj: globalObj,
+            domElement: domElement
+          } = this,
+          globalDocument = null !== (_a = globalObj.getDocument()) && void 0 !== _a ? _a : domElement;
+        this.supportsPointerEvents ? (globalDocument.removeEventListener("pointermove", this.onPointerMove, !0), globalDocument.removeEventListener("pointerup", this.onPointerUp, !0), domElement.removeEventListener("pointerdown", this.onPointerDown, !0), domElement.removeEventListener("pointerleave", this.onPointerOverOut, !0), domElement.removeEventListener("pointerover", this.onPointerOverOut, !0)) : (globalDocument.removeEventListener("mousemove", this.onPointerMove, !0), globalDocument.removeEventListener("mouseup", this.onPointerUp, !0), domElement.removeEventListener("mousedown", this.onPointerDown, !0), domElement.removeEventListener("mouseout", this.onPointerOverOut, !0), domElement.removeEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.removeEventListener("touchstart", this.onPointerDown, !0), domElement.removeEventListener("touchend", this.onPointerUp, !0), domElement.removeEventListener("touchmove", this.onPointerMove, !0)), domElement.removeEventListener("wheel", this.onWheel, !0), this.domElement = null, this.eventsAdded = !1;
       }
       mapToViewportPoint(event) {
         return this.domElement.pointTransform ? this.domElement.pointTransform(event.x, event.y) : event;
@@ -26480,13 +26482,13 @@
         const {
           element: element
         } = this;
-        element && (element.addEventListener("pointerdown", this.onStart), element.addEventListener("pointermove", this.onMove), element.addEventListener("pointerup", this.onEnd), element.addEventListener("pointerupoutside", this.onEnd));
+        element && (element.addEventListener("pointerdown", this.onStart), element.addEventListener("pointermove", this.onMove), element.addEventListener("pointerup", this.onEnd), element.addEventListener("pointerleave", this.onEnd), element.addEventListener("pointerupoutside", this.onEnd));
       }
       removeEvents() {
         const {
           element: element
         } = this;
-        element && (element.removeEventListener("pointerdown", this.onStart), element.removeEventListener("pointermove", this.onMove), element.removeEventListener("pointerup", this.onEnd), element.removeEventListener("pointerupoutside", this.onEnd));
+        element && (element.removeEventListener("pointerdown", this.onStart), element.removeEventListener("pointermove", this.onMove), element.removeEventListener("pointerup", this.onEnd), element.removeEventListener("pointerleave", this.onEnd), element.removeEventListener("pointerupoutside", this.onEnd));
       }
       release() {
         this.removeEvents(), this.element = null;
@@ -36575,13 +36577,18 @@
       };
     }
     function updateAnimation(prev, next, animationConfig) {
+      const changeAttributes = (prev, next) => {
+        const changed = {};
+        for (const key in next.attribute) prev.attribute[key] !== next.attribute[key] && (changed[key] = next.attribute[key]);
+        return changed;
+      };
       if (!isArray$1(animationConfig)) {
         const {
           duration: duration,
           easing: easing,
           increaseEffect = !0
         } = animationConfig;
-        return prev.animate().to(next.attribute, duration, easing), void (increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing));
+        return prev.animate().to(changeAttributes(prev, next), duration, easing), void (increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing));
       }
       animationConfig.forEach(cfg => {
         const {
@@ -36593,7 +36600,7 @@
           {
             to: to
           } = update$1(prev, next, channel, cfg.options);
-        isEmpty(to) || prev.animate().to(to, duration, easing), increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing);
+        isEmpty(to) || prev.animate().to(changeAttributes(prev, next), duration, easing), increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing);
       });
     }
     const update$1 = (prev, next, channel, options) => {
@@ -37209,7 +37216,7 @@
         return priority && (labels = labels.sort((a, b) => priority(b.attribute.data) - priority(a.attribute.data))), "shiftY" === (null == strategy ? void 0 : strategy.type) ? this._overlapGlobal(labels, option, bmpTool, bitmap) : this._overlapByStrategy(labels, option, bmpTool, bitmap);
       }
       _overlapGlobal(labels, option, bmpTool, bitmap) {
-        let result = labels.filter(label => label.attribute.visible && 0 !== label.attribute.opacity);
+        let result = labels.filter(label => label.attribute.visible && 0 !== label.attribute.opacity && this.isMarkInsideRect(this.getRelatedGraphic(label.attribute), bmpTool));
         const {
           clampForce = !0,
           hideOnHit = !0,
@@ -37293,12 +37300,7 @@
           if (!1 === labels[i].attribute.visible) continue;
           const text = labels[i],
             baseMark = this.getRelatedGraphic(text.attribute);
-          if (text.update(), !isRectIntersect(baseMark.AABBBounds, {
-            x1: 0,
-            x2: bmpTool.width,
-            y1: 0,
-            y2: bmpTool.height
-          }, !0)) continue;
+          if (text.update(), !this.isMarkInsideRect(baseMark, bmpTool)) continue;
           if (canPlace(bmpTool, bitmap, text.AABBBounds, clampForce, overlapPadding)) {
             if (!checkBounds) {
               bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
@@ -37327,6 +37329,41 @@
         }
         return result;
       }
+      isMarkInsideRect(baseMark, bmpTool) {
+        const {
+            left: left,
+            right: right,
+            top: top,
+            bottom: bottom
+          } = bmpTool.padding,
+          rect = {
+            x1: -left,
+            x2: bmpTool.width + right,
+            y1: -top,
+            y2: bmpTool.height + bottom
+          },
+          bounds = baseMark.AABBBounds;
+        if (0 !== bounds.width() && 0 !== bounds.height()) return isRectIntersect(baseMark.AABBBounds, rect, !0);
+        const {
+          attribute: attribute
+        } = baseMark;
+        if ("rect" === baseMark.type) {
+          const {
+            x: x,
+            x1: x1,
+            y: y,
+            y1: y1
+          } = attribute;
+          return pointInRect({
+            x: null != x ? x : x1,
+            y: null != y ? y : y1
+          }, rect, !0);
+        }
+        return "x" in attribute && "y" in attribute && pointInRect({
+          x: attribute.x,
+          y: attribute.y
+        }, rect, !0);
+      }
       getBaseMarkGroup() {
         const {
           baseMarkGroupName: baseMarkGroupName
@@ -63619,7 +63656,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.13.8-alpha.0";
+    const version = "1.13.8-alpha.2";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -73781,7 +73818,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return {
                 start: 'pointerdown',
                 move: 'pointermove',
-                end: ['pointerup', 'pointerupoutside'],
+                end: ['pointerup', 'pointerupoutside', 'pointerleave'],
                 zoom: 'pinch',
                 zoomEnd: 'pinchend',
                 scroll: 'pan',
@@ -73832,6 +73869,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }, this._getRegionOrSeriesLayout(regionOrSeries), false)) {
                 return;
             }
+            this._clearDragEvent();
+            this._zoomableTrigger.clearScroll();
             let extendParams = {};
             if (callback) {
                 extendParams = callback({ zoomDelta, zoomX, zoomY }, event);
@@ -73913,6 +73952,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }, this._getRegionOrSeriesLayout(regionOrSeries), false)) {
                 return stopBubble;
             }
+            this._clearDragEvent();
+            this._zoomableTrigger.clearZoom();
             if (callback) {
                 stopBubble = callback({ scrollX, scrollY }, event);
             }
@@ -74042,6 +74083,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (!this._zoomableTrigger.parserDragEvent(params.event)) {
                 return;
             }
+            this._zoomableTrigger.clearZoom();
+            this._zoomableTrigger.clearScroll();
             const delayType = (_a = option === null || option === void 0 ? void 0 : option.delayType) !== null && _a !== void 0 ? _a : 'throttle';
             const delayTime = (_b = option === null || option === void 0 ? void 0 : option.delayTime) !== null && _b !== void 0 ? _b : 0;
             const realTime = (_c = option === null || option === void 0 ? void 0 : option.realTime) !== null && _c !== void 0 ? _c : true;