@visactor/vchart 2.0.0-alpha.4 → 2.0.0

package/build/index.es.js

@@ -23546,6 +23546,18 @@ class AbstractComponent extends Group$1 {
     const changeEvent = new CustomEvent(eventName, details);
     changeEvent.manager = null === (_a = this.stage) || void 0 === _a ? void 0 : _a.eventSystem.manager, this.dispatchEvent(changeEvent);
   }
+  eventPosToStagePos(e) {
+    var _a, _b;
+    const result = {
+        x: 0,
+        y: 0
+      },
+      stagePoints = null !== (_b = null === (_a = this.stage) || void 0 === _a ? void 0 : _a.eventPointTransform(e)) && void 0 !== _b ? _b : {
+        x: 0,
+        y: 0
+      };
+    return this.globalTransMatrix.transformPoint(stagePoints, result), result;
+  }
 }
 
 const MathPickerContribution = Symbol.for("MathPickerContribution");
@@ -31536,6 +31548,10 @@ class InterpolateUpdateStore {
       target.attribute.x = interpolateNumber(from, to, ratio), target.addUpdateBoundTag(), target.addUpdatePositionTag();
     }, this.y = (key, from, to, ratio, step, target) => {
       target.attribute.y = interpolateNumber(from, to, ratio), target.addUpdateBoundTag(), target.addUpdatePositionTag();
+    }, this.dx = (key, from, to, ratio, step, target) => {
+      target.attribute.dx = interpolateNumber(from, to, ratio), target.addUpdateBoundTag(), target.addUpdatePositionTag();
+    }, this.dy = (key, from, to, ratio, step, target) => {
+      target.attribute.dy = interpolateNumber(from, to, ratio), target.addUpdateBoundTag(), target.addUpdatePositionTag();
     }, this.angle = (key, from, to, ratio, step, target) => {
       target.attribute.angle = interpolateNumber(from, to, ratio), target.addUpdateBoundTag(), target.addUpdatePositionTag();
     }, this.scaleX = (key, from, to, ratio, step, target) => {
@@ -32396,7 +32412,10 @@ class AnimateExecutor {
   _handleRunAnimate(animate, custom, customType, from, props, duration, easing, customParameters, controlOptions, options, type, graphic) {
     var _a, _b, _c, _d;
     if (custom && customType) {
-      const customParams = this.resolveValue(customParameters, graphic, {}),
+      const customParams = this.resolveValue(customParameters, graphic, {
+          width: graphic.stage.width,
+          height: graphic.stage.height
+        }),
         objOptions = isFunction$1(options) ? options.call(null, null !== (_b = customParams && (null === (_a = customParams.data) || void 0 === _a ? void 0 : _a[0])) && void 0 !== _b ? _b : null === (_d = null === (_c = graphic.context) || void 0 === _c ? void 0 : _c.data) || void 0 === _d ? void 0 : _d[0], graphic, customParams) : options;
       customParams.options = objOptions, customParams.controlOptions = controlOptions, 1 === customType ? this.createCustomAnimation(animate, custom, from, props, duration, easing, customParams) : 2 === customType && this.createCustomInterpolatorAnimation(animate, custom, props, duration, easing, customParams);
     } else "to" === type ? animate.to(props, duration, easing) : "from" === type && animate.from(props, duration, easing);
@@ -35959,11 +35978,11 @@ class FromTo extends ACustomAnimate {
   }
   onBind() {
     var _a, _b;
-    super.onBind();
+    super.onBind(), Object.keys(this.from).forEach(key => {
+      null == this.props[key] && (this.props[key] = this.target.getGraphicAttribute(key));
+    });
     const finalAttribute = this.target.getFinalAttribute();
-    Object.keys(this.from).forEach(key => {
-      null == this.props[key] && (this.props[key] = finalAttribute[key]);
-    }), "appear" === (null === (_a = this.target.context) || void 0 === _a ? void 0 : _a.animationState) && finalAttribute && this.target.setAttributes(finalAttribute), !1 !== (null === (_b = this.params.controlOptions) || void 0 === _b ? void 0 : _b.immediatelyApply) && this.target.setAttributes(this.from);
+    "appear" === (null === (_a = this.target.context) || void 0 === _a ? void 0 : _a.animationState) && finalAttribute && this.target.setAttributes(finalAttribute), !1 !== (null === (_b = this.params.controlOptions) || void 0 === _b ? void 0 : _b.immediatelyApply) && this.target.setAttributes(this.from);
   }
   onFirstRun() {
     this.from = Object.assign(Object.assign({}, this.getLastProps()), this.from);
@@ -36969,7 +36988,7 @@ const labelOverlap = (prevLabel, nextLabel, gap = 0) => {
 const MIN_TICK_GAP = 12;
 const calculateFlushPos = (basePosition, size, rangePosition, otherEnd) => rangePosition < basePosition ? Math.max(basePosition - size / 2, rangePosition) : rangePosition > basePosition ? Math.min(basePosition - size / 2, rangePosition - size) : rangePosition < otherEnd ? rangePosition : rangePosition - size;
 const getCartesianLabelBounds = (scale, domain, op) => {
-  var _a;
+  var _a, _b, _c;
   const {
     labelStyle: labelStyle,
     axisOrientType: axisOrientType,
@@ -36985,27 +37004,32 @@ const getCartesianLabelBounds = (scale, domain, op) => {
     scaleY = 0;
   isHorizontal || (isVertical ? (scaleX = 0, scaleY = 1) : startAngle && (scaleX = Math.cos(startAngle), scaleY = -Math.sin(startAngle)));
   const textMeasure = initTextMeasure$1(labelStyle),
-    range = scale.range(),
-    labelBoundsList = domain.map((v, i) => {
-      var _a, _b;
-      const str = labelFormatter ? labelFormatter(v) : `${v}`,
-        {
-          width: width,
-          height: height
-        } = textMeasure.quickMeasure(str),
-        textWidth = Math.max(width, 12),
-        textHeight = Math.max(height, 12),
-        pos = scale.scale(v),
-        baseTextX = scaleX * pos,
-        baseTextY = scaleY * pos;
-      let align,
-        baseline,
-        textX = baseTextX,
-        textY = baseTextY;
-      labelFlush && isHorizontal && 0 === i ? textX = calculateFlushPos(baseTextX, textWidth, range[0], range[range.length - 1]) : labelFlush && isHorizontal && i === domain.length - 1 ? textX = calculateFlushPos(baseTextX, textWidth, range[range.length - 1], range[0]) : align = null !== (_a = labelStyle.textAlign) && void 0 !== _a ? _a : "center", "right" === align ? textX -= textWidth : "center" === align && (textX -= textWidth / 2), labelFlush && isVertical && 0 === i ? textY = calculateFlushPos(baseTextY, textHeight, range[0], range[range.length - 1]) : labelFlush && isVertical && i === domain.length - 1 ? textY = calculateFlushPos(baseTextY, textHeight, range[range.length - 1], range[0]) : baseline = null !== (_b = labelStyle.textBaseline) && void 0 !== _b ? _b : "middle", "bottom" === baseline ? textY -= textHeight : "middle" === baseline && (textY -= textHeight / 2);
-      const bounds = new AABBBounds().set(textX, textY, textX + textWidth, textY + textHeight);
-      return labelAngle && bounds.rotate(labelAngle, baseTextX, baseTextY), bounds;
-    });
+    range = scale.range();
+  let labelBoundsList = [];
+  for (let i = 0; i < domain.length; i++) {
+    const v = domain[i],
+      str = labelFormatter ? labelFormatter(v) : `${v}`;
+    if (isPlainObject$1(str)) {
+      labelBoundsList = void 0;
+      break;
+    }
+    const {
+        width: width,
+        height: height
+      } = textMeasure.quickMeasure(str),
+      textWidth = Math.max(width, 12),
+      textHeight = Math.max(height, 12),
+      pos = scale.scale(v),
+      baseTextX = scaleX * pos,
+      baseTextY = scaleY * pos;
+    let align,
+      baseline,
+      textX = baseTextX,
+      textY = baseTextY;
+    labelFlush && isHorizontal && 0 === i ? textX = calculateFlushPos(baseTextX, textWidth, range[0], range[range.length - 1]) : labelFlush && isHorizontal && i === domain.length - 1 ? textX = calculateFlushPos(baseTextX, textWidth, range[range.length - 1], range[0]) : align = null !== (_b = labelStyle.textAlign) && void 0 !== _b ? _b : "center", "right" === align ? textX -= textWidth : "center" === align && (textX -= textWidth / 2), labelFlush && isVertical && 0 === i ? textY = calculateFlushPos(baseTextY, textHeight, range[0], range[range.length - 1]) : labelFlush && isVertical && i === domain.length - 1 ? textY = calculateFlushPos(baseTextY, textHeight, range[range.length - 1], range[0]) : baseline = null !== (_c = labelStyle.textBaseline) && void 0 !== _c ? _c : "middle", "bottom" === baseline ? textY -= textHeight : "middle" === baseline && (textY -= textHeight / 2);
+    const bounds = new AABBBounds().set(textX, textY, textX + textWidth, textY + textHeight);
+    labelAngle && bounds.rotate(labelAngle, baseTextX, baseTextY), labelBoundsList.push(bounds);
+  }
   return labelBoundsList;
 };
 const isAxisHorizontal = axisOrientType => ["bottom", "top", "z"].includes(axisOrientType);
@@ -38025,7 +38049,7 @@ function forceItemVisible(sourceItem, items, check, comparator, inverse = !1) {
   }
 }
 const continuousTicks = (scale, op) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   if (!isContinuous(scale.type)) return convertDomainToTickData(scale.domain());
   const range = scale.range(),
     rangeSize = Math.abs(range[range.length - 1] - range[0]);
@@ -38077,23 +38101,25 @@ const continuousTicks = (scale, op) => {
         step = Math.floor(scaleTicks.length * MIN_FONT_SIZE / rangeSize);
       scaleTicks.forEach((tick, index) => {
         index % step != 0 && index !== scaleTicks.length - 1 || samplingScaleTicks.push(tick);
-      }), items = getCartesianLabelBounds(scale, samplingScaleTicks, op).map((bounds, i) => ({
+      }), items = null === (_c = getCartesianLabelBounds(scale, samplingScaleTicks, op)) || void 0 === _c ? void 0 : _c.map((bounds, i) => ({
         AABBBounds: bounds,
         value: samplingScaleTicks[i]
       }));
-    } else items = getCartesianLabelBounds(scale, scaleTicks, op).map((bounds, i) => ({
+    } else items = null === (_d = getCartesianLabelBounds(scale, scaleTicks, op)) || void 0 === _d ? void 0 : _d.map((bounds, i) => ({
       AABBBounds: bounds,
       value: scaleTicks[i]
     }));
-    const firstSourceItem = items[0],
-      lastSourceItem = last(items),
-      samplingMethod = breakData && breakData() ? methods$1.greedy : methods$1.parity;
-    for (; items.length >= 3 && hasOverlap$1(items, labelGap);) items = samplingMethod(items, labelGap);
-    const checkFirst = op.labelFirstVisible;
-    let checkLast = op.labelLastVisible;
-    textIntersect(firstSourceItem, lastSourceItem, labelGap) && items.includes(lastSourceItem) && items.length > 1 && checkFirst && checkLast && (items.splice(items.indexOf(lastSourceItem), 1), checkLast = !1), forceItemVisible(firstSourceItem, items, checkFirst, item => textIntersect(item, firstSourceItem, labelGap)), forceItemVisible(lastSourceItem, items, checkLast, item => textIntersect(item, lastSourceItem, labelGap) || !(!checkFirst || item === firstSourceItem) && textIntersect(item, firstSourceItem, labelGap), !0);
-    const ticks = items.map(item => item.value);
-    ticks.length < 3 && labelFlush && (ticks.length > 1 && ticks.pop(), last(ticks) !== last(scaleTicks) && ticks.push(last(scaleTicks))), scaleTicks = ticks;
+    if (items) {
+      const firstSourceItem = items[0],
+        lastSourceItem = last(items),
+        samplingMethod = breakData && breakData() ? methods$1.greedy : methods$1.parity;
+      for (; items.length >= 3 && hasOverlap$1(items, labelGap);) items = samplingMethod(items, labelGap);
+      const checkFirst = op.labelFirstVisible;
+      let checkLast = op.labelLastVisible;
+      textIntersect(firstSourceItem, lastSourceItem, labelGap) && items.includes(lastSourceItem) && items.length > 1 && checkFirst && checkLast && (items.splice(items.indexOf(lastSourceItem), 1), checkLast = !1), forceItemVisible(firstSourceItem, items, checkFirst, item => textIntersect(item, firstSourceItem, labelGap)), forceItemVisible(lastSourceItem, items, checkLast, item => textIntersect(item, lastSourceItem, labelGap) || !(!checkFirst || item === firstSourceItem) && textIntersect(item, firstSourceItem, labelGap), !0);
+      const ticks = items.map(item => item.value);
+      ticks.length < 3 && labelFlush && (ticks.length > 1 && ticks.pop(), last(ticks) !== last(scaleTicks) && ticks.push(last(scaleTicks))), scaleTicks = ticks;
+    }
   }
   return convertDomainToTickData(scaleTicks);
 };
@@ -38107,7 +38133,10 @@ const methods$1 = {
   }
 };
 
-const getOneDimensionalLabelBounds = (scale, domain, op, isHorizontal) => getCartesianLabelBounds(scale, domain, op).map(bounds => isHorizontal ? [bounds.x1, bounds.x2, bounds.width()] : [bounds.y1, bounds.y2, bounds.height()]),
+const getOneDimensionalLabelBounds = (scale, domain, op, isHorizontal) => {
+    const labelBoundsList = getCartesianLabelBounds(scale, domain, op);
+    return labelBoundsList && labelBoundsList.map(bounds => isHorizontal ? [bounds.x1, bounds.x2, bounds.width()] : [bounds.y1, bounds.y2, bounds.height()]);
+  },
   boundsOverlap = (prevBounds, nextBounds, gap = 0) => Math.max(prevBounds[0], nextBounds[0]) - gap / 2 <= Math.min(prevBounds[1], nextBounds[1]) + gap / 2;
 const boundsDistance = (prevBounds, nextBounds) => prevBounds[1] < nextBounds[0] ? nextBounds[0] - prevBounds[1] : nextBounds[1] < prevBounds[0] ? prevBounds[0] - nextBounds[1] : 0;
 const linearDiscreteTicks = (scale, op) => {
@@ -38138,23 +38167,27 @@ const linearDiscreteTicks = (scale, op) => {
       rangeStart = minInArray(range),
       rangeEnd = maxInArray(range);
     if (domain.length <= rangeSize / fontSize) {
-      const incrementUnit = (rangeEnd - rangeStart) / domain.length,
-        labelBoundsList = getOneDimensionalLabelBounds(scale, domain, op, isHorizontal),
-        minBoundsLength = Math.min(...labelBoundsList.map(bounds => bounds[2])),
-        stepResult = getStep$1(domain, labelBoundsList, labelGap, op.labelLastVisible, Math.floor(minBoundsLength / incrementUnit), !1);
-      scaleTicks = scale.stepTicks(stepResult.step), op.labelLastVisible && (stepResult.delCount && (scaleTicks = scaleTicks.slice(0, scaleTicks.length - stepResult.delCount)), scaleTicks.push(domain[domain.length - 1]));
+      const labelBoundsList = getOneDimensionalLabelBounds(scale, domain, op, isHorizontal);
+      if (labelBoundsList) {
+        const minBoundsLength = Math.min(...labelBoundsList.map(bounds => bounds[2])),
+          incrementUnit = (rangeEnd - rangeStart) / domain.length,
+          stepResult = getStep$1(domain, labelBoundsList, labelGap, op.labelLastVisible, Math.floor(minBoundsLength / incrementUnit), !1);
+        scaleTicks = scale.stepTicks(stepResult.step), op.labelLastVisible && (stepResult.delCount && (scaleTicks = scaleTicks.slice(0, scaleTicks.length - stepResult.delCount)), scaleTicks.push(domain[domain.length - 1]));
+      }
     } else {
       const tempDomain = [domain[0], domain[Math.floor(domain.length / 2)], domain[domain.length - 1]],
         tempList = getOneDimensionalLabelBounds(scale, tempDomain, op, isHorizontal);
-      let maxBounds = null;
-      tempList.forEach(current => {
-        maxBounds ? maxBounds[2] < current[2] && (maxBounds = current) : maxBounds = current;
-      });
-      const step = rangeEnd - rangeStart - labelGap > 0 ? Math.ceil(domain.length * (labelGap + maxBounds[2]) / (rangeEnd - rangeStart - labelGap)) : domain.length - 1;
-      scaleTicks = scale.stepTicks(step), !op.labelLastVisible || scaleTicks.length && scaleTicks[scaleTicks.length - 1] === domain[domain.length - 1] || (scaleTicks.length && Math.abs(scale.scale(scaleTicks[scaleTicks.length - 1]) - scale.scale(domain[domain.length - 1])) < maxBounds[2] && (scaleTicks = scaleTicks.slice(0, -1)), scaleTicks.push(domain[domain.length - 1]));
+      if (tempList) {
+        let maxBounds = null;
+        tempList.forEach(current => {
+          maxBounds ? maxBounds[2] < current[2] && (maxBounds = current) : maxBounds = current;
+        });
+        const step = rangeEnd - rangeStart - labelGap > 0 ? Math.ceil(domain.length * (labelGap + maxBounds[2]) / (rangeEnd - rangeStart - labelGap)) : domain.length - 1;
+        scaleTicks = scale.stepTicks(step), !op.labelLastVisible || scaleTicks.length && scaleTicks[scaleTicks.length - 1] === domain[domain.length - 1] || (scaleTicks.length && Math.abs(scale.scale(scaleTicks[scaleTicks.length - 1]) - scale.scale(domain[domain.length - 1])) < maxBounds[2] && (scaleTicks = scaleTicks.slice(0, -1)), scaleTicks.push(domain[domain.length - 1]));
+      }
     }
-  } else scaleTicks = scale.domain();
-  return convertDomainToTickData(scaleTicks);
+  }
+  return isNil$1(scaleTicks) && (scaleTicks = scale.domain()), convertDomainToTickData(scaleTicks);
 };
 const getStep$1 = (domain, labelBoundsList, labelGap, labelLastVisible, defaultStep, areAllBoundsSame) => {
   let resultDelCount = 0,
@@ -41050,13 +41083,6 @@ let DataZoom$1 = class DataZoom extends AbstractComponent {
       end: end
     }));
   }
-  eventPosToStagePos(e) {
-    var _a, _b;
-    return null !== (_b = null === (_a = this.stage) || void 0 === _a ? void 0 : _a.eventPointTransform(e)) && void 0 !== _b ? _b : {
-      x: 0,
-      y: 0
-    };
-  }
   _clearDragEvents() {
     const evtTarget = "browser" === vglobal.env ? vglobal : this.stage,
       triggers = getEndTriggersOfDrag();
@@ -41215,7 +41241,13 @@ let DataZoom$1 = class DataZoom extends AbstractComponent {
       } = this.attribute.startTextStyle;
     if (new Bounds().set(x1, y1, x2, y2).intersects(endTextBounds)) {
       const direction = "bottom" === this.attribute.orient || "right" === this.attribute.orient ? -1 : 1;
-      this._isHorizontal ? this._startText.setAttribute("dy", startTextDy + direction * Math.abs(endTextBounds.y1 - endTextBounds.y2)) : this._startText.setAttribute("dx", startTextDx + direction * Math.abs(endTextBounds.x1 - endTextBounds.x2));
+      if (this._isHorizontal) {
+        const boundsYDiff = Math.abs(endTextBounds.y1 - endTextBounds.y2);
+        this._startText.setAttribute("dy", startTextDy + direction * (Number.isFinite(boundsYDiff) ? boundsYDiff : 0));
+      } else {
+        const boundsXDiff = Math.abs(endTextBounds.x1 - endTextBounds.x2);
+        this._startText.setAttribute("dx", startTextDx + direction * (Number.isFinite(boundsXDiff) ? boundsXDiff : 0));
+      }
     } else this._isHorizontal ? this._startText.setAttribute("dy", startTextDy) : this._startText.setAttribute("dx", startTextDx);
   }
   getLayoutAttrFromConfig() {
@@ -46365,8 +46397,7 @@ const delayMap$1 = {
 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._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 (this._outOfInteractiveRange(e)) return void (this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)));
+    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 => {
       const {
         updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger,
         endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
@@ -46394,7 +46425,7 @@ let Brush$1 = class Brush extends AbstractComponent {
         brushMode: brushMode
       } = this.attribute,
       pos = this.eventPosToStagePos(e);
-    this._cacheDrawPoints.push(pos), "single" === brushMode && this._clearMask(), this._addBrushMask(), this._dispatchBrushEvent(IOperateType.drawStart, e), 1 === Object.keys(this._brushMaskAABBBoundsDict).length && this._dispatchBrushEvent(IOperateType.brushActive, e);
+    this._cacheDrawPoints.push(pos), "single" === brushMode && this._clearMask(), this._addBrushMask(), this._dispatchBrushEvent(IOperateType.drawStart, e), this._activeBrushState = !1;
   }
   _initMove(e) {
     var _a, _b;
@@ -46424,7 +46455,8 @@ let Brush$1 = class Brush extends AbstractComponent {
     var _a;
     const pos = this.eventPosToStagePos(e),
       {
-        brushType: brushType
+        brushType: brushType,
+        sizeThreshold = DEFAULT_SIZE_THRESHOLD
       } = this.attribute,
       cacheLength = this._cacheDrawPoints.length;
     if (cacheLength > 0) {
@@ -46433,7 +46465,16 @@ let Brush$1 = class Brush extends AbstractComponent {
     }
     "polygon" === brushType || cacheLength <= 1 ? this._cacheDrawPoints.push(pos) : this._cacheDrawPoints[cacheLength - 1] = pos;
     const maskPoints = this._computeMaskPoints();
-    this._operatingMask.setAttribute("points", maskPoints), this._dispatchBrushEvent(IOperateType.drawing, e);
+    this._operatingMask.setAttribute("points", maskPoints);
+    const {
+        x: x1,
+        y: y1
+      } = this._startPos,
+      {
+        x: x2,
+        y: y2
+      } = this.eventPosToStagePos(e);
+    (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) {
     const startPos = this._cacheMovePoint,
@@ -46573,9 +46614,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;
   }
-  eventPosToStagePos(e) {
-    return this.stage.eventPointTransform(e);
-  }
   _dispatchBrushEvent(operateType, e) {
     this._dispatchEvent(operateType, {
       operateMask: this._operatingMask,
@@ -46584,7 +46622,7 @@ let Brush$1 = class Brush extends AbstractComponent {
     });
   }
   _clearMask() {
-    this._brushMaskAABBBoundsDict = {}, this._container.incrementalClearChild(), this._operatingMask = null;
+    this._brushMaskAABBBoundsDict = {}, this._container.removeAllChild(), this._operatingMask = null;
   }
   _isEmptyMask() {
     return isEmpty(this._brushMaskAABBBoundsDict) || Object.keys(this._brushMaskAABBBoundsDict).every(key => this._brushMaskAABBBoundsDict[key].empty());
@@ -53163,20 +53201,24 @@ class BaseMark extends GrammarItem {
         return this._animationConfig;
     }
     setAnimationConfig(config) {
-        const animationConfig = Object.assign({}, config);
-        Object.keys(animationConfig).forEach(key => {
-            const value = animationConfig[key];
+        const defaultPrams = this.type === 'group' ? { selfOnly: true } : {};
+        const animationConfig = {};
+        Object.keys(config).forEach(key => {
+            const value = config[key];
             if (isArray$1(value)) {
-                value.forEach(item => {
+                animationConfig[key] = value.map(item => {
                     var _a;
                     const options = (_a = item.options) !== null && _a !== void 0 ? _a : {};
-                    item.options = (...args) => {
-                        var _a, _b;
-                        const _options = typeof options === 'function' ? options(...args) : options;
-                        return Object.assign(Object.assign({}, _options), { layoutRect: (_b = (_a = this.model).getLayoutRect) === null || _b === void 0 ? void 0 : _b.call(_a) });
-                    };
+                    return Object.assign(Object.assign(Object.assign({}, defaultPrams), item), { options: (...args) => {
+                            var _a, _b;
+                            const _options = typeof options === 'function' ? options(...args) : options;
+                            return Object.assign(Object.assign({}, _options), { layoutRect: (_b = (_a = this.model).getLayoutRect) === null || _b === void 0 ? void 0 : _b.call(_a) });
+                        } });
                 });
             }
+            else {
+                animationConfig[key] = Object.assign(Object.assign({}, defaultPrams), config[key]);
+            }
         });
         this._animationConfig = animationConfig;
     }
@@ -56724,7 +56766,7 @@ const lookup = (data, opt) => {
     });
 };
 
-const version = "2.0.0-alpha.4";
+const version = "2.0.0";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -60669,7 +60711,7 @@ function getDatumByValue(data, value, startField, endField) {
 const getCartesianCrosshairTheme = (getTheme, chartSpec) => {
     var _a, _b;
     const axes = array((_a = chartSpec.axes) !== null && _a !== void 0 ? _a : []);
-    const { bandField, linearField, xField, yField } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, getTheme)) !== null && _b !== void 0 ? _b : {};
+    const { bandField, linearField, xField, yField, trigger, triggerOff } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, getTheme)) !== null && _b !== void 0 ? _b : {};
     const xAxis = axes.find(axis => isXAxis(axis.orient));
     let newXField;
     if (isValid$1(xAxis)) {
@@ -60688,13 +60730,15 @@ const getCartesianCrosshairTheme = (getTheme, chartSpec) => {
     }
     return {
         xField: newXField,
-        yField: newYField
+        yField: newYField,
+        trigger,
+        triggerOff
     };
 };
 const getPolarCrosshairTheme = (getTheme, chartSpec) => {
     var _a, _b;
     const axes = array((_a = chartSpec.axes) !== null && _a !== void 0 ? _a : []);
-    const { bandField, linearField, categoryField, valueField } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, getTheme)) !== null && _b !== void 0 ? _b : {};
+    const { bandField, linearField, categoryField, valueField, trigger, triggerOff } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, getTheme)) !== null && _b !== void 0 ? _b : {};
     const angleAxis = axes.find(axis => axis.orient === 'angle');
     let newAngleField;
     if (isValid$1(angleAxis)) {
@@ -60713,7 +60757,9 @@ const getPolarCrosshairTheme = (getTheme, chartSpec) => {
     }
     return {
         categoryField: newAngleField,
-        valueField: newRadiusField
+        valueField: newRadiusField,
+        trigger,
+        triggerOff
     };
 };
 
@@ -66229,9 +66275,11 @@ const layoutByValue$1 = (stateByField, series, layoutStartPoint, enableRemain =
         layoutStartPoint = { x: 0, y: 0 };
     }
     Object.keys(stateByField).forEach(field => {
+        var _a, _b, _c, _d, _e;
         const { currentValue, cacheInfo, labelsComp, attributes, coordKey } = stateByField[field];
         let axis = null;
         let coord = 0;
+        let axisLabel = null;
         if (currentValue.size) {
             const item = Array.from(currentValue.values())[0];
             coord =
@@ -66239,6 +66287,8 @@ const layoutByValue$1 = (stateByField, series, layoutStartPoint, enableRemain =
                     item.axis.getLayoutStartPoint()[coordKey] -
                     layoutStartPoint[coordKey];
             axis = item.axis;
+            axisLabel = (_e = (_d = (_c = (_b = (_a = axis
+                .getVRenderComponents()[0]) === null || _a === void 0 ? void 0 : _a.children[0]) === null || _b === void 0 ? void 0 : _b.children[0]) === null || _c === void 0 ? void 0 : _c.getChildByName('axis-label-container')) === null || _d === void 0 ? void 0 : _d.getChildByName('axis-label-container-layer-0')) === null || _e === void 0 ? void 0 : _e.children[0];
         }
         const isVisible = !!currentValue.size && Number.isFinite(coord) && !Number.isNaN(coord);
         const useCache = enableRemain && !isVisible && isValid$1(cacheInfo);
@@ -66256,7 +66306,8 @@ const layoutByValue$1 = (stateByField, series, layoutStartPoint, enableRemain =
                     }, {})
                     : null,
                 visible: isVisible,
-                axis
+                axis,
+                axisLabel: axisLabel
             };
         if (newCacheInfo) {
             newCacheInfo._isCache = useCache;
@@ -66265,7 +66316,7 @@ const layoutByValue$1 = (stateByField, series, layoutStartPoint, enableRemain =
         let offsetSize = 0;
         if (attributes) {
             currentValue.forEach(({ axis, datum: value = '' }) => {
-                var _a;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                 let niceLabelFormatter = null;
                 const scale = axis.getScale();
                 if (isDiscrete(scale.type)) {
@@ -66294,36 +66345,37 @@ const layoutByValue$1 = (stateByField, series, layoutStartPoint, enableRemain =
                 if (newCacheInfo && ((_a = attributes.label) === null || _a === void 0 ? void 0 : _a.visible) && !useCache) {
                     const labelOffset = getAxisLabelOffset(axis.getSpec());
                     const axisOrient = axis.getOrient();
+                    const syncAxisLabelAngle = (_b = attributes.label) === null || _b === void 0 ? void 0 : _b.syncAxisLabelAngle;
                     if (newCacheInfo.labels[axisOrient]) {
                         newCacheInfo.labels[axisOrient].visible = true;
                         newCacheInfo.labels[axisOrient].text = value;
                         if (axisOrient === 'left') {
                             newCacheInfo.labels[axisOrient].dx = -labelOffset;
                             newCacheInfo.labelsTextStyle[axisOrient] = {
-                                textAlign: 'right',
-                                textBaseline: 'middle'
+                                textAlign: syncAxisLabelAngle && axisLabel ? (_c = axisLabel.attribute.textAlign) !== null && _c !== void 0 ? _c : 'right' : 'right',
+                                textBaseline: syncAxisLabelAngle && axisLabel ? (_d = axisLabel.attribute.textBaseline) !== null && _d !== void 0 ? _d : 'middle' : 'middle'
                             };
                         }
                         else if (axisOrient === 'right') {
                             newCacheInfo.labels[axisOrient].dx = labelOffset;
                             newCacheInfo.labelsTextStyle[axisOrient] = {
-                                textAlign: 'left',
-                                textBaseline: 'middle'
+                                textAlign: syncAxisLabelAngle && axisLabel ? (_e = axisLabel.attribute.textAlign) !== null && _e !== void 0 ? _e : 'left' : 'left',
+                                textBaseline: syncAxisLabelAngle && axisLabel ? (_f = axisLabel.attribute.textBaseline) !== null && _f !== void 0 ? _f : 'middle' : 'middle'
                             };
                         }
                         else if (axisOrient === 'top') {
                             newCacheInfo.labels[axisOrient].y = 0;
                             newCacheInfo.labels[axisOrient].dy = -labelOffset;
                             newCacheInfo.labelsTextStyle[axisOrient] = {
-                                textAlign: 'center',
-                                textBaseline: 'bottom'
+                                textAlign: syncAxisLabelAngle && axisLabel ? (_g = axisLabel.attribute.textAlign) !== null && _g !== void 0 ? _g : 'center' : 'center',
+                                textBaseline: syncAxisLabelAngle && axisLabel ? (_h = axisLabel.attribute.textBaseline) !== null && _h !== void 0 ? _h : 'bottom' : 'bottom'
                             };
                         }
                         else if (axisOrient === 'bottom') {
                             newCacheInfo.labels[axisOrient].dy = labelOffset;
                             newCacheInfo.labelsTextStyle[axisOrient] = {
-                                textAlign: 'center',
-                                textBaseline: 'top'
+                                textAlign: syncAxisLabelAngle && axisLabel ? (_j = axisLabel.attribute.textAlign) !== null && _j !== void 0 ? _j : 'center' : 'center',
+                                textBaseline: syncAxisLabelAngle && axisLabel ? (_k = axisLabel.attribute.textBaseline) !== null && _k !== void 0 ? _k : 'top' : 'top'
                             };
                         }
                         newCacheInfo.labels[axisOrient].defaultFormatter = niceLabelFormatter;
@@ -67473,6 +67525,26 @@ class BarSeries extends CartesianSeries {
         this._barMarkType = "rect";
         this.transformerConstructor = BarSeriesSpecTransformer;
         this._bandPosition = 0;
+        this._getLinearBarRange = (start, end) => {
+            let [x, x1] = [start, end].sort((a, b) => a - b);
+            const realBarWidth = x1 - x;
+            if (this._spec.barGap) {
+                const halfBarGap = this._spec.barGap * 0.5;
+                const tempX = x + halfBarGap;
+                const tempX1 = x1 - halfBarGap;
+                x = tempX;
+                x1 = tempX1;
+            }
+            const curBarWidth = x1 - x;
+            const barMinWidth = getActualNumValue(this._spec.barMinWidth || 2, realBarWidth);
+            if (curBarWidth < barMinWidth) {
+                const widthDiff = barMinWidth - curBarWidth;
+                const halfWidthDiff = widthDiff / 2;
+                x -= halfWidthDiff;
+                x1 += halfWidthDiff;
+            }
+            return [x, x1];
+        };
         this._getBarXStart = (datum, scale, useWholeRange) => {
             if (this._shouldDoPreCalculate()) {
                 this._calculateStackRectPosition(false);
@@ -67490,6 +67562,11 @@ class BarSeries extends CartesianSeries {
             }
             return valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
         };
+        this._getLinearBarXRange = (datum, scale, useWholeRange) => {
+            const x = valueInScaleRange(this._dataToPosX(datum), scale, useWholeRange);
+            const x1 = valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
+            return this._getLinearBarRange(x, x1);
+        };
         this._getBarYStart = (datum, scale) => {
             if (this._shouldDoPreCalculate()) {
                 this._calculateStackRectPosition(true);
@@ -67507,6 +67584,11 @@ class BarSeries extends CartesianSeries {
             }
             return valueInScaleRange(this._dataToPosY1(datum), scale);
         };
+        this._getLinearBarYRange = (datum, scale, useWholeRange) => {
+            const y = valueInScaleRange(this._dataToPosY(datum), scale, useWholeRange);
+            const y1 = valueInScaleRange(this._dataToPosY1(datum), scale, useWholeRange);
+            return this._getLinearBarRange(y, y1);
+        };
         this._getBarBackgroundXStart = (scale) => {
             const range = scale.range();
             const min = Math.min(range[0], range[range.length - 1]);
@@ -67860,8 +67942,8 @@ class BarSeries extends CartesianSeries {
         if (this.direction === "horizontal") {
             const yChannels = isValid$1(this._fieldY2)
                 ? {
-                    y: (datum) => valueInScaleRange(this._dataToPosY(datum), yScale, true),
-                    y1: (datum) => valueInScaleRange(this._dataToPosY1(datum), yScale, true)
+                    y: (datum) => this._getLinearBarYRange(datum, yScale, true)[0],
+                    y1: (datum) => this._getLinearBarYRange(datum, yScale, true)[1]
                 }
                 : {
                     y: (datum) => valueInScaleRange(this._dataToPosY(datum) - this._getBarWidth(this._yAxisHelper) / 2, yScale, true),
@@ -67873,8 +67955,8 @@ class BarSeries extends CartesianSeries {
         else {
             const xChannels = isValid$1(this._fieldX2)
                 ? {
-                    x: (datum) => valueInScaleRange(this._dataToPosX(datum), xScale, true),
-                    x1: (datum) => valueInScaleRange(this._dataToPosX1(datum), xScale, true)
+                    x: (datum) => this._getLinearBarXRange(datum, xScale, true)[0],
+                    x1: (datum) => this._getLinearBarXRange(datum, xScale, true)[1]
                 }
                 : {
                     x: (datum) => valueInScaleRange(this._dataToPosX(datum) - this._getBarWidth(this._xAxisHelper) / 2, xScale, true),
@@ -87086,7 +87168,7 @@ class BaseHistogramChartSpecTransformer extends CartesianChartSpecTransformer {
         spec.axes.forEach((axis) => (axis.type = 'linear'));
     }
     _getDefaultSeriesSpec(spec) {
-        return super._getDefaultSeriesSpec(spec, ['x2Field', 'y2Field', 'barMinHeight', 'barBackground']);
+        return super._getDefaultSeriesSpec(spec, ['x2Field', 'y2Field', 'barMinHeight', 'barBackground', 'barGap']);
     }
 }
 
@@ -89378,11 +89460,13 @@ class TooltipSpecTransformer extends BaseComponentSpecTransformer {
         return false;
     }
     _initTheme(spec, chartSpec) {
-        var _a;
+        var _a, _b, _c;
         const { spec: newSpec, theme } = super._initTheme(spec, chartSpec);
         newSpec.style = mergeSpec({}, this._theme, newSpec.style);
         newSpec.offset = mergeSpec({}, theme.offset, spec.offset);
         newSpec.transitionDuration = (_a = spec.transitionDuration) !== null && _a !== void 0 ? _a : theme.transitionDuration;
+        newSpec.trigger = (_b = spec.trigger) !== null && _b !== void 0 ? _b : theme.trigger;
+        newSpec.triggerOff = (_c = spec.triggerOff) !== null && _c !== void 0 ? _c : theme.triggerOff;
         return { spec: newSpec, theme };
     }
     _transformSpecAfterMergingTheme(spec, chartSpec, chartSpecInfo) {
@@ -90372,7 +90456,7 @@ class BaseCrossHair extends BaseComponent {
         }
     }
     _parseField(field, fieldName) {
-        var _a, _b;
+        var _a, _b, _c;
         const hair = {};
         const { line = {}, label = {}, visible } = field;
         hair.visible = visible;
@@ -90383,7 +90467,7 @@ class BaseCrossHair extends BaseComponent {
         else {
             const style = line.style || {};
             const { stroke, fill, lineWidth } = style;
-            const _c = style, { strokeOpacity, fillOpacity, opacity } = _c, restStyle = __rest$e(_c, ["strokeOpacity", "fillOpacity", "opacity"]);
+            const _d = style, { strokeOpacity, fillOpacity, opacity } = _d, restStyle = __rest$e(_d, ["strokeOpacity", "fillOpacity", "opacity"]);
             const isLineType = hair.type === 'line';
             let finalOpacity = isLineType ? strokeOpacity : fillOpacity;
             if (isNumber$1(opacity)) {
@@ -90411,8 +90495,9 @@ class BaseCrossHair extends BaseComponent {
         }
         if (!!label.visible) {
             const labelBackground = label.labelBackground || {};
+            const syncAxisLabelAngle = (_c = label.syncAxisLabelAngle) !== null && _c !== void 0 ? _c : false;
             const labelStyle = label.style || {};
-            const _d = labelBackground.style || {}, { fill: rectFill = 'rgba(47, 59, 82, 0.9)', stroke: rectStroke, outerBorder } = _d, rectStyle = __rest$e(_d, ["fill", "stroke", "outerBorder"]);
+            const _e = labelBackground.style || {}, { fill: rectFill = 'rgba(47, 59, 82, 0.9)', stroke: rectStroke, outerBorder } = _e, rectStyle = __rest$e(_e, ["fill", "stroke", "outerBorder"]);
             hair.label = {
                 visible: true,
                 formatMethod: label.formatMethod,
@@ -90420,6 +90505,7 @@ class BaseCrossHair extends BaseComponent {
                 minWidth: labelBackground.minWidth,
                 maxWidth: labelBackground.maxWidth,
                 padding: labelBackground.padding,
+                syncAxisLabelAngle,
                 textStyle: Object.assign(Object.assign({ fontSize: 14, pickable: false }, labelStyle), { fill: labelStyle.fill || '#fff', stroke: get$1(labelStyle, 'stroke') }),
                 panel: (isBoolean$1(labelBackground.visible) ? labelBackground.visible : !!labelBackground)
                     ? Object.assign({ visible: true, pickable: false, fill: rectFill, stroke: rectStroke, outerBorder: Object.assign({ stroke: rectFill, distance: 0, lineWidth: 3 }, outerBorder) }, rectStyle) : { visible: false },
@@ -90687,9 +90773,9 @@ class CartesianCrossHair extends BaseCrossHair {
             const positionAttribute = layoutCrosshair$1(this._stateByField[field]);
             this._updateCrosshairByField(field, positionAttribute);
             Object.keys(labels).forEach(labelKey => {
-                var _a;
+                var _a, _b, _c;
                 if (labels[labelKey].visible) {
-                    const updateAttrs = Object.assign(Object.assign(Object.assign({ [coordKey]: coord + bandSize / 2 }, labels[labelKey]), attributes.label), { textStyle: Object.assign(Object.assign({}, (_a = attributes.label) === null || _a === void 0 ? void 0 : _a.textStyle), labelsTextStyle[labelKey]), zIndex: this.labelZIndex, visible: true });
+                    const updateAttrs = Object.assign(Object.assign(Object.assign({ [coordKey]: coord + bandSize / 2 }, labels[labelKey]), attributes.label), { angle: attributes.label.syncAxisLabelAngle ? (_b = (_a = cacheInfo.axisLabel) === null || _a === void 0 ? void 0 : _a.attribute.angle) !== null && _b !== void 0 ? _b : 0 : 0, textStyle: Object.assign(Object.assign({}, (_c = attributes.label) === null || _c === void 0 ? void 0 : _c.textStyle), labelsTextStyle[labelKey]), zIndex: this.labelZIndex, visible: true });
                     this._updateCrosshairLabel(labelsComp[labelKey], updateAttrs, label => {
                         label.name = `crosshair-${field.replace('Field', '')}-${labelKey}-label`;
                         labelsComp[labelKey] = label;
@@ -92830,7 +92916,9 @@ function getXValue(datum, xDomain, autoRange, refSeries, regionWidth, regionStar
         x = convertPercentToValue(datum.x, regionWidth) + regionStartLayoutStartPoint.x;
     }
     else {
-        x = relativeSeries.getXAxisHelper().dataToPosition([datum.x]) + regionStartLayoutStartPoint.x;
+        x =
+            convertDatumToValue(relativeSeries.getXAxisHelper(), [datum.x]) +
+                regionStartLayoutStartPoint.x;
     }
     return x;
 }
@@ -92845,7 +92933,9 @@ function getYValue(datum, yDomain, autoRange, refSeries, regionHeight, regionSta
         y = convertPercentToValue(datum.y, regionHeight) + regionStartLayoutStartPoint.y;
     }
     else {
-        y = relativeSeries.getYAxisHelper().dataToPosition([datum.y]) + regionStartLayoutStartPoint.y;
+        y =
+            convertDatumToValue(relativeSeries.getYAxisHelper(), [datum.y]) +
+                regionStartLayoutStartPoint.y;
     }
     return y;
 }
@@ -92855,7 +92945,7 @@ function getAngleValue(datum, angleDomain, autoRange, refSeries) {
     isNumber$1(datum.angle) &&
         isNeedExtendDomain(angleDomain, datum.angle, autoRange) &&
         ((_b = (_a = relativeSeries.angleAxisHelper) === null || _a === void 0 ? void 0 : _a.setExtendDomain) === null || _b === void 0 ? void 0 : _b.call(_a, 'marker_angleAxis_extend', datum.angle));
-    return relativeSeries.angleAxisHelper.dataToPosition([datum.angle]);
+    return convertDatumToValue(relativeSeries.angleAxisHelper, [datum.angle]);
 }
 function getRadiusValue(datum, radiusDomain, autoRange, refSeries) {
     var _a, _b;
@@ -92863,11 +92953,18 @@ function getRadiusValue(datum, radiusDomain, autoRange, refSeries) {
     isNumber$1(datum.radius) &&
         isNeedExtendDomain(radiusDomain, datum.radius, autoRange) &&
         ((_b = (_a = relativeSeries.radiusAxisHelper) === null || _a === void 0 ? void 0 : _a.setExtendDomain) === null || _b === void 0 ? void 0 : _b.call(_a, 'marker_radiusAxis_extend', datum.radius));
-    return relativeSeries.radiusAxisHelper.dataToPosition([datum.radius]);
+    return convertDatumToValue(relativeSeries.radiusAxisHelper, [datum.radius]);
 }
 function convertPercentToValue(percent, relativeLength) {
     return (Number(percent.substring(0, percent.length - 1)) * relativeLength) / 100;
 }
+function convertDatumToValue(axisHelper, datum) {
+    const scale = axisHelper.getScale(0);
+    if (isContinuous(scale.type) && scale.domain()[0] === scale.domain()[1] && datum[0] !== scale.domain()[0]) {
+        return NaN;
+    }
+    return axisHelper.dataToPosition(datum);
+}
 function isAggrSpec(spec) {
     return AGGR_TYPE.includes(spec);
 }
@@ -93032,8 +93129,8 @@ function cartesianCoordinateLayout(data, relativeSeries, autoRange, coordinatesO
             isNeedExtendDomain(yDomain, yValue[0], autoRange) &&
             ((_d = (_c = refRelativeSeries.getYAxisHelper()) === null || _c === void 0 ? void 0 : _c.setExtendDomain) === null || _d === void 0 ? void 0 : _d.call(_c, 'marker_yAxis_extend', yValue[0]));
         points.push({
-            x: refRelativeSeries.getXAxisHelper().dataToPosition(xValue) + regionStartLayoutStartPoint.x + offsetX,
-            y: refRelativeSeries.getYAxisHelper().dataToPosition(yValue) + regionStartLayoutStartPoint.y + offsetY
+            x: convertDatumToValue(refRelativeSeries.getXAxisHelper(), xValue) + regionStartLayoutStartPoint.x + offsetX,
+            y: convertDatumToValue(refRelativeSeries.getYAxisHelper(), yValue) + regionStartLayoutStartPoint.y + offsetY
         });
     });
     return points;
@@ -93057,8 +93154,8 @@ function polarCoordinateLayout(data, relativeSeries, autoRange) {
             isNeedExtendDomain(radiusDomain, radiusValue[0], autoRange) &&
             ((_d = (_c = refRelativeSeries.radiusAxisHelper) === null || _c === void 0 ? void 0 : _c.setExtendDomain) === null || _d === void 0 ? void 0 : _d.call(_c, 'marker_yAxis_extend', radiusValue[0]));
         points.push({
-            angle: refRelativeSeries.angleAxisHelper.dataToPosition(angleValue),
-            radius: refRelativeSeries.radiusAxisHelper.dataToPosition(radiusValue)
+            angle: convertDatumToValue(refRelativeSeries.angleAxisHelper, angleValue),
+            radius: convertDatumToValue(refRelativeSeries.radiusAxisHelper, radiusValue)
         });
     });
     return points;
@@ -96141,7 +96238,6 @@ class Brush extends BaseComponent {
         this._linkedInBrushElementsMap = {};
         this._linkedOutOfBrushElementsMap = {};
         this._cacheInteractiveRangeAttrs = [];
-        this._needDisablePickable = false;
         this._releatedAxes = [];
         this._regionAxisMap = {};
         this._axisDataZoomMap = {};
@@ -96293,34 +96389,36 @@ class Brush extends BaseComponent {
             this._emitEvent(ChartEvent.brushActive, region);
         });
         brush.addEventListener(IOperateType.drawStart, (e) => {
+            this._setRegionMarkPickable(region, true);
             this._emitEvent(ChartEvent.brushStart, region);
         });
         brush.addEventListener(IOperateType.moveStart, (e) => {
+            this._setRegionMarkPickable(region, true);
             this._emitEvent(ChartEvent.brushStart, region);
         });
         brush.addEventListener(IOperateType.drawing, (e) => {
-            this._needDisablePickable = true;
+            this._setRegionMarkPickable(region, false);
             this._handleBrushChange(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);
         });
         brush.addEventListener(IOperateType.brushClear, (e) => {
+            this._setRegionMarkPickable(region, true);
             this._initMarkBrushState(componentIndex, '');
-            this._needDisablePickable = false;
             this._emitEvent(ChartEvent.brushClear, region);
         });
         brush.addEventListener(IOperateType.drawEnd, (e) => {
             var _a;
-            this._needDisablePickable = false;
+            this._setRegionMarkPickable(region, true);
             const { operateMask } = e.detail;
             if ((_a = this._spec) === null || _a === void 0 ? void 0 : _a.onBrushEnd) {
                 if (this._spec.onBrushEnd(e) === true) {
                     this.clearGraphic();
                     this._initMarkBrushState(componentIndex, '');
-                    this._needDisablePickable = false;
                     this._emitEvent(ChartEvent.brushClear, region);
                 }
                 else {
@@ -96337,6 +96435,7 @@ class Brush extends BaseComponent {
             }
         });
         brush.addEventListener(IOperateType.moveEnd, (e) => {
+            this._setRegionMarkPickable(region, true);
             const { operateMask } = e.detail;
             const inBrushData = this._extendDataInBrush(this._inBrushElementsMap);
             if (!this._spec.zoomWhenEmpty && inBrushData.length > 0) {
@@ -96462,7 +96561,6 @@ class Brush extends BaseComponent {
                     this._outOfBrushElementsMap[elementKey] = graphicItem;
                     delete this._inBrushElementsMap[operateMask.name][elementKey];
                 }
-                graphicItem.setAttribute('pickable', !this._needDisablePickable);
             });
         });
     }
@@ -96520,7 +96618,6 @@ class Brush extends BaseComponent {
                             graphicItem.addState(OUT_BRUSH_STATE, true);
                             this._linkedOutOfBrushElementsMap[elementKey] = graphicItem;
                         }
-                        graphicItem.setAttribute('pickable', !this._needDisablePickable);
                     });
                 });
             }
@@ -96586,6 +96683,12 @@ class Brush extends BaseComponent {
         this._initItemMap(this._itemMap, this._outOfBrushElementsMap, stateName);
         this._initItemMap(this._linkedItemMap, this._linkedOutOfBrushElementsMap, stateName);
     }
+    _setRegionMarkPickable(region, pickable) {
+        region
+            .getGroupMark()
+            .getGraphics()
+            .forEach(g => g.setAttribute('childrenPickable', pickable));
+    }
     _stateClamp(state) {
         return Math.min(Math.max(0, state), 1);
     }
@@ -96665,7 +96768,6 @@ class Brush extends BaseComponent {
             const container = this.getContainer();
             this._brushComponents.forEach((brush, index) => {
                 this._initMarkBrushState(index, '');
-                this._needDisablePickable = false;
                 brush.removeAllChild();
                 brush.releaseBrushEvents();
                 if (container) {
@@ -97891,12 +97993,18 @@ class DomTooltipHandler extends BaseTooltipHandler {
         const rowStyle = this._domStyle.row;
         const chilren = [...this._rootDom.children];
         let titleDom = chilren.find(child => child.className.includes(TOOLTIP_TITLE_CLASS_NAME));
+        let contentDom = chilren.find(child => child.className.includes(TOOLTIP_CONTENT_BOX_CLASS_NAME));
         if (!titleDom && title.visible !== false) {
             titleDom = document.createElement('h2');
             const span = document.createElement('span');
             titleDom.appendChild(span);
             titleDom.classList.add(TOOLTIP_TITLE_CLASS_NAME);
-            this._rootDom.appendChild(titleDom);
+            if (this._rootDom.firstChild) {
+                this._rootDom.insertBefore(titleDom, this._rootDom.firstChild);
+            }
+            else {
+                this._rootDom.appendChild(titleDom);
+            }
         }
         if (titleDom && title.visible !== false) {
             setStyleToDom(titleDom, Object.assign(Object.assign(Object.assign({}, this._domStyle.title), (hasContent ? rowStyle : { marginBottom: '0px' })), { marginTop: '0px' }));
@@ -97905,7 +98013,6 @@ class DomTooltipHandler extends BaseTooltipHandler {
         else if (titleDom && title.visible === false) {
             titleDom.parentNode.removeChild(titleDom);
         }
-        let contentDom = chilren.find(child => child.className.includes(TOOLTIP_CONTENT_BOX_CLASS_NAME));
         const columns = ['shape', 'key', 'value'];
         if (!contentDom && hasContent) {
             contentDom = document.createElement('div');