@visactor/vchart 2.0.13-alpha.2 → 2.0.13-alpha.4

package/build/index.es.js

@@ -53868,7 +53868,7 @@ let Event$1 = class Event {
         if (ComposedEventCtor) {
             const composedEvent = new ComposedEventCtor(this._eventDispatcher, this._mode);
             composedEvent.register(eType, handler);
-            this._composedEventMap.set(callback, {
+            this._composedEventMap.set(handler.callback, {
                 eventType: eType,
                 event: composedEvent
             });
@@ -60528,7 +60528,7 @@ class VChart {
         this._compiler.updateLayoutTag();
         this._setFontFamilyTheme(this.getTheme('fontFamily'));
         this._initDataSet(this._option.dataSet);
-        this._autoSize = isTrueBrowseEnv ? (_g = (_f = spec.autoFit) !== null && _f !== void 0 ? _f : this._option.autoFit) !== null && _g !== void 0 ? _g : true : false;
+        this._autoSize = isTrueBrowseEnv ? ((_g = (_f = spec.autoFit) !== null && _f !== void 0 ? _f : this._option.autoFit) !== null && _g !== void 0 ? _g : true) : false;
         this._bindResizeEvent();
         this._bindViewEvent();
         this._initChartPlugin();
@@ -61181,7 +61181,7 @@ class VChart {
             resize = true;
         }
         const lasAutoSize = this._autoSize;
-        this._autoSize = isTrueBrowser(this._option.mode) ? (_b = (_a = this._spec.autoFit) !== null && _a !== void 0 ? _a : this._option.autoFit) !== null && _b !== void 0 ? _b : true : false;
+        this._autoSize = isTrueBrowser(this._option.mode) ? ((_b = (_a = this._spec.autoFit) !== null && _a !== void 0 ? _a : this._option.autoFit) !== null && _b !== void 0 ? _b : true) : false;
         if (this._autoSize !== lasAutoSize) {
             resize = true;
         }
@@ -64442,7 +64442,7 @@ class DimensionHoverEvent extends DimensionEvent {
         super(...arguments);
         this._cacheDimensionInfo = null;
         this.onMouseMove = (params) => {
-            if (!params) {
+            if (!params || DimensionHoverEvent._disableDimensionEvent) {
                 return;
             }
             const x = params.event.viewX;
@@ -64464,13 +64464,16 @@ class DimensionHoverEvent extends DimensionEvent {
             }
         };
         this.onMouseOut = (params) => {
-            if (!params) {
+            if (!params || DimensionHoverEvent._disableDimensionEvent) {
                 return;
             }
             this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'leave', dimensionInfo: this._cacheDimensionInfo ? this._cacheDimensionInfo.slice() : [] }));
             this._cacheDimensionInfo = null;
         };
     }
+    static disableDimensionEvent(value) {
+        this._disableDimensionEvent = value;
+    }
     register(eType, handler) {
         this._callback = handler.callback;
         this._eventDispatcher.register('pointermove', {
@@ -64501,6 +64504,7 @@ class DimensionHoverEvent extends DimensionEvent {
         }
     }
 }
+DimensionHoverEvent._disableDimensionEvent = false;
 
 var DimensionEventEnum;
 (function (DimensionEventEnum) {
@@ -95673,11 +95677,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,
@@ -103226,10 +103234,16 @@ class Brush extends BaseComponent {
             this._emitEvent(ChartEvent.brushActive, region, e);
         });
         brush.addEventListener(IOperateType.drawStart, (e) => {
+            if (this._spec.disableDimensionHoverWhenBrushing) {
+                this.disableDimensionHover();
+            }
             this._setRegionMarkPickable(region, true);
             this._emitEvent(ChartEvent.brushStart, region, e);
         });
         brush.addEventListener(IOperateType.moveStart, (e) => {
+            if (this._spec.disableDimensionHoverWhenBrushing) {
+                this.disableDimensionHover();
+            }
             this._setRegionMarkPickable(region, true);
             this._emitEvent(ChartEvent.brushStart, region, e);
         });
@@ -103244,12 +103258,16 @@ class Brush extends BaseComponent {
             this._emitEvent(ChartEvent.brushChange, region, e);
         });
         brush.addEventListener(IOperateType.brushClear, (e) => {
+            if (this._spec.disableDimensionHoverWhenBrushing) {
+                this.enableDimensionHover();
+            }
             this._setRegionMarkPickable(region, true);
             this._initMarkBrushState(componentIndex, '');
             this._emitEvent(ChartEvent.brushClear, region, e);
         });
         brush.addEventListener(IOperateType.drawEnd, (e) => {
             var _a;
+            this.enableDimensionHover();
             this._setRegionMarkPickable(region, true);
             const { operateMask } = e.detail;
             const { updateElementsState = true } = this._spec;
@@ -103273,6 +103291,7 @@ class Brush extends BaseComponent {
             }
         });
         brush.addEventListener(IOperateType.moveEnd, (e) => {
+            this.enableDimensionHover();
             this._setRegionMarkPickable(region, true);
             const { operateMask } = e.detail;
             const { updateElementsState = true } = this._spec;
@@ -103618,6 +103637,28 @@ class Brush extends BaseComponent {
             this._brushComponents = null;
         }
     }
+    disableDimensionHover() {
+        DimensionHoverEvent.disableDimensionEvent(true);
+        this._option
+            .getChart()
+            .getComponentsByKey('crosshair')
+            .forEach(crosshair => (crosshair.enable = false));
+        this._option.globalInstance.setTooltipHandler((() => { }));
+    }
+    enableDimensionHover() {
+        DimensionHoverEvent.disableDimensionEvent(false);
+        this._option
+            .getChart()
+            .getComponentsByKey('crosshair')
+            .forEach(crosshair => (crosshair.enable = true));
+        this._option.globalInstance.setTooltipHandler(undefined);
+    }
+    clearBrushStateAndMask() {
+        this._relativeRegions.forEach((region, componentIndex) => {
+            this._initMarkBrushState(componentIndex, '');
+            this._brushComponents[componentIndex].children[0].removeAllChild();
+        });
+    }
 }
 Brush.type = ComponentTypeEnum.brush;
 Brush.builtInTheme = {

package/build/index.js

@@ -53874,7 +53874,7 @@
             if (ComposedEventCtor) {
                 const composedEvent = new ComposedEventCtor(this._eventDispatcher, this._mode);
                 composedEvent.register(eType, handler);
-                this._composedEventMap.set(callback, {
+                this._composedEventMap.set(handler.callback, {
                     eventType: eType,
                     event: composedEvent
                 });
@@ -60534,7 +60534,7 @@
             this._compiler.updateLayoutTag();
             this._setFontFamilyTheme(this.getTheme('fontFamily'));
             this._initDataSet(this._option.dataSet);
-            this._autoSize = isTrueBrowseEnv ? (_g = (_f = spec.autoFit) !== null && _f !== void 0 ? _f : this._option.autoFit) !== null && _g !== void 0 ? _g : true : false;
+            this._autoSize = isTrueBrowseEnv ? ((_g = (_f = spec.autoFit) !== null && _f !== void 0 ? _f : this._option.autoFit) !== null && _g !== void 0 ? _g : true) : false;
             this._bindResizeEvent();
             this._bindViewEvent();
             this._initChartPlugin();
@@ -61187,7 +61187,7 @@
                 resize = true;
             }
             const lasAutoSize = this._autoSize;
-            this._autoSize = isTrueBrowser(this._option.mode) ? (_b = (_a = this._spec.autoFit) !== null && _a !== void 0 ? _a : this._option.autoFit) !== null && _b !== void 0 ? _b : true : false;
+            this._autoSize = isTrueBrowser(this._option.mode) ? ((_b = (_a = this._spec.autoFit) !== null && _a !== void 0 ? _a : this._option.autoFit) !== null && _b !== void 0 ? _b : true) : false;
             if (this._autoSize !== lasAutoSize) {
                 resize = true;
             }
@@ -64448,7 +64448,7 @@
             super(...arguments);
             this._cacheDimensionInfo = null;
             this.onMouseMove = (params) => {
-                if (!params) {
+                if (!params || DimensionHoverEvent._disableDimensionEvent) {
                     return;
                 }
                 const x = params.event.viewX;
@@ -64470,13 +64470,16 @@
                 }
             };
             this.onMouseOut = (params) => {
-                if (!params) {
+                if (!params || DimensionHoverEvent._disableDimensionEvent) {
                     return;
                 }
                 this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'leave', dimensionInfo: this._cacheDimensionInfo ? this._cacheDimensionInfo.slice() : [] }));
                 this._cacheDimensionInfo = null;
             };
         }
+        static disableDimensionEvent(value) {
+            this._disableDimensionEvent = value;
+        }
         register(eType, handler) {
             this._callback = handler.callback;
             this._eventDispatcher.register('pointermove', {
@@ -64507,6 +64510,7 @@
             }
         }
     }
+    DimensionHoverEvent._disableDimensionEvent = false;
 
     exports.DimensionEventEnum = void 0;
     (function (DimensionEventEnum) {
@@ -95679,11 +95683,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,
@@ -103232,10 +103240,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 this._emitEvent(exports.ChartEvent.brushActive, region, e);
             });
             brush.addEventListener(IOperateType.drawStart, (e) => {
+                if (this._spec.disableDimensionHoverWhenBrushing) {
+                    this.disableDimensionHover();
+                }
                 this._setRegionMarkPickable(region, true);
                 this._emitEvent(exports.ChartEvent.brushStart, region, e);
             });
             brush.addEventListener(IOperateType.moveStart, (e) => {
+                if (this._spec.disableDimensionHoverWhenBrushing) {
+                    this.disableDimensionHover();
+                }
                 this._setRegionMarkPickable(region, true);
                 this._emitEvent(exports.ChartEvent.brushStart, region, e);
             });
@@ -103250,12 +103264,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 this._emitEvent(exports.ChartEvent.brushChange, region, e);
             });
             brush.addEventListener(IOperateType.brushClear, (e) => {
+                if (this._spec.disableDimensionHoverWhenBrushing) {
+                    this.enableDimensionHover();
+                }
                 this._setRegionMarkPickable(region, true);
                 this._initMarkBrushState(componentIndex, '');
                 this._emitEvent(exports.ChartEvent.brushClear, region, e);
             });
             brush.addEventListener(IOperateType.drawEnd, (e) => {
                 var _a;
+                this.enableDimensionHover();
                 this._setRegionMarkPickable(region, true);
                 const { operateMask } = e.detail;
                 const { updateElementsState = true } = this._spec;
@@ -103279,6 +103297,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
             });
             brush.addEventListener(IOperateType.moveEnd, (e) => {
+                this.enableDimensionHover();
                 this._setRegionMarkPickable(region, true);
                 const { operateMask } = e.detail;
                 const { updateElementsState = true } = this._spec;
@@ -103624,6 +103643,28 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 this._brushComponents = null;
             }
         }
+        disableDimensionHover() {
+            DimensionHoverEvent.disableDimensionEvent(true);
+            this._option
+                .getChart()
+                .getComponentsByKey('crosshair')
+                .forEach(crosshair => (crosshair.enable = false));
+            this._option.globalInstance.setTooltipHandler((() => { }));
+        }
+        enableDimensionHover() {
+            DimensionHoverEvent.disableDimensionEvent(false);
+            this._option
+                .getChart()
+                .getComponentsByKey('crosshair')
+                .forEach(crosshair => (crosshair.enable = true));
+            this._option.globalInstance.setTooltipHandler(undefined);
+        }
+        clearBrushStateAndMask() {
+            this._relativeRegions.forEach((region, componentIndex) => {
+                this._initMarkBrushState(componentIndex, '');
+                this._brushComponents[componentIndex].children[0].removeAllChild();
+            });
+        }
     }
     Brush.type = ComponentTypeEnum.brush;
     Brush.builtInTheme = {