@visactor/vchart 1.13.8-alpha.6 → 1.13.8-alpha.8

package/build/index.js

@@ -44404,7 +44404,7 @@
     const DEFAULT_BRUSH_ATTRIBUTES = {
       trigger: "pointerdown",
       updateTrigger: "pointermove",
-      endTrigger: "pointerup",
+      endTrigger: ["pointerup", "pointerleave"],
       resetTrigger: "pointerupoutside",
       hasMask: !0,
       brushMode: "single",
@@ -44442,41 +44442,22 @@
         super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, Brush.defaultAttributes, attributes)), this.name = "brush", this._activeDrawState = !1, this._cacheDrawPoints = [], this._isDrawedBeforeEnd = !1, this._isDownBeforeUpOutside = !1, this._activeMoveState = !1, this._operatingMaskMoveDx = 0, this._operatingMaskMoveDy = 0, this._operatingMaskMoveRangeX = [-1 / 0, 1 / 0], this._operatingMaskMoveRangeY = [-1 / 0, 1 / 0], this._brushMaskAABBBoundsDict = {}, this._onBrushStart = e => {
           var _a;
           if (this._outOfInteractiveRange(e)) return void (this._isDownBeforeUpOutside = !0);
-          e.stopPropagation();
+          this._isDownBeforeUpOutside = !1, e.stopPropagation();
           const brushMoved = null === (_a = this.attribute.brushMoved) || void 0 === _a || _a;
           this._activeMoveState = brushMoved && this._isPosInBrushMask(e), this._activeDrawState = !this._activeMoveState, this._activeDrawState && this._initDraw(e), this._activeMoveState && this._initMove(e);
         }, this._onBrushing = e => {
           this._outOfInteractiveRange(e) || ((this._activeDrawState || this._activeMoveState) && e.stopPropagation(), this._activeDrawState && this._drawing(e), this._activeMoveState && this._moving(e));
         }, this._onBrushingWithDelay = 0 === this.attribute.delayTime ? this._onBrushing : delayMap$1[this.attribute.delayType](this._onBrushing, this.attribute.delayTime), this._onBrushEnd = e => {
           var _a;
+          if (this._isDownBeforeUpOutside) return this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), void (this._isDownBeforeUpOutside = !1);
           if (!this._activeDrawState && !this._activeMoveState) return;
           e.preventDefault();
           const {
             removeOnClick = !0
           } = this.attribute;
-          this._activeDrawState && !this._isDrawedBeforeEnd && removeOnClick ? ((null === (_a = this._operatingMask) || void 0 === _a ? void 0 : _a._AABBBounds.empty()) && this._dispatchEvent(IOperateType.brushClear, {
-            operateMask: this._operatingMask,
-            operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
-            event: e
-          }), this._container.incrementalClearChild(), this._brushMaskAABBBoundsDict = {}) : (this._activeDrawState && this._dispatchEvent(IOperateType.drawEnd, {
-            operateMask: this._operatingMask,
-            operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
-            event: e
-          }), this._activeMoveState && this._dispatchEvent(IOperateType.moveEnd, {
-            operateMask: this._operatingMask,
-            operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
-            event: e
-          })), this._activeDrawState = !1, this._activeMoveState = !1, this._isDrawedBeforeEnd = !1, this._operatingMask && this._operatingMask.setAttribute("pickable", !1);
+          this._activeDrawState && !this._isDrawedBeforeEnd && removeOnClick ? (null === (_a = this._operatingMask) || void 0 === _a ? void 0 : _a._AABBBounds.empty()) ? this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)) : (delete this._brushMaskAABBBoundsDict[this._operatingMask.name], this._container.setAttributes({}), this._container.removeChild(this._operatingMask), this._isEmptyMask() ? this._dispatchBrushEvent(IOperateType.drawEnd, e) : this._dispatchBrushEvent(IOperateType.brushClear, e)) : (this._activeDrawState && this._dispatchBrushEvent(IOperateType.drawEnd, e), this._activeMoveState && this._dispatchBrushEvent(IOperateType.moveEnd, e)), this._activeDrawState = !1, this._activeMoveState = !1, this._isDrawedBeforeEnd = !1, this._operatingMask && this._operatingMask.setAttribute("pickable", !1);
         }, this._onBrushClear = e => {
-          e.preventDefault();
-          const {
-            removeOnClick = !0
-          } = this.attribute;
-          this._isDownBeforeUpOutside && removeOnClick && (this._dispatchEvent(IOperateType.brushClear, {
-            operateMask: this._operatingMask,
-            operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
-            event: e
-          }), this._container.incrementalClearChild(), this._brushMaskAABBBoundsDict = {}), this._activeDrawState = !1, this._activeMoveState = !1, this._isDrawedBeforeEnd = !1, this._isDownBeforeUpOutside = !1, this._operatingMask && this._operatingMask.setAttribute("pickable", !1);
+          e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1, this._isDrawedBeforeEnd = !1, this._isDownBeforeUpOutside = !1;
         };
       }
       _bindBrushEvents() {
@@ -44487,35 +44468,14 @@
           endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
           resetTrigger = DEFAULT_BRUSH_ATTRIBUTES.resetTrigger
         } = this.attribute;
-        array(trigger).forEach(t => vglobal.addEventListener(t, this._onBrushStart)), array(updateTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushingWithDelay)), array(endTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushEnd)), array(resetTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushClear));
-      }
-      _isPosInBrushMask(e) {
-        const pos = this.eventPosToStagePos(e),
-          brushMasks = this._container.getChildren();
-        for (let i = 0; i < brushMasks.length; i++) {
-          const {
-              points = [],
-              dx = 0,
-              dy = 0
-            } = brushMasks[i].attribute,
-            pointsConsiderOffset = points.map(point => ({
-              x: point.x + dx,
-              y: point.y + dy
-            }));
-          if (polygonContainPoint(pointsConsiderOffset, pos.x, pos.y)) return this._operatingMask = brushMasks[i], !0;
-        }
-        return !1;
+        array(trigger).forEach(t => this.stage.addEventListener(t, this._onBrushStart)), array(updateTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushingWithDelay)), array(endTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushEnd)), array(resetTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushClear));
       }
       _initDraw(e) {
         const {
             brushMode: brushMode
           } = this.attribute,
           pos = this.eventPosToStagePos(e);
-        this._cacheDrawPoints = [pos], this._isDrawedBeforeEnd = !1, "single" === brushMode && (this._brushMaskAABBBoundsDict = {}, this._container.incrementalClearChild()), this._addBrushMask(), this._dispatchEvent(IOperateType.drawStart, {
-          operateMask: this._operatingMask,
-          operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
-          event: e
-        });
+        this._cacheDrawPoints = [pos], this._isDrawedBeforeEnd = !1, "single" === brushMode && this._clearMask(), this._addBrushMask(), this._dispatchBrushEvent(IOperateType.drawStart, e);
       }
       _initMove(e) {
         var _a, _b;
@@ -44539,11 +44499,7 @@
           maxMoveStepX = maxX - x2,
           minMoveStepY = minY - y1,
           maxMoveStepY = maxY - y2;
-        this._operatingMaskMoveRangeX = [minMoveStepX, maxMoveStepX], this._operatingMaskMoveRangeY = [minMoveStepY, maxMoveStepY], this._operatingMask.setAttribute("pickable", !0), this._dispatchEvent(IOperateType.moveStart, {
-          operateMask: this._operatingMask,
-          operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
-          event: e
-        });
+        this._operatingMaskMoveRangeX = [minMoveStepX, maxMoveStepX], this._operatingMaskMoveRangeY = [minMoveStepY, maxMoveStepY], this._operatingMask.setAttribute("pickable", !0), this._dispatchBrushEvent(IOperateType.moveStart, e);
       }
       _drawing(e) {
         var _a, _b;
@@ -44566,11 +44522,7 @@
           y1 = 0,
           y2 = 0
         } = null === (_b = this._operatingMask) || void 0 === _b ? void 0 : _b._AABBBounds;
-        this._isDrawedBeforeEnd = !this._operatingMask._AABBBounds.empty() && !!(Math.abs(x2 - x1) > sizeThreshold || Math.abs(y1 - y2) > sizeThreshold), this._isDrawedBeforeEnd && (this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds, this._dispatchEvent(IOperateType.drawing, {
-          operateMask: this._operatingMask,
-          operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
-          event: e
-        }));
+        this._isDrawedBeforeEnd = !this._operatingMask._AABBBounds.empty() && !!(Math.abs(x2 - x1) > sizeThreshold || Math.abs(y1 - y2) > sizeThreshold), this._isDrawedBeforeEnd && (this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds), this._dispatchBrushEvent(IOperateType.drawing, e);
       }
       _moving(e) {
         const startPos = this._cacheMovePoint,
@@ -44583,11 +44535,21 @@
         this._operatingMask.setAttributes({
           dx: moveX,
           dy: moveY
-        }), this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds, this._dispatchEvent(IOperateType.moving, {
-          operateMask: this._operatingMask,
-          operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
-          event: e
-        });
+        }), this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds, this._dispatchBrushEvent(IOperateType.moving, e);
+      }
+      render() {
+        this.releaseBrushEvents(), this._bindBrushEvents();
+        const group = this.createOrUpdateChild("brush-container", {}, "group");
+        this._container = group;
+      }
+      releaseBrushEvents() {
+        const {
+          trigger = DEFAULT_BRUSH_ATTRIBUTES.trigger,
+          updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger,
+          endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
+          resetTrigger = DEFAULT_BRUSH_ATTRIBUTES.resetTrigger
+        } = this.attribute;
+        array(trigger).forEach(t => this.stage.removeEventListener(t, this._onBrushStart)), array(updateTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushingWithDelay)), array(endTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushEnd)), array(resetTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushClear));
       }
       _computeMaskPoints() {
         const {
@@ -44645,6 +44607,23 @@
           }));
         brushMask.name = `brush-${Date.now()}`, this._operatingMask = brushMask, this._container.add(brushMask), this._brushMaskAABBBoundsDict[brushMask.name] = brushMask.AABBBounds;
       }
+      _isPosInBrushMask(e) {
+        const pos = this.eventPosToStagePos(e),
+          brushMasks = this._container.getChildren();
+        for (let i = 0; i < brushMasks.length; i++) {
+          const {
+              points = [],
+              dx = 0,
+              dy = 0
+            } = brushMasks[i].attribute,
+            pointsConsiderOffset = points.map(point => ({
+              x: point.x + dx,
+              y: point.y + dy
+            }));
+          if (polygonContainPoint(pointsConsiderOffset, pos.x, pos.y)) return this._operatingMask = brushMasks[i], !0;
+        }
+        return !1;
+      }
       _outOfInteractiveRange(e) {
         const {
             interactiveRange: interactiveRange
@@ -44661,21 +44640,18 @@
       eventPosToStagePos(e) {
         return this.stage.eventPointTransform(e);
       }
-      render() {
-        this._bindBrushEvents();
-        const group = this.createOrUpdateChild("brush-container", {}, "group");
-        this._container = group;
+      _dispatchBrushEvent(operateType, e) {
+        this._dispatchEvent(operateType, {
+          operateMask: this._operatingMask,
+          operatedMaskAABBBounds: this._brushMaskAABBBoundsDict,
+          event: e
+        });
       }
-      releaseBrushEvents() {
-        const {
-          delayType = "throttle",
-          delayTime = 0,
-          trigger = DEFAULT_BRUSH_ATTRIBUTES.trigger,
-          updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger,
-          endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
-          resetTrigger = DEFAULT_BRUSH_ATTRIBUTES.resetTrigger
-        } = this.attribute;
-        array(trigger).forEach(t => vglobal.removeEventListener(t, this._onBrushStart)), array(updateTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushingWithDelay)), array(endTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushEnd)), array(resetTrigger).forEach(t => this.stage.removeEventListener(t, this._onBrushClear));
+      _clearMask() {
+        this._brushMaskAABBBoundsDict = {}, this._container.incrementalClearChild(), this._operatingMask = null;
+      }
+      _isEmptyMask() {
+        return isEmpty(this._brushMaskAABBBoundsDict) || Object.keys(this._brushMaskAABBBoundsDict).every(key => this._brushMaskAABBBoundsDict[key].empty());
       }
     };
     Brush$1.defaultAttributes = DEFAULT_BRUSH_ATTRIBUTES;
@@ -56559,7 +56535,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           var _a;
           element.isReserved && element.diffState !== DiffState.exit && (element.isReserved = !1);
           const prevElementState = null === (_a = this.elementRecorder.get(element)) || void 0 === _a ? void 0 : _a.prevState;
-          (this.configs.some(config => prevElementState !== element.diffState && config.state === prevElementState && config.timeline.controlOptions.stopWhenStateChange) || element.diffState === DiffState.exit && prevElementState !== element.diffState) && this.clearElementAnimation(element, !1);
+          (this.configs.some(config => prevElementState !== element.diffState && config.state === prevElementState && config.timeline.controlOptions.stopWhenStateChange) || element.diffState === DiffState.exit) && this.clearElementAnimation(element, !1);
         }), this.configs.forEach(config => {
           this.animateByTimeline(config, elements, parameters);
         }), this.mark.cleanExitElements(), this;
@@ -56935,12 +56911,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         Event_Bubble_Level["model"] = "model";
         Event_Bubble_Level["mark"] = "mark";
     })(Event_Bubble_Level || (Event_Bubble_Level = {}));
-    const EventBubbleLevels = [
-        Event_Bubble_Level.mark,
-        Event_Bubble_Level.model,
-        Event_Bubble_Level.chart,
-        Event_Bubble_Level.vchart
-    ];
 
     const isInBound = (pos, min, max) => pos.x >= min.x && pos.x <= max.x && pos.y >= min.y && pos.y <= max.y;
     const isInRegionBound = (chart, axis, pos) => {
@@ -57775,29 +57745,29 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 stopBubble = this._invoke(handlers, eType, params);
             }
             else {
+                const levels = [
+                    Event_Bubble_Level.mark,
+                    Event_Bubble_Level.model,
+                    Event_Bubble_Level.chart,
+                    Event_Bubble_Level.vchart
+                ];
                 let i = 0;
-                while (!stopBubble && i < EventBubbleLevels.length) {
-                    stopBubble = this._invoke(bubble.getHandlers(EventBubbleLevels[i]), eType, params);
+                while (!stopBubble && i < levels.length) {
+                    stopBubble = this._invoke(bubble.getHandlers(levels[i]), eType, params);
                     i++;
                 }
             }
             return this;
         }
         prevent(eType, except) {
-            const eventSourceTypes = ['canvas', 'chart', 'window'];
-            eventSourceTypes.forEach(type => {
+            const eventTypes = ['canvas', 'chart', 'window'];
+            eventTypes.forEach(type => {
                 const bubble = this.getEventBubble(type).get(eType);
                 if (bubble) {
                     bubble.getAllHandlers().forEach(handler => {
-                        if (!except) {
+                        if (!except || handler.callback !== except) {
                             bubble.preventHandler(handler);
                         }
-                        else if (EventBubbleLevels.indexOf(handler.filter.level) <
-                            EventBubbleLevels.indexOf(except.level)) {
-                            if (handler.callback !== except.handler) {
-                                bubble.preventHandler(handler);
-                            }
-                        }
                     });
                 }
             });
@@ -63662,7 +63632,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.13.8-alpha.6";
+    const version = "1.13.8-alpha.8";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -64157,7 +64127,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     result[key][op] = f.customize;
                 }
                 else {
-                    if (dataFieldInKey && dataFieldInKey.lockStatisticsByDomain === true && !isNil$1(dataFieldInKey.domain)) {
+                    if (dataFieldInKey && dataFieldInKey.lockStatisticsByDomain && !isNil$1(dataFieldInKey.domain)) {
                         if (op === 'values') {
                             result[key][op] = dataFieldInKey.domain.slice();
                             return;
@@ -71673,11 +71643,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     return;
                 }
                 const hasTotalLabel = series.some(s => {
-                    var _a, _b, _c, _d;
-                    if ((_b = (_a = s.getSpec()) === null || _a === void 0 ? void 0 : _a.totalLabel) === null || _b === void 0 ? void 0 : _b.alwayCalculateTotal) {
-                        return true;
-                    }
-                    return (_d = (_c = s.getSpec()) === null || _c === void 0 ? void 0 : _c.totalLabel) === null || _d === void 0 ? void 0 : _d.visible;
+                    var _a, _b;
+                    return (_b = (_a = s.getSpec()) === null || _a === void 0 ? void 0 : _a.totalLabel) === null || _b === void 0 ? void 0 : _b.visible;
                 });
                 const hasPercent = hasTotalLabel || series.some(s => s.getPercent());
                 const hasOffsetSilhouette = series.some(s => s.getStackOffsetSilhouette());
@@ -74126,12 +74093,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     return;
                 }
                 this._clickEnable = false;
-                end.forEach(endEventType => {
-                    this._eventObj.prevent(endEventType, {
-                        handler: this._handleDragMouseUp,
-                        level: Event_Bubble_Level.chart
-                    });
-                });
+                end.forEach(endEventType => this._eventObj.prevent(endEventType, this._handleDragMouseUp));
                 const event = params.event;
                 const dx = event.canvasX - moveX;
                 const dy = event.canvasY - moveY;
@@ -92164,9 +92126,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         if (title.visible) {
             attrs.title = transformLegendTitleAttributes(title);
         }
-        else {
-            attrs.title = { visible: false };
-        }
         if (!isEmpty(item.focusIconStyle)) {
             transformToGraphic(item.focusIconStyle);
         }
@@ -92762,9 +92721,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         if (title.visible) {
             attrs.title = transformLegendTitleAttributes(title);
         }
-        else {
-            attrs.title = { visible: false };
-        }
         attrs.showHandler = handler.visible !== false;
         if (!isEmpty(handler.style)) {
             attrs.handlerStyle = transformToGraphic(handler.style);