@visactor/vchart 2.0.13-alpha.9 → 2.0.13

package/build/index.es.js

@@ -16489,6 +16489,7 @@ class Graphic extends Node {
     var _a;
     if (!states.length) return void this.clearStates(hasAnimation);
     if (!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) !== states.length || states.some((stateName, index) => this.currentStates[index] !== stateName))) return;
+    this.stateSort && (states = states.sort(this.stateSort));
     const stateAttrs = {};
     states.forEach(stateName => {
       var _a;
@@ -18517,7 +18518,7 @@ class Glyph extends Graphic {
     var _a;
     if (!states.length) return void this.clearStates(hasAnimation);
     if (!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) !== states.length || states.some((stateName, index) => this.currentStates[index] !== stateName))) return;
-    this.stopStateAnimates();
+    this.stopStateAnimates(), this.stateSort && (states = states.sort(this.stateSort));
     const stateAttrs = {},
       subAttrs = this.subGraphic.map(() => ({}));
     states.forEach(stateName => {
@@ -35171,8 +35172,8 @@ class AnimateExecutor {
   }
   parseParams(params, isTimeline, child) {
     var _a, _b;
-    const totalTime = this.resolveValue(params.totalTime, void 0, void 0),
-      startTime = this.resolveValue(params.startTime, void 0, 0),
+    const totalTime = this.resolveValue(params.totalTime, child, void 0),
+      startTime = this.resolveValue(params.startTime, child, 0),
       parsedParams = Object.assign({}, params);
     parsedParams.oneByOneDelay = 0, parsedParams.startTime = startTime, parsedParams.totalTime = totalTime;
     const oneByOne = this.resolveValue(params.oneByOne, child, !1);
@@ -35221,11 +35222,10 @@ class AnimateExecutor {
       let oneByOneDelay = 0;
       oneByOne && (oneByOneDelay = "number" == typeof oneByOne ? oneByOne : oneByOne ? delay + delayAfter + duration : 0), parsedParams.oneByOneDelay = oneByOneDelay, parsedParams.custom = null !== (_a = params.custom) && void 0 !== _a ? _a : AnimateExecutor.builtInAnimateMap[null !== (_b = params.type) && void 0 !== _b ? _b : "fromTo"];
       const customType = getCustomType(parsedParams.custom);
-      if (parsedParams.customType = customType, totalTime) {
-        const _totalTime = delay + delayAfter + duration + oneByOneDelay * (this._target.count - 2),
-          scale = totalTime ? totalTime / _totalTime : 1;
-        parsedParams.delay = delay * scale, parsedParams.delayAfter = delayAfter * scale, parsedParams.duration = duration * scale, parsedParams.oneByOneDelay = oneByOneDelay * scale, parsedParams.startTime = startTime;
-      }
+      parsedParams.customType = customType;
+      const _totalTime = delay + delayAfter + duration + oneByOneDelay * (this._target.count - 2),
+        scale = isValidNumber$1(totalTime) ? totalTime / _totalTime : 1;
+      parsedParams.delay = delay * scale, parsedParams.delayAfter = delayAfter * scale, parsedParams.duration = duration * scale, parsedParams.oneByOneDelay = oneByOneDelay * scale, parsedParams.startTime = startTime;
     }
     return parsedParams;
   }
@@ -51096,8 +51096,6 @@ 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,
         endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
@@ -51105,11 +51103,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.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._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 => {
-      !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._releaseBrushUpdateEvents(), e.preventDefault(), this._activeDrawState && this._drawEnd(e), this._activeMoveState && this._moveEnd(e), this._activeDrawState = !1, this._activeMoveState = !1;
     }, this._onBrushClear = e => {
-      !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);
+      e.preventDefault(), this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)), this._activeDrawState = !1, this._activeMoveState = !1;
     };
   }
   _bindBrushEvents() {
@@ -51121,7 +51119,6 @@ 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,
@@ -51130,7 +51127,6 @@ 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
@@ -51155,7 +51151,6 @@ let Brush$1 = class Brush extends AbstractComponent {
   }
   _drawing(e) {
     var _a;
-    if (!1 === this.attribute.interactive) return;
     const pos = this.eventPosToStagePos(e),
       {
         brushType: brushType,
@@ -51180,7 +51175,6 @@ 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;
@@ -51194,7 +51188,6 @@ 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
@@ -51212,7 +51205,7 @@ let Brush$1 = class Brush extends AbstractComponent {
     }
   }
   _moveEnd(e) {
-    !1 !== this.attribute.interactive && (this._operatingMask && this._operatingMask.setAttribute("pickable", !1), this._dispatchBrushEvent(IOperateType.moveEnd, e));
+    this._operatingMask && this._operatingMask.setAttribute("pickable", !1), this._dispatchBrushEvent(IOperateType.moveEnd, e);
   }
   render() {
     this._bindBrushEvents();
@@ -51319,10 +51312,6 @@ 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,
@@ -53868,7 +53857,7 @@ let Event$1 = class Event {
         if (ComposedEventCtor) {
             const composedEvent = new ComposedEventCtor(this._eventDispatcher, this._mode);
             composedEvent.register(eType, handler);
-            this._composedEventMap.set(handler.callback, {
+            this._composedEventMap.set(callback, {
                 eventType: eType,
                 event: composedEvent
             });
@@ -54905,9 +54894,6 @@ class Compiler {
     getRootGroup() {
         return this._rootGroup;
     }
-    getOption() {
-        return this._option;
-    }
     constructor(container, option) {
         this._count = 0;
         this._rootMarks = [];
@@ -58902,6 +58888,7 @@ class BaseMark extends GrammarItem {
         allGraphics.forEach((g, index) => {
             g.context.graphicCount = graphicCount;
             g.context.graphicIndex = index;
+            g.stateSort = this._stateSort;
         });
         this._dataByKey = newGroupedData;
         this._graphics = allGraphics;
@@ -58947,8 +58934,13 @@ class BaseMark extends GrammarItem {
         var _a;
         const attrsByGroup = noGroupEncode ? null : this._runGroupEncoder((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a.group);
         graphics.forEach((g, index) => {
-            var _a;
-            const attrs = this._runEncoderOfGraphic((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a.update, g);
+            var _a, _b;
+            let attrs = this._runEncoderOfGraphic((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a.update, g);
+            (_b = g.currentStates) === null || _b === void 0 ? void 0 : _b.forEach((_state) => {
+                var _a;
+                const stateAttr = this._runEncoderOfGraphic((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a[_state], g);
+                attrs = Object.assign(Object.assign({}, attrs), stateAttr);
+            });
             if (!isNil$1(this._markConfig.interactive)) {
                 attrs.pickable = this._markConfig.interactive;
             }
@@ -58970,6 +58962,7 @@ class BaseMark extends GrammarItem {
                 }
                 g.context = mockGraphic.context;
                 g.context.diffAttrs = finalAttrs;
+                g.stateSort = this._stateSort;
                 const gIndex = this._graphics === graphics ? index : index + this._graphics.length - graphics.length;
                 if (gIndex >= 0) {
                     this._graphics[gIndex] = g;
@@ -60384,7 +60377,6 @@ class VChart {
         this._observer = null;
         this._context = {};
         this._renderState = RenderStateEnum.render;
-        this._disableDimensionHoverEvent = false;
         this._doResize = () => {
             const { width, height } = this.getCurrentSize();
             if (this._currentSize.width !== width || this._currentSize.height !== height) {
@@ -60529,7 +60521,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();
@@ -61182,7 +61174,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;
         }
@@ -61423,22 +61415,6 @@ class VChart {
         var _a;
         return (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setDimensionIndex(value, opt);
     }
-    disableDimensionHoverEvent(value) {
-        if (value !== undefined) {
-            this._disableDimensionHoverEvent = value;
-        }
-        return this._disableDimensionHoverEvent;
-    }
-    disableCrossHair(value = true) {
-        this.getChart()
-            .getComponentsByKey('crosshair')
-            .forEach(crosshair => (crosshair.enable = !value));
-    }
-    disableTooltip(value = true) {
-        this.getChart()
-            .getComponentsByKey('tooltip')
-            .forEach(tooltip => (tooltip.enable = !value));
-    }
     showCrosshair(cb) {
         var _a;
         (_a = this._chart) === null || _a === void 0 ? void 0 : _a.showCrosshair(cb);
@@ -61767,7 +61743,7 @@ const lookup = (data, opt) => {
     });
 };
 
-const version = "2.0.12";
+const version = "2.0.13";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -64459,8 +64435,7 @@ class DimensionHoverEvent extends DimensionEvent {
         super(...arguments);
         this._cacheDimensionInfo = null;
         this.onMouseMove = (params) => {
-            var _a, _b, _c, _d;
-            if (!params || ((_d = (_c = (_b = (_a = params.chart) === null || _a === void 0 ? void 0 : _a.getOption()) === null || _b === void 0 ? void 0 : _b.globalInstance) === null || _c === void 0 ? void 0 : _c.disableDimensionHoverEvent) === null || _d === void 0 ? void 0 : _d.call(_c))) {
+            if (!params) {
                 return;
             }
             const x = params.event.viewX;
@@ -64482,8 +64457,7 @@ class DimensionHoverEvent extends DimensionEvent {
             }
         };
         this.onMouseOut = (params) => {
-            var _a, _b, _c, _d;
-            if (!params || ((_d = (_c = (_b = (_a = params.chart) === null || _a === void 0 ? void 0 : _a.getOption()) === null || _b === void 0 ? void 0 : _b.globalInstance) === null || _c === void 0 ? void 0 : _c.disableDimensionHoverEvent) === null || _d === void 0 ? void 0 : _d.call(_c))) {
+            if (!params) {
                 return;
             }
             this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'leave', dimensionInfo: this._cacheDimensionInfo ? this._cacheDimensionInfo.slice() : [] }));
@@ -71781,9 +71755,6 @@ class BaseTooltipProcessor {
     }
     shouldHandleTooltip(params, info) {
         var _a, _b;
-        if (!this.component.enable) {
-            return false;
-        }
         if (isNil$1(info)) {
             return false;
         }
@@ -95668,7 +95639,7 @@ const hasData = (data) => {
     return Object.keys(data).length > 0;
 };
 function showTooltip(datum, options, component) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const opt = Object.assign({ regionIndex: 0 }, options);
     const componentOptions = component.getOption();
     const region = componentOptions.getRegionsInUserIdOrIndex(isValid$1(opt.regionId) ? [opt.regionId] : undefined, isValid$1(opt.regionIndex) ? [opt.regionIndex] : undefined)[0];
@@ -95688,12 +95659,11 @@ function showTooltip(datum, options, component) {
     const getOriginDatum = (info) => {
         var _a;
         const { dimensionFields, dimensionData, measureFields, measureData, groupField, groupData } = info.data;
-        const originDatum = (_a = info.series.getViewData()) === null || _a === void 0 ? void 0 : _a.latestData.find((datum) => {
+        return (_a = info.series.getViewData()) === null || _a === void 0 ? void 0 : _a.latestData.find((datum) => {
             return (datumContainsArray(dimensionFields, dimensionData)(datum) &&
                 datumContainsArray(measureFields, measureData)(datum) &&
                 (isNil$1(groupField) || datumContainsArray([groupField], [groupData])(datum)));
         });
-        return originDatum;
     };
     const transform = region.getOption().globalInstance.getStage().window.getViewBoxTransform().getInverse();
     const getMockEvent = (originPos) => {
@@ -95767,7 +95737,7 @@ function showTooltip(datum, options, component) {
         if (!info) {
             return 'none';
         }
-        const mockDatum = Object.assign(Object.assign({}, getOriginDatum(info)), datum);
+        const mockDatum = (_f = info.data.originDatum) !== null && _f !== void 0 ? _f : Object.assign(Object.assign({}, getOriginDatum(info)), datum);
         const mockDimensionData = [
             {
                 datum: [mockDatum],
@@ -95784,7 +95754,7 @@ function showTooltip(datum, options, component) {
             changePositionOnly: false,
             tooltip: null,
             dimensionInfo: mockDimensionInfo,
-            chart: (_f = componentOptions.globalInstance.getChart()) !== null && _f !== void 0 ? _f : undefined,
+            chart: (_g = componentOptions.globalInstance.getChart()) !== null && _g !== void 0 ? _g : undefined,
             datum: mockDatum,
             model: info.series,
             source: Event_Source_Type.chart,
@@ -95849,6 +95819,40 @@ const getMarkInfoList = (datum, region) => {
                 series
             });
         };
+        const parseMarkInfoOfGeoSeries = () => {
+            var _a, _b;
+            const originDatum = (_b = (_a = series
+                .getMapViewData) === null || _a === void 0 ? void 0 : _a.call(series)) === null || _b === void 0 ? void 0 : _b.latestData.find((datum) => dimensionFields.every((key, i) => datum.properties[key] === (dimensionData === null || dimensionData === void 0 ? void 0 : dimensionData[i])));
+            let markInfoMeasureData = measureData;
+            if (!hasMeasureData) {
+                measureData = getDataArrayFromFieldArray(measureFields, originDatum);
+                markInfoMeasureData = measureData;
+                if (!hasData(measureData) && !originDatum) {
+                    return;
+                }
+                measureData = Object.assign({}, originDatum.properties);
+            }
+            const pos = series.type === SeriesTypeEnum.pie
+                ? series.dataToCentralPosition(originDatum.properties)
+                : series.dataToPosition(originDatum.properties);
+            if (isNil$1(pos) || isNaN(pos.x) || isNaN(pos.y)) {
+                return;
+            }
+            markInfoList.push({
+                pos,
+                data: {
+                    dimensionFields,
+                    dimensionData,
+                    measureFields,
+                    measureData: markInfoMeasureData,
+                    hasMeasureData,
+                    groupField,
+                    groupData,
+                    originDatum
+                },
+                series
+            });
+        };
         if (series.coordinate === 'cartesian') {
             const cartesianSeries = series;
             const dimType = isDiscrete((_f = (_e = series.getYAxisHelper()) === null || _e === void 0 ? void 0 : _e.getScale(0)) === null || _f === void 0 ? void 0 : _f.type) ? 'y' : 'x';
@@ -95973,7 +95977,7 @@ const getMarkInfoList = (datum, region) => {
             }
         }
         else if (series.coordinate === 'geo') {
-            parseMarkInfoOfSimpleSeries();
+            parseMarkInfoOfGeoSeries();
         }
     });
     return markInfoList;
@@ -96081,7 +96085,6 @@ class Tooltip extends BaseComponent {
         this.specKey = 'tooltip';
         this.layoutType = 'none';
         this._isReleased = false;
-        this.enable = true;
         this._alwaysShow = false;
         this._eventList = [];
         this._isTooltipShown = false;
@@ -103237,9 +103240,6 @@ 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);
@@ -103250,45 +103250,33 @@ class Brush extends BaseComponent {
         this._cacheInteractiveRangeAttrs.push(interactiveAttr);
         brush.addEventListener(IOperateType.brushActive, (e) => {
             this._initMarkBrushState(componentIndex, OUT_BRUSH_STATE);
-            this._emitEvent(ChartEvent.brushActive, region, e);
+            this._emitEvent(ChartEvent.brushActive, region);
         });
         brush.addEventListener(IOperateType.drawStart, (e) => {
-            if (this._spec.disableDimensionHoverWhenBrushing) {
-                this._option.globalInstance.disableDimensionHoverEvent(true);
-            }
             this._setRegionMarkPickable(region, true);
-            this._emitEvent(ChartEvent.brushStart, region, e);
+            this._emitEvent(ChartEvent.brushStart, region);
         });
         brush.addEventListener(IOperateType.moveStart, (e) => {
-            if (this._spec.disableDimensionHoverWhenBrushing) {
-                this._option.globalInstance.disableDimensionHoverEvent(true);
-            }
             this._setRegionMarkPickable(region, true);
-            this._emitEvent(ChartEvent.brushStart, region, e);
+            this._emitEvent(ChartEvent.brushStart, region);
         });
         brush.addEventListener(IOperateType.drawing, (e) => {
             this._setRegionMarkPickable(region, false);
             this._handleBrushChange(region, e);
-            this._emitEvent(ChartEvent.brushChange, region, e);
+            this._emitEvent(ChartEvent.brushChange, region);
         });
         brush.addEventListener(IOperateType.moving, (e) => {
             this._setRegionMarkPickable(region, false);
             this._handleBrushChange(region, e);
-            this._emitEvent(ChartEvent.brushChange, region, e);
+            this._emitEvent(ChartEvent.brushChange, region);
         });
         brush.addEventListener(IOperateType.brushClear, (e) => {
-            if (this._spec.disableDimensionHoverWhenBrushing) {
-                this._option.globalInstance.disableDimensionHoverEvent(false);
-            }
             this._setRegionMarkPickable(region, true);
             this._initMarkBrushState(componentIndex, '');
-            this._emitEvent(ChartEvent.brushClear, region, e);
+            this._emitEvent(ChartEvent.brushClear, region);
         });
         brush.addEventListener(IOperateType.drawEnd, (e) => {
             var _a;
-            if (this._spec.disableDimensionHoverWhenBrushing) {
-                this._option.globalInstance.disableDimensionHoverEvent(false);
-            }
             this._setRegionMarkPickable(region, true);
             const { operateMask } = e.detail;
             const { updateElementsState = true } = this._spec;
@@ -103296,11 +103284,11 @@ class Brush extends BaseComponent {
                 if (this._spec.onBrushEnd(e) === true) {
                     this.clearGraphic();
                     this._initMarkBrushState(componentIndex, '');
-                    this._emitEvent(ChartEvent.brushClear, region, e);
+                    this._emitEvent(ChartEvent.brushClear, region);
                 }
                 else {
                     this._spec.onBrushEnd(e);
-                    this._emitEvent(ChartEvent.brushEnd, region, e);
+                    this._emitEvent(ChartEvent.brushEnd, region);
                 }
             }
             else {
@@ -103308,13 +103296,10 @@ class Brush extends BaseComponent {
                 if ((!this._spec.zoomWhenEmpty && inBrushData.length > 0) || !updateElementsState) {
                     this._setAxisAndDataZoom(operateMask, region);
                 }
-                this._emitEvent(ChartEvent.brushEnd, region, e);
+                this._emitEvent(ChartEvent.brushEnd, region);
             }
         });
         brush.addEventListener(IOperateType.moveEnd, (e) => {
-            if (this._spec.disableDimensionHoverWhenBrushing) {
-                this._option.globalInstance.disableDimensionHoverEvent(false);
-            }
             this._setRegionMarkPickable(region, true);
             const { operateMask } = e.detail;
             const { updateElementsState = true } = this._spec;
@@ -103322,7 +103307,7 @@ class Brush extends BaseComponent {
             if ((!this._spec.zoomWhenEmpty && inBrushData.length > 0) || updateElementsState) {
                 this._setAxisAndDataZoom(operateMask, region);
             }
-            this._emitEvent(ChartEvent.brushEnd, region, e);
+            this._emitEvent(ChartEvent.brushEnd, region);
         });
     }
     _getBrushInteractiveAttr(region) {
@@ -103340,8 +103325,7 @@ class Brush extends BaseComponent {
                 maxX: seriesRegionEndX
             },
             xRange: [seriesRegionStartX, seriesRegionEndX],
-            yRange: [seriesRegionStartY, seriesRegionEndY],
-            interactive: this._shouldEnableInteractive()
+            yRange: [seriesRegionStartY, seriesRegionEndY]
         };
     }
     _transformBrushedMarkAttr(brushedStyle) {
@@ -103362,7 +103346,6 @@ 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);
@@ -103387,7 +103370,7 @@ class Brush extends BaseComponent {
         }
         return data;
     }
-    _emitEvent(eventType, region, e) {
+    _emitEvent(eventType, region) {
         var _a;
         this.event.emit(eventType, {
             model: this,
@@ -103404,8 +103387,7 @@ class Brush extends BaseComponent {
                 linkedOutOfBrushElementsMap: this._linkedOutOfBrushElementsMap,
                 zoomRecord: this._zoomRecord
             },
-            vchart: (_a = this._option) === null || _a === void 0 ? void 0 : _a.globalInstance,
-            event: e
+            vchart: (_a = this._option) === null || _a === void 0 ? void 0 : _a.globalInstance
         });
     }
     _reconfigItem(operateMask, region) {
@@ -103660,12 +103642,6 @@ class Brush extends BaseComponent {
             this._brushComponents = null;
         }
     }
-    clearBrushStateAndMask() {
-        this._relativeRegions.forEach((region, componentIndex) => {
-            this._initMarkBrushState(componentIndex, '');
-            this._brushComponents[componentIndex].children[0].removeAllChild();
-        });
-    }
 }
 Brush.type = ComponentTypeEnum.brush;
 Brush.builtInTheme = {