@visactor/vchart 2.0.13-alpha.9 → 2.0.13

package/build/index.js

@@ -16495,6 +16495,7 @@
         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;
@@ -18523,7 +18524,7 @@
         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 => {
@@ -35177,8 +35178,8 @@
       }
       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);
@@ -35227,11 +35228,10 @@
           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;
       }
@@ -51102,8 +51102,6 @@
     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,
@@ -51111,11 +51109,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.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() {
@@ -51127,7 +51125,6 @@
         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,
@@ -51136,7 +51133,6 @@
       }
       _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
@@ -51161,7 +51157,6 @@
       }
       _drawing(e) {
         var _a;
-        if (!1 === this.attribute.interactive) return;
         const pos = this.eventPosToStagePos(e),
           {
             brushType: brushType,
@@ -51186,7 +51181,6 @@
         (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;
@@ -51200,7 +51194,6 @@
         }), 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
@@ -51218,7 +51211,7 @@
         }
       }
       _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();
@@ -51325,10 +51318,6 @@
           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,
@@ -53874,7 +53863,7 @@
             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
                 });
@@ -54911,9 +54900,6 @@
         getRootGroup() {
             return this._rootGroup;
         }
-        getOption() {
-            return this._option;
-        }
         constructor(container, option) {
             this._count = 0;
             this._rootMarks = [];
@@ -58908,6 +58894,7 @@
             allGraphics.forEach((g, index) => {
                 g.context.graphicCount = graphicCount;
                 g.context.graphicIndex = index;
+                g.stateSort = this._stateSort;
             });
             this._dataByKey = newGroupedData;
             this._graphics = allGraphics;
@@ -58953,8 +58940,13 @@
             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;
                 }
@@ -58976,6 +58968,7 @@
                     }
                     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;
@@ -60390,7 +60383,6 @@
             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) {
@@ -60535,7 +60527,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();
@@ -61188,7 +61180,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;
             }
@@ -61429,22 +61421,6 @@
             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);
@@ -61773,7 +61749,7 @@
         });
     };
 
-    const version = "2.0.12";
+    const version = "2.0.13";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -64465,8 +64441,7 @@
             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;
@@ -64488,8 +64463,7 @@
                 }
             };
             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() : [] }));
@@ -71787,9 +71761,6 @@
         }
         shouldHandleTooltip(params, info) {
             var _a, _b;
-            if (!this.component.enable) {
-                return false;
-            }
             if (isNil$1(info)) {
                 return false;
             }
@@ -95674,7 +95645,7 @@
         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];
@@ -95694,12 +95665,11 @@
         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) => {
@@ -95773,7 +95743,7 @@
             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],
@@ -95790,7 +95760,7 @@
                 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,
@@ -95855,6 +95825,40 @@
                     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 === exports.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';
@@ -95979,7 +95983,7 @@
                 }
             }
             else if (series.coordinate === 'geo') {
-                parseMarkInfoOfSimpleSeries();
+                parseMarkInfoOfGeoSeries();
             }
         });
         return markInfoList;
@@ -96087,7 +96091,6 @@
             this.specKey = 'tooltip';
             this.layoutType = 'none';
             this._isReleased = false;
-            this.enable = true;
             this._alwaysShow = false;
             this._eventList = [];
             this._isTooltipShown = false;
@@ -103243,9 +103246,6 @@ 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);
@@ -103256,45 +103256,33 @@ 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, e);
+                this._emitEvent(exports.ChartEvent.brushActive, region);
             });
             brush.addEventListener(IOperateType.drawStart, (e) => {
-                if (this._spec.disableDimensionHoverWhenBrushing) {
-                    this._option.globalInstance.disableDimensionHoverEvent(true);
-                }
                 this._setRegionMarkPickable(region, true);
-                this._emitEvent(exports.ChartEvent.brushStart, region, e);
+                this._emitEvent(exports.ChartEvent.brushStart, region);
             });
             brush.addEventListener(IOperateType.moveStart, (e) => {
-                if (this._spec.disableDimensionHoverWhenBrushing) {
-                    this._option.globalInstance.disableDimensionHoverEvent(true);
-                }
                 this._setRegionMarkPickable(region, true);
-                this._emitEvent(exports.ChartEvent.brushStart, region, e);
+                this._emitEvent(exports.ChartEvent.brushStart, region);
             });
             brush.addEventListener(IOperateType.drawing, (e) => {
                 this._setRegionMarkPickable(region, false);
                 this._handleBrushChange(region, e);
-                this._emitEvent(exports.ChartEvent.brushChange, region, e);
+                this._emitEvent(exports.ChartEvent.brushChange, region);
             });
             brush.addEventListener(IOperateType.moving, (e) => {
                 this._setRegionMarkPickable(region, false);
                 this._handleBrushChange(region, e);
-                this._emitEvent(exports.ChartEvent.brushChange, region, e);
+                this._emitEvent(exports.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(exports.ChartEvent.brushClear, region, e);
+                this._emitEvent(exports.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;
@@ -103302,11 +103290,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, e);
+                        this._emitEvent(exports.ChartEvent.brushClear, region);
                     }
                     else {
                         this._spec.onBrushEnd(e);
-                        this._emitEvent(exports.ChartEvent.brushEnd, region, e);
+                        this._emitEvent(exports.ChartEvent.brushEnd, region);
                     }
                 }
                 else {
@@ -103314,13 +103302,10 @@ 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, e);
+                    this._emitEvent(exports.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;
@@ -103328,7 +103313,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, e);
+                this._emitEvent(exports.ChartEvent.brushEnd, region);
             });
         }
         _getBrushInteractiveAttr(region) {
@@ -103346,8 +103331,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     maxX: seriesRegionEndX
                 },
                 xRange: [seriesRegionStartX, seriesRegionEndX],
-                yRange: [seriesRegionStartY, seriesRegionEndY],
-                interactive: this._shouldEnableInteractive()
+                yRange: [seriesRegionStartY, seriesRegionEndY]
             };
         }
         _transformBrushedMarkAttr(brushedStyle) {
@@ -103368,7 +103352,6 @@ 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);
@@ -103393,7 +103376,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             return data;
         }
-        _emitEvent(eventType, region, e) {
+        _emitEvent(eventType, region) {
             var _a;
             this.event.emit(eventType, {
                 model: this,
@@ -103410,8 +103393,7 @@ 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,
-                event: e
+                vchart: (_a = this._option) === null || _a === void 0 ? void 0 : _a.globalInstance
             });
         }
         _reconfigItem(operateMask, region) {
@@ -103666,12 +103648,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 this._brushComponents = null;
             }
         }
-        clearBrushStateAndMask() {
-            this._relativeRegions.forEach((region, componentIndex) => {
-                this._initMarkBrushState(componentIndex, '');
-                this._brushComponents[componentIndex].children[0].removeAllChild();
-            });
-        }
     }
     Brush.type = ComponentTypeEnum.brush;
     Brush.builtInTheme = {