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

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.attribute.interactive) return;
       if (!1 === this._beforeBrushEvent(e)) return;
       const {
         updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger,
@@ -51104,11 +51105,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 => {
-      !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))));
+      !1 !== this.attribute.interactive && !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;
+      !1 !== this.attribute.interactive && (this._releaseBrushUpdateEvents(), e.preventDefault(), this._activeDrawState && this._drawEnd(e), this._activeMoveState && this._moveEnd(e), this._activeDrawState = !1, this._activeMoveState = !1);
     }, this._onBrushClear = e => {
-      !1 !== this._beforeBrushEvent(e) && (e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1);
+      !1 !== this.attribute.interactive && !1 !== this._beforeBrushEvent(e) && (e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1);
     };
   }
   _bindBrushEvents() {
@@ -51120,6 +51121,7 @@ let Brush$1 = class Brush extends AbstractComponent {
     array(trigger).forEach(t => this.stage.addEventListener(t, this._onBrushStart)), array(resetTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushClear));
   }
   _initDraw(e) {
+    if (!1 === this.attribute.interactive) return;
     const {
         brushMode: brushMode
       } = this.attribute,
@@ -51128,6 +51130,7 @@ let Brush$1 = class Brush extends AbstractComponent {
   }
   _initMove(e) {
     var _a, _b;
+    if (!1 === this.attribute.interactive) return;
     this._cacheMovePoint = this.eventPosToStagePos(e), this._operatingMaskMoveDx = null !== (_a = this._operatingMask.attribute.dx) && void 0 !== _a ? _a : 0, this._operatingMaskMoveDy = null !== (_b = this._operatingMask.attribute.dy) && void 0 !== _b ? _b : 0;
     const {
         interactiveRange: interactiveRange
@@ -51152,6 +51155,7 @@ let Brush$1 = class Brush extends AbstractComponent {
   }
   _drawing(e) {
     var _a;
+    if (!1 === this.attribute.interactive) return;
     const pos = this.eventPosToStagePos(e),
       {
         brushType: brushType,
@@ -51176,6 +51180,7 @@ let Brush$1 = class Brush extends AbstractComponent {
     (Math.abs(x2 - x1) > sizeThreshold || Math.abs(y1 - y2) > sizeThreshold) && (1 !== Object.keys(this._brushMaskAABBBoundsDict).length || this._activeBrushState ? this._dispatchBrushEvent(IOperateType.drawing, e) : (this._activeBrushState = !0, this._dispatchBrushEvent(IOperateType.brushActive, e)));
   }
   _moving(e) {
+    if (!1 === this.attribute.interactive) return;
     const startPos = this._cacheMovePoint,
       pos = this.eventPosToStagePos(e);
     if (pos.x === (null == startPos ? void 0 : startPos.x) && pos.y === (null == startPos ? void 0 : startPos.y)) return;
@@ -51189,6 +51194,7 @@ let Brush$1 = class Brush extends AbstractComponent {
     }), this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds, this._dispatchBrushEvent(IOperateType.moving, e);
   }
   _drawEnd(e) {
+    if (!1 === this.attribute.interactive) return;
     const {
       removeOnClick = !0,
       sizeThreshold = DEFAULT_SIZE_THRESHOLD
@@ -51206,7 +51212,7 @@ let Brush$1 = class Brush extends AbstractComponent {
     }
   }
   _moveEnd(e) {
-    this._operatingMask && this._operatingMask.setAttribute("pickable", !1), this._dispatchBrushEvent(IOperateType.moveEnd, e);
+    !1 !== this.attribute.interactive && (this._operatingMask && this._operatingMask.setAttribute("pickable", !1), this._dispatchBrushEvent(IOperateType.moveEnd, e));
   }
   render() {
     this._bindBrushEvents();
@@ -54899,6 +54905,9 @@ class Compiler {
     getRootGroup() {
         return this._rootGroup;
     }
+    getOption() {
+        return this._option;
+    }
     constructor(container, option) {
         this._count = 0;
         this._rootMarks = [];
@@ -95664,11 +95673,15 @@ 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 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;
+        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;
         return {
             canvasX,
             canvasY,
@@ -103201,6 +103214,9 @@ class Brush extends BaseComponent {
         this._initMarkBrushState(componentIndex, '');
         brushComponent.children[0].removeAllChild();
     }
+    _shouldEnableInteractive() {
+        return this.getOption().getCompiler().getOption().interactive !== false;
+    }
     _createBrushComponent(region, componentIndex) {
         var _a, _b;
         const interactiveAttr = this._getBrushInteractiveAttr(region);
@@ -103286,7 +103302,8 @@ class Brush extends BaseComponent {
                 maxX: seriesRegionEndX
             },
             xRange: [seriesRegionStartX, seriesRegionEndX],
-            yRange: [seriesRegionStartY, seriesRegionEndY]
+            yRange: [seriesRegionStartY, seriesRegionEndY],
+            interactive: this._shouldEnableInteractive()
         };
     }
     _transformBrushedMarkAttr(brushedStyle) {
@@ -103307,6 +103324,7 @@ class Brush extends BaseComponent {
     }
     _handleBrushChange(region, e) {
         const { operateMask } = e.detail;
+        this._operateMask = operateMask;
         const { updateElementsState = true } = this._spec;
         if (updateElementsState) {
             this._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.attribute.interactive) return;
           if (!1 === this._beforeBrushEvent(e)) return;
           const {
             updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger,
@@ -51110,11 +51111,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 => {
-          !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))));
+          !1 !== this.attribute.interactive && !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;
+          !1 !== this.attribute.interactive && (this._releaseBrushUpdateEvents(), e.preventDefault(), this._activeDrawState && this._drawEnd(e), this._activeMoveState && this._moveEnd(e), this._activeDrawState = !1, this._activeMoveState = !1);
         }, this._onBrushClear = e => {
-          !1 !== this._beforeBrushEvent(e) && (e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1);
+          !1 !== this.attribute.interactive && !1 !== this._beforeBrushEvent(e) && (e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1);
         };
       }
       _bindBrushEvents() {
@@ -51126,6 +51127,7 @@
         array(trigger).forEach(t => this.stage.addEventListener(t, this._onBrushStart)), array(resetTrigger).forEach(t => this.stage.addEventListener(t, this._onBrushClear));
       }
       _initDraw(e) {
+        if (!1 === this.attribute.interactive) return;
         const {
             brushMode: brushMode
           } = this.attribute,
@@ -51134,6 +51136,7 @@
       }
       _initMove(e) {
         var _a, _b;
+        if (!1 === this.attribute.interactive) return;
         this._cacheMovePoint = this.eventPosToStagePos(e), this._operatingMaskMoveDx = null !== (_a = this._operatingMask.attribute.dx) && void 0 !== _a ? _a : 0, this._operatingMaskMoveDy = null !== (_b = this._operatingMask.attribute.dy) && void 0 !== _b ? _b : 0;
         const {
             interactiveRange: interactiveRange
@@ -51158,6 +51161,7 @@
       }
       _drawing(e) {
         var _a;
+        if (!1 === this.attribute.interactive) return;
         const pos = this.eventPosToStagePos(e),
           {
             brushType: brushType,
@@ -51182,6 +51186,7 @@
         (Math.abs(x2 - x1) > sizeThreshold || Math.abs(y1 - y2) > sizeThreshold) && (1 !== Object.keys(this._brushMaskAABBBoundsDict).length || this._activeBrushState ? this._dispatchBrushEvent(IOperateType.drawing, e) : (this._activeBrushState = !0, this._dispatchBrushEvent(IOperateType.brushActive, e)));
       }
       _moving(e) {
+        if (!1 === this.attribute.interactive) return;
         const startPos = this._cacheMovePoint,
           pos = this.eventPosToStagePos(e);
         if (pos.x === (null == startPos ? void 0 : startPos.x) && pos.y === (null == startPos ? void 0 : startPos.y)) return;
@@ -51195,6 +51200,7 @@
         }), this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds, this._dispatchBrushEvent(IOperateType.moving, e);
       }
       _drawEnd(e) {
+        if (!1 === this.attribute.interactive) return;
         const {
           removeOnClick = !0,
           sizeThreshold = DEFAULT_SIZE_THRESHOLD
@@ -51212,7 +51218,7 @@
         }
       }
       _moveEnd(e) {
-        this._operatingMask && this._operatingMask.setAttribute("pickable", !1), this._dispatchBrushEvent(IOperateType.moveEnd, e);
+        !1 !== this.attribute.interactive && (this._operatingMask && this._operatingMask.setAttribute("pickable", !1), this._dispatchBrushEvent(IOperateType.moveEnd, e));
       }
       render() {
         this._bindBrushEvents();
@@ -54905,6 +54911,9 @@
         getRootGroup() {
             return this._rootGroup;
         }
+        getOption() {
+            return this._option;
+        }
         constructor(container, option) {
             this._count = 0;
             this._rootMarks = [];
@@ -95670,11 +95679,15 @@
             });
             return originDatum;
         };
+        const transform = region.getOption().globalInstance.getStage().window.getViewBoxTransform().getInverse();
         const getMockEvent = (originPos) => {
             var _a, _b;
             const pos = bound(originPos);
-            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;
+            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;
             return {
                 canvasX,
                 canvasY,
@@ -103207,6 +103220,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._initMarkBrushState(componentIndex, '');
             brushComponent.children[0].removeAllChild();
         }
+        _shouldEnableInteractive() {
+            return this.getOption().getCompiler().getOption().interactive !== false;
+        }
         _createBrushComponent(region, componentIndex) {
             var _a, _b;
             const interactiveAttr = this._getBrushInteractiveAttr(region);
@@ -103292,7 +103308,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     maxX: seriesRegionEndX
                 },
                 xRange: [seriesRegionStartX, seriesRegionEndX],
-                yRange: [seriesRegionStartY, seriesRegionEndY]
+                yRange: [seriesRegionStartY, seriesRegionEndY],
+                interactive: this._shouldEnableInteractive()
             };
         }
         _transformBrushedMarkAttr(brushedStyle) {
@@ -103313,6 +103330,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         _handleBrushChange(region, e) {
             const { operateMask } = e.detail;
+            this._operateMask = operateMask;
             const { updateElementsState = true } = this._spec;
             if (updateElementsState) {
                 this._reconfigItem(operateMask, region);