@visactor/vchart 2.0.13-alpha.0 → 2.0.13-alpha.1

package/build/index.es.js

@@ -51096,6 +51096,7 @@ loadBrushComponent();
 let Brush$1 = class Brush extends AbstractComponent {
   constructor(attributes, options) {
     super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, Brush.defaultAttributes, attributes)), this.name = "brush", this._activeBrushState = !1, this._activeDrawState = !1, this._cacheDrawPoints = [], this._activeMoveState = !1, this._operatingMaskMoveDx = 0, this._operatingMaskMoveDy = 0, this._operatingMaskMoveRangeX = [-1 / 0, 1 / 0], this._operatingMaskMoveRangeY = [-1 / 0, 1 / 0], this._brushMaskAABBBoundsDict = {}, this._firstUpdate = !0, this._onBrushStart = e => {
+      if (!1 === this._beforeBrushEvent(e)) return;
       const {
         updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger,
         endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
@@ -51103,11 +51104,11 @@ let Brush$1 = class Brush extends AbstractComponent {
       } = this.attribute;
       array(updateTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushingWithDelay)), array(endTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushEnd)), e.stopPropagation(), this._firstUpdate = !0, this._activeMoveState = brushMoved && this._isPosInBrushMask(e), this._activeDrawState = !this._activeMoveState, this._startPos = this.eventPosToStagePos(e), this._cacheDrawPoints = [this._startPos];
     }, this._onBrushing = e => {
-      this._outOfInteractiveRange(e) || (e.stopPropagation(), this._firstUpdate ? (this._activeDrawState && this._initDraw(e), this._activeMoveState && this._initMove(e), this._firstUpdate = !1) : (this._activeDrawState && this._drawing(e), this._activeMoveState && this._moving(e)));
+      !1 !== this._beforeBrushEvent(e) && (this._outOfInteractiveRange(e) || (e.stopPropagation(), this._firstUpdate ? (this._activeDrawState && this._initDraw(e), this._activeMoveState && this._initMove(e), this._firstUpdate = !1) : (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 => {
       this._releaseBrushUpdateEvents(), e.preventDefault(), this._activeDrawState && this._drawEnd(e), this._activeMoveState && this._moveEnd(e), this._activeDrawState = !1, this._activeMoveState = !1;
     }, this._onBrushClear = e => {
-      e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1;
+      !1 !== this._beforeBrushEvent(e) && (e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1);
     };
   }
   _bindBrushEvents() {
@@ -51312,6 +51313,10 @@ let Brush$1 = class Brush extends AbstractComponent {
       pos = this.eventPosToStagePos(e);
     return pos.x > maxX || pos.x < minX || pos.y > maxY || pos.y < minY;
   }
+  _beforeBrushEvent(e) {
+    var _a, _b;
+    return null === (_b = (_a = this.attribute).beforeBrushChange) || void 0 === _b ? void 0 : _b.call(_a, e);
+  }
   _dispatchBrushEvent(operateType, e) {
     this._dispatchEvent(operateType, {
       operateMask: this._operatingMask,
@@ -95659,15 +95664,11 @@ function showTooltip(datum, options, component) {
         });
         return originDatum;
     };
-    const transform = region.getOption().globalInstance.getStage().window.getViewBoxTransform().getInverse();
     const getMockEvent = (originPos) => {
         var _a, _b;
         const pos = bound(originPos);
-        const tempX = (_a = opt.x) !== null && _a !== void 0 ? _a : regionPos.x + pos.x;
-        const tempY = (_b = opt.y) !== null && _b !== void 0 ? _b : regionPos.y + pos.y;
-        const canvasPoint = { x: 0, y: 0 };
-        transform.transformPoint({ x: tempX, y: tempY }, canvasPoint);
-        const { x: canvasX, y: canvasY } = canvasPoint;
+        const canvasX = (_a = opt.x) !== null && _a !== void 0 ? _a : regionPos.x + pos.x;
+        const canvasY = (_b = opt.y) !== null && _b !== void 0 ? _b : regionPos.y + pos.y;
         return {
             canvasX,
             canvasY,
@@ -103210,30 +103211,30 @@ class Brush extends BaseComponent {
         this._cacheInteractiveRangeAttrs.push(interactiveAttr);
         brush.addEventListener(IOperateType.brushActive, (e) => {
             this._initMarkBrushState(componentIndex, OUT_BRUSH_STATE);
-            this._emitEvent(ChartEvent.brushActive, region);
+            this._emitEvent(ChartEvent.brushActive, region, e);
         });
         brush.addEventListener(IOperateType.drawStart, (e) => {
             this._setRegionMarkPickable(region, true);
-            this._emitEvent(ChartEvent.brushStart, region);
+            this._emitEvent(ChartEvent.brushStart, region, e);
         });
         brush.addEventListener(IOperateType.moveStart, (e) => {
             this._setRegionMarkPickable(region, true);
-            this._emitEvent(ChartEvent.brushStart, region);
+            this._emitEvent(ChartEvent.brushStart, region, e);
         });
         brush.addEventListener(IOperateType.drawing, (e) => {
             this._setRegionMarkPickable(region, false);
             this._handleBrushChange(region, e);
-            this._emitEvent(ChartEvent.brushChange, region);
+            this._emitEvent(ChartEvent.brushChange, region, e);
         });
         brush.addEventListener(IOperateType.moving, (e) => {
             this._setRegionMarkPickable(region, false);
             this._handleBrushChange(region, e);
-            this._emitEvent(ChartEvent.brushChange, region);
+            this._emitEvent(ChartEvent.brushChange, region, e);
         });
         brush.addEventListener(IOperateType.brushClear, (e) => {
             this._setRegionMarkPickable(region, true);
             this._initMarkBrushState(componentIndex, '');
-            this._emitEvent(ChartEvent.brushClear, region);
+            this._emitEvent(ChartEvent.brushClear, region, e);
         });
         brush.addEventListener(IOperateType.drawEnd, (e) => {
             var _a;
@@ -103244,11 +103245,11 @@ class Brush extends BaseComponent {
                 if (this._spec.onBrushEnd(e) === true) {
                     this.clearGraphic();
                     this._initMarkBrushState(componentIndex, '');
-                    this._emitEvent(ChartEvent.brushClear, region);
+                    this._emitEvent(ChartEvent.brushClear, region, e);
                 }
                 else {
                     this._spec.onBrushEnd(e);
-                    this._emitEvent(ChartEvent.brushEnd, region);
+                    this._emitEvent(ChartEvent.brushEnd, region, e);
                 }
             }
             else {
@@ -103256,7 +103257,7 @@ class Brush extends BaseComponent {
                 if ((!this._spec.zoomWhenEmpty && inBrushData.length > 0) || !updateElementsState) {
                     this._setAxisAndDataZoom(operateMask, region);
                 }
-                this._emitEvent(ChartEvent.brushEnd, region);
+                this._emitEvent(ChartEvent.brushEnd, region, e);
             }
         });
         brush.addEventListener(IOperateType.moveEnd, (e) => {
@@ -103267,7 +103268,7 @@ class Brush extends BaseComponent {
             if ((!this._spec.zoomWhenEmpty && inBrushData.length > 0) || updateElementsState) {
                 this._setAxisAndDataZoom(operateMask, region);
             }
-            this._emitEvent(ChartEvent.brushEnd, region);
+            this._emitEvent(ChartEvent.brushEnd, region, e);
         });
     }
     _getBrushInteractiveAttr(region) {
@@ -103330,7 +103331,7 @@ class Brush extends BaseComponent {
         }
         return data;
     }
-    _emitEvent(eventType, region) {
+    _emitEvent(eventType, region, e) {
         var _a;
         this.event.emit(eventType, {
             model: this,
@@ -103347,7 +103348,8 @@ class Brush extends BaseComponent {
                 linkedOutOfBrushElementsMap: this._linkedOutOfBrushElementsMap,
                 zoomRecord: this._zoomRecord
             },
-            vchart: (_a = this._option) === null || _a === void 0 ? void 0 : _a.globalInstance
+            vchart: (_a = this._option) === null || _a === void 0 ? void 0 : _a.globalInstance,
+            event: e
         });
     }
     _reconfigItem(operateMask, region) {

package/build/index.js

@@ -51102,6 +51102,7 @@
     let Brush$1 = class Brush extends AbstractComponent {
       constructor(attributes, options) {
         super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, Brush.defaultAttributes, attributes)), this.name = "brush", this._activeBrushState = !1, this._activeDrawState = !1, this._cacheDrawPoints = [], this._activeMoveState = !1, this._operatingMaskMoveDx = 0, this._operatingMaskMoveDy = 0, this._operatingMaskMoveRangeX = [-1 / 0, 1 / 0], this._operatingMaskMoveRangeY = [-1 / 0, 1 / 0], this._brushMaskAABBBoundsDict = {}, this._firstUpdate = !0, this._onBrushStart = e => {
+          if (!1 === this._beforeBrushEvent(e)) return;
           const {
             updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger,
             endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
@@ -51109,11 +51110,11 @@
           } = this.attribute;
           array(updateTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushingWithDelay)), array(endTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushEnd)), e.stopPropagation(), this._firstUpdate = !0, this._activeMoveState = brushMoved && this._isPosInBrushMask(e), this._activeDrawState = !this._activeMoveState, this._startPos = this.eventPosToStagePos(e), this._cacheDrawPoints = [this._startPos];
         }, this._onBrushing = e => {
-          this._outOfInteractiveRange(e) || (e.stopPropagation(), this._firstUpdate ? (this._activeDrawState && this._initDraw(e), this._activeMoveState && this._initMove(e), this._firstUpdate = !1) : (this._activeDrawState && this._drawing(e), this._activeMoveState && this._moving(e)));
+          !1 !== this._beforeBrushEvent(e) && (this._outOfInteractiveRange(e) || (e.stopPropagation(), this._firstUpdate ? (this._activeDrawState && this._initDraw(e), this._activeMoveState && this._initMove(e), this._firstUpdate = !1) : (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 => {
           this._releaseBrushUpdateEvents(), e.preventDefault(), this._activeDrawState && this._drawEnd(e), this._activeMoveState && this._moveEnd(e), this._activeDrawState = !1, this._activeMoveState = !1;
         }, this._onBrushClear = e => {
-          e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1;
+          !1 !== this._beforeBrushEvent(e) && (e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1);
         };
       }
       _bindBrushEvents() {
@@ -51318,6 +51319,10 @@
           pos = this.eventPosToStagePos(e);
         return pos.x > maxX || pos.x < minX || pos.y > maxY || pos.y < minY;
       }
+      _beforeBrushEvent(e) {
+        var _a, _b;
+        return null === (_b = (_a = this.attribute).beforeBrushChange) || void 0 === _b ? void 0 : _b.call(_a, e);
+      }
       _dispatchBrushEvent(operateType, e) {
         this._dispatchEvent(operateType, {
           operateMask: this._operatingMask,
@@ -95665,15 +95670,11 @@
             });
             return originDatum;
         };
-        const transform = region.getOption().globalInstance.getStage().window.getViewBoxTransform().getInverse();
         const getMockEvent = (originPos) => {
             var _a, _b;
             const pos = bound(originPos);
-            const tempX = (_a = opt.x) !== null && _a !== void 0 ? _a : regionPos.x + pos.x;
-            const tempY = (_b = opt.y) !== null && _b !== void 0 ? _b : regionPos.y + pos.y;
-            const canvasPoint = { x: 0, y: 0 };
-            transform.transformPoint({ x: tempX, y: tempY }, canvasPoint);
-            const { x: canvasX, y: canvasY } = canvasPoint;
+            const canvasX = (_a = opt.x) !== null && _a !== void 0 ? _a : regionPos.x + pos.x;
+            const canvasY = (_b = opt.y) !== null && _b !== void 0 ? _b : regionPos.y + pos.y;
             return {
                 canvasX,
                 canvasY,
@@ -103216,30 +103217,30 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._cacheInteractiveRangeAttrs.push(interactiveAttr);
             brush.addEventListener(IOperateType.brushActive, (e) => {
                 this._initMarkBrushState(componentIndex, OUT_BRUSH_STATE);
-                this._emitEvent(exports.ChartEvent.brushActive, region);
+                this._emitEvent(exports.ChartEvent.brushActive, region, e);
             });
             brush.addEventListener(IOperateType.drawStart, (e) => {
                 this._setRegionMarkPickable(region, true);
-                this._emitEvent(exports.ChartEvent.brushStart, region);
+                this._emitEvent(exports.ChartEvent.brushStart, region, e);
             });
             brush.addEventListener(IOperateType.moveStart, (e) => {
                 this._setRegionMarkPickable(region, true);
-                this._emitEvent(exports.ChartEvent.brushStart, region);
+                this._emitEvent(exports.ChartEvent.brushStart, region, e);
             });
             brush.addEventListener(IOperateType.drawing, (e) => {
                 this._setRegionMarkPickable(region, false);
                 this._handleBrushChange(region, e);
-                this._emitEvent(exports.ChartEvent.brushChange, region);
+                this._emitEvent(exports.ChartEvent.brushChange, region, e);
             });
             brush.addEventListener(IOperateType.moving, (e) => {
                 this._setRegionMarkPickable(region, false);
                 this._handleBrushChange(region, e);
-                this._emitEvent(exports.ChartEvent.brushChange, region);
+                this._emitEvent(exports.ChartEvent.brushChange, region, e);
             });
             brush.addEventListener(IOperateType.brushClear, (e) => {
                 this._setRegionMarkPickable(region, true);
                 this._initMarkBrushState(componentIndex, '');
-                this._emitEvent(exports.ChartEvent.brushClear, region);
+                this._emitEvent(exports.ChartEvent.brushClear, region, e);
             });
             brush.addEventListener(IOperateType.drawEnd, (e) => {
                 var _a;
@@ -103250,11 +103251,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     if (this._spec.onBrushEnd(e) === true) {
                         this.clearGraphic();
                         this._initMarkBrushState(componentIndex, '');
-                        this._emitEvent(exports.ChartEvent.brushClear, region);
+                        this._emitEvent(exports.ChartEvent.brushClear, region, e);
                     }
                     else {
                         this._spec.onBrushEnd(e);
-                        this._emitEvent(exports.ChartEvent.brushEnd, region);
+                        this._emitEvent(exports.ChartEvent.brushEnd, region, e);
                     }
                 }
                 else {
@@ -103262,7 +103263,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     if ((!this._spec.zoomWhenEmpty && inBrushData.length > 0) || !updateElementsState) {
                         this._setAxisAndDataZoom(operateMask, region);
                     }
-                    this._emitEvent(exports.ChartEvent.brushEnd, region);
+                    this._emitEvent(exports.ChartEvent.brushEnd, region, e);
                 }
             });
             brush.addEventListener(IOperateType.moveEnd, (e) => {
@@ -103273,7 +103274,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 if ((!this._spec.zoomWhenEmpty && inBrushData.length > 0) || updateElementsState) {
                     this._setAxisAndDataZoom(operateMask, region);
                 }
-                this._emitEvent(exports.ChartEvent.brushEnd, region);
+                this._emitEvent(exports.ChartEvent.brushEnd, region, e);
             });
         }
         _getBrushInteractiveAttr(region) {
@@ -103336,7 +103337,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             return data;
         }
-        _emitEvent(eventType, region) {
+        _emitEvent(eventType, region, e) {
             var _a;
             this.event.emit(eventType, {
                 model: this,
@@ -103353,7 +103354,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     linkedOutOfBrushElementsMap: this._linkedOutOfBrushElementsMap,
                     zoomRecord: this._zoomRecord
                 },
-                vchart: (_a = this._option) === null || _a === void 0 ? void 0 : _a.globalInstance
+                vchart: (_a = this._option) === null || _a === void 0 ? void 0 : _a.globalInstance,
+                event: e
             });
         }
         _reconfigItem(operateMask, region) {