@visactor/vrender-components 0.17.0-alpha.3 → 0.17.0-alpha.4

package/dist/index.js

@@ -10101,32 +10101,37 @@
   }(BaseSymbol);
   var close$1 = new CloseSymbol();
 
-  function rect(ctx, size, x, y) {
+  function rectSizeArray(ctx, size, x, y) {
     return ctx.rect(x - size[0] / 2, y - size[1] / 2, size[0], size[1]), !1;
   }
+  function rectSize(ctx, size, x, y) {
+    var w = size,
+      h = size / 2;
+    return ctx.rect(x - w / 2, y - h / 2, w, h), !1;
+  }
   var RectSymbol = /*#__PURE__*/function (_BaseSymbol) {
     _inherits(RectSymbol, _BaseSymbol);
     var _super = _createSuper(RectSymbol);
     function RectSymbol() {
       var _this;
       _classCallCheck(this, RectSymbol);
-      _this = _super.apply(this, arguments), _this.type = "rect", _this.pathStr = "M-0.5,-0.5h1v1h-1Z";
+      _this = _super.apply(this, arguments), _this.type = "rect", _this.pathStr = "M -0.5,0.25 L 0.5,0.25 L 0.5,-0.25,L -0.5,-0.25 Z";
       return _this;
     }
     _createClass(RectSymbol, [{
       key: "draw",
       value: function draw(ctx, size, x, y) {
-        return rect(ctx, vutils.isNumber(size) ? [size, size] : size, x, y);
+        return vutils.isNumber(size) ? rectSize(ctx, size, x, y) : rectSizeArray(ctx, size, x, y);
       }
     }, {
       key: "drawOffset",
       value: function drawOffset(ctx, size, x, y, offset) {
-        return rect(ctx, vutils.isNumber(size) ? [size + 2 * offset, size + 2 * offset] : [size[0] + 2 * offset, size[1] + 2 * offset], x, y);
+        return vutils.isNumber(size) ? rectSize(ctx, size + 2 * offset, x, y) : rectSizeArray(ctx, [size[0] + 2 * offset, size[1] + 2 * offset], x, y);
       }
     }]);
     return RectSymbol;
   }(BaseSymbol);
-  var rect$1 = new RectSymbol();
+  var rect = new RectSymbol();
 
   var tempBounds = new vutils.AABBBounds();
   var CustomSymbolClass = /*#__PURE__*/function () {
@@ -10165,7 +10170,7 @@
     return CustomSymbolClass;
   }();
 
-  var builtinSymbols = [circle$1, cross$1, diamond$1, square$1, thinTriangle$1, triangle, star$1, arrow$1, wedge$1, stroke$1, wye$1, triangleLeft, triangleRight, triangleUp, triangleDown, arrow2Left$1, arrow2Right$1, arrow2Up$1, arrow2Down$1, rect$1, lineV$1, lineH$1, close$1];
+  var builtinSymbols = [circle$1, cross$1, diamond$1, square$1, thinTriangle$1, triangle, star$1, arrow$1, wedge$1, stroke$1, wye$1, triangleLeft, triangleRight, triangleUp, triangleDown, arrow2Left$1, arrow2Right$1, arrow2Up$1, arrow2Down$1, rect, lineV$1, lineH$1, close$1];
   var builtinSymbolsMap = {};
   builtinSymbols.forEach(function (symbol) {
     builtinSymbolsMap[symbol.type] = symbol;
@@ -10173,7 +10178,6 @@
   var builtInSymbolStrMap = {
     arrowLeft: "M 0.25 -0.5 L -0.25 0 l 0.5 0.5",
     arrowRight: "M -0.25 -0.5 l 0.5 0.5 l -0.5 0.5",
-    rect: "M -0.5,0.25 L 0.5,0.25 L 0.5,-0.25,L -0.5,-0.25 Z",
     rectRound: "M 0.3 -0.5 C 0.41 -0.5 0.5 -0.41 0.5 -0.3 C 0.5 -0.3 0.5 0.3 0.5 0.3 C 0.5 0.41 0.41 0.5 0.3 0.5 C 0.3 0.5 -0.3 0.5 -0.3 0.5 C -0.41 0.5 -0.5 0.41 -0.5 0.3 C -0.5 0.3 -0.5 -0.3 -0.5 -0.3 C -0.5 -0.41 -0.41 -0.5 -0.3 -0.5 C -0.3 -0.5 0.3 -0.5 0.3 -0.5 Z",
     roundLine: "M 1.2392 -0.258 L -1.3432 -0.258 C -1.4784 -0.258 -1.588 -0.1436 -1.588 -0.002 c 0 0.1416 0.1096 0.256 0.2448 0.256 l 2.5824 0 c 0.1352 0 0.2448 -0.1144 0.2448 -0.256 C 1.484 -0.1436 1.3744 -0.258 1.2392 -0.258 z"
   };
@@ -11244,7 +11248,8 @@
         var _this2 = this;
         var _a;
         var _this$attribute = this.attribute,
-          textConfig = _this$attribute.textConfig,
+          _this$attribute$textC = _this$attribute.textConfig,
+          textConfig = _this$attribute$textC === void 0 ? [] : _this$attribute$textC,
           maxWidth = _this$attribute.maxWidth,
           maxHeight = _this$attribute.maxHeight,
           width = _this$attribute.width,
@@ -20691,6 +20696,45 @@
       var _a, _b;
       return (_b = (_a = animationEffects[type]) === null || _a === void 0 ? void 0 : _a.call(animationEffects, textAttribute)) !== null && _b !== void 0 ? _b : { from: {}, to: {} };
   }
+  function updateAnimation(prev, next, animationConfig) {
+      if (!vutils.isArray(animationConfig)) {
+          const { duration, easing, increaseEffect = true } = animationConfig;
+          prev.animate().to(next.attribute, duration, easing);
+          increaseEffect && playIncreaseCount(prev, next, duration, easing);
+          return;
+      }
+      animationConfig.forEach((cfg, i) => {
+          const { duration, easing, increaseEffect = true, channel } = cfg;
+          const { from, to } = update(prev, next, channel, cfg.options);
+          if (!vutils.isEmpty(to)) {
+              prev.animate().to(to, duration, easing);
+          }
+          if ('text' in from && 'text' in to && increaseEffect) {
+              playIncreaseCount(prev, next, duration, easing);
+          }
+      });
+  }
+  const update = (prev, next, channel, options) => {
+      const from = Object.assign({}, prev.attribute);
+      const to = Object.assign({}, next.attribute);
+      vutils.array(options === null || options === void 0 ? void 0 : options.excludeChannels).forEach(key => {
+          delete to[key];
+      });
+      Object.keys(to).forEach(key => {
+          if (channel && !channel.includes(key)) {
+              delete to[key];
+          }
+      });
+      return { from, to };
+  };
+  function playIncreaseCount(prev, next, duration, easing) {
+      if (prev.attribute.text !== next.attribute.text &&
+          vutils.isValidNumber(Number(prev.attribute.text) * Number(next.attribute.text))) {
+          prev
+              .animate()
+              .play(new IncreaseCount({ text: prev.attribute.text }, { text: next.attribute.text }, duration, easing));
+      }
+  }
   const DefaultLabelAnimation = {
       mode: 'same-time',
       duration: 300,
@@ -20884,6 +20928,24 @@
       }
       return points;
   };
+  function labelingLineOrArea(textBounds, graphicBounds, position = 'end', offset = 0) {
+      if (!textBounds || !graphicBounds) {
+          return;
+      }
+      const { x1, x2 } = textBounds;
+      const width = Math.abs(x2 - x1);
+      const anchorX = graphicBounds.x1;
+      const anchorY = graphicBounds.y1;
+      let x = anchorX;
+      const y = anchorY;
+      if (position === 'end') {
+          x = anchorX + width / 2 + offset;
+      }
+      else if (position === 'start') {
+          x = anchorX - width / 2 - offset;
+      }
+      return { x, y };
+  }
 
   class LabelBase extends AbstractComponent {
       setBitmap(bitmap) {
@@ -21037,7 +21099,7 @@
           return text;
       }
       _prepare() {
-          var _a, _b, _c, _d;
+          var _a, _b, _c, _d, _e;
           const currentBaseMarks = [];
           let baseMarks;
           if (vutils.isFunction(this.attribute.getBaseMarks)) {
@@ -21054,7 +21116,7 @@
           (_a = this._idToGraphic) === null || _a === void 0 ? void 0 : _a.clear();
           (_b = this._idToPoint) === null || _b === void 0 ? void 0 : _b.clear();
           this._baseMarks = currentBaseMarks;
-          this._isCollectionBase = ((_c = currentBaseMarks === null || currentBaseMarks === void 0 ? void 0 : currentBaseMarks[0]) === null || _c === void 0 ? void 0 : _c.type) === 'line' || ((_d = currentBaseMarks === null || currentBaseMarks === void 0 ? void 0 : currentBaseMarks[0]) === null || _d === void 0 ? void 0 : _d.type) === 'area';
+          this._isCollectionBase = this.attribute.type === 'line-data';
           if (!currentBaseMarks || currentBaseMarks.length === 0) {
               return;
           }
@@ -21100,6 +21162,15 @@
                   }
               }
           }
+          if (this.attribute.animation !== false) {
+              this._animationConfig = {
+                  enter: vutils.merge({}, DefaultLabelAnimation, this.attribute.animation, (_c = this.attribute.animationEnter) !== null && _c !== void 0 ? _c : {}),
+                  exit: vutils.merge({}, DefaultLabelAnimation, this.attribute.animation, (_d = this.attribute.animationExit) !== null && _d !== void 0 ? _d : {}),
+                  update: vutils.isArray(this.attribute.animationUpdate)
+                      ? this.attribute.animationUpdate
+                      : vutils.merge({}, DefaultLabelAnimation, this.attribute.animation, (_e = this.attribute.animationUpdate) !== null && _e !== void 0 ? _e : {})
+              };
+          }
       }
       getRelatedGrphic(item) {
           return this._idToGraphic.get(item.id);
@@ -21247,12 +21318,6 @@
           }
       }
       _renderWithAnimation(labels) {
-          var _a, _b, _c, _d, _e;
-          const animationConfig = ((_a = this.attribute.animation) !== null && _a !== void 0 ? _a : {});
-          const mode = (_b = animationConfig.mode) !== null && _b !== void 0 ? _b : DefaultLabelAnimation.mode;
-          const duration = (_c = animationConfig.duration) !== null && _c !== void 0 ? _c : DefaultLabelAnimation.duration;
-          const easing = (_d = animationConfig.easing) !== null && _d !== void 0 ? _d : DefaultLabelAnimation.easing;
-          const delay = (_e = animationConfig.delay) !== null && _e !== void 0 ? _e : 0;
           const currentTextMap = new Map();
           const prevTextMap = this._graphicToText || new Map();
           const texts = [];
@@ -21276,13 +21341,7 @@
                       this._syncStateWithRelatedGraphic(relatedGraphic);
                       relatedGraphic.once('animate-bind', a => {
                           text.setAttributes(from);
-                          const listener = this._afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, {
-                              mode,
-                              duration,
-                              easing,
-                              to,
-                              delay
-                          });
+                          const listener = this._afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, to, this._animationConfig.enter);
                           relatedGraphic.on('afterAttributeUpdate', listener);
                       });
                   }
@@ -21292,25 +21351,19 @@
                   prevTextMap.delete(textKey);
                   currentTextMap.set(textKey, prevLabel);
                   const prevText = prevLabel.text;
-                  prevText.animate().to(text.attribute, duration, easing);
+                  const { duration, easing } = this._animationConfig.update;
+                  updateAnimation(prevText, text, this._animationConfig.update);
                   if (prevLabel.labelLine) {
                       prevLabel.labelLine.animate().to(vutils.merge({}, prevLabel.labelLine.attribute, {
                           visible: (_f = (_d = (((_b = (_a = text.attribute) === null || _a === void 0 ? void 0 : _a.line) === null || _b === void 0 ? void 0 : _b.visible) && ((_c = text.attribute) === null || _c === void 0 ? void 0 : _c.visible))) !== null && _d !== void 0 ? _d : (_e = text.attribute) === null || _e === void 0 ? void 0 : _e.visible) !== null && _f !== void 0 ? _f : true,
                           points: (_g = text.attribute) === null || _g === void 0 ? void 0 : _g.points
                       }), duration, easing);
                   }
-                  if (animationConfig.increaseEffect !== false &&
-                      prevText.attribute.text !== text.attribute.text &&
-                      vutils.isValidNumber(Number(prevText.attribute.text) * Number(text.attribute.text))) {
-                      prevText
-                          .animate()
-                          .play(new IncreaseCount({ text: prevText.attribute.text }, { text: text.attribute.text }, duration, easing));
-                  }
               }
           });
           prevTextMap.forEach(label => {
               var _a;
-              (_a = label.text) === null || _a === void 0 ? void 0 : _a.animate().to(getAnimationAttributes(label.text.attribute, 'fadeOut').to, duration, easing).onEnd(() => {
+              (_a = label.text) === null || _a === void 0 ? void 0 : _a.animate().to(getAnimationAttributes(label.text.attribute, 'fadeOut').to, this._animationConfig.exit.duration, this._animationConfig.exit.easing).onEnd(() => {
                   this.removeChild(label.text);
                   if (label === null || label === void 0 ? void 0 : label.labelLine) {
                       this.removeChild(label.labelLine);
@@ -21359,7 +21412,7 @@
               relatedGraphic.on('afterAttributeUpdate', this._handleRelatedGraphicSetState);
           }
       }
-      _afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, { mode, duration, easing, to, delay }) {
+      _afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, to, { mode, duration, easing, delay }) {
           const listener = (event) => {
               var _a, _b;
               const { detail } = event;
@@ -21377,7 +21430,7 @@
                   text.setAttributes(to);
                   return;
               }
-              const onEnd = () => {
+              const onStart = () => {
                   if (relatedGraphic) {
                       relatedGraphic.onAnimateBind = undefined;
                       relatedGraphic.removeEventListener('afterAttributeUpdate', listener);
@@ -21386,14 +21439,14 @@
               switch (mode) {
                   case 'after':
                       if (detail.animationState.end) {
-                          text.animate({ onEnd }).wait(delay).to(to, duration, easing);
+                          text.animate({ onStart }).wait(delay).to(to, duration, easing);
                       }
                       break;
                   case 'after-all':
                       if (index === texts.length - 1) {
                           if (detail.animationState.end) {
                               texts.forEach(t => {
-                                  t.animate({ onEnd }).wait(delay).to(to, duration, easing);
+                                  t.animate({ onStart }).wait(delay).to(to, duration, easing);
                               });
                           }
                       }
@@ -21404,12 +21457,12 @@
                           const point = this._idToPoint.get(text.attribute.id);
                           if (point &&
                               (!text.animates || !text.animates.has('label-animate')) &&
-                              this._baseMarks[0].containsPoint(point.x, point.y, IContainPointMode.LOCAL, (_b = this.stage) === null || _b === void 0 ? void 0 : _b.pickerService)) {
-                              text.animate({ onEnd }).wait(delay).to(to, duration, easing);
+                              relatedGraphic.containsPoint(point.x, point.y, IContainPointMode.LOCAL, (_b = this.stage) === null || _b === void 0 ? void 0 : _b.pickerService)) {
+                              text.animate({ onStart }).wait(delay).to(to, duration, easing);
                           }
                       }
                       else if (detail.animationState.isFirstFrameOfStep) {
-                          text.animate({ onEnd }).wait(delay).to(to, duration, easing);
+                          text.animate({ onStart }).wait(delay).to(to, duration, easing);
                       }
                       break;
               }
@@ -21643,22 +21696,7 @@
           };
       }
       labeling(textBounds, graphicBounds, position = 'end', offset = 0) {
-          if (!textBounds || !graphicBounds) {
-              return;
-          }
-          const { x1, x2 } = textBounds;
-          const width = Math.abs(x2 - x1);
-          const anchorX = graphicBounds.x1;
-          const anchorY = graphicBounds.y1;
-          let x = anchorX;
-          const y = anchorY;
-          if (position === 'end') {
-              x = anchorX + width / 2 + offset;
-          }
-          else if (position === 'start') {
-              x = anchorX - width / 2 - offset;
-          }
-          return { x, y };
+          return labelingLineOrArea(textBounds, graphicBounds, position, offset);
       }
   }
   LineLabel.defaultAttributes = {
@@ -22420,10 +22458,49 @@
       pickable: false
   };
 
+  class AreaLabel extends LabelBase {
+      constructor(attributes) {
+          super(vutils.merge({}, AreaLabel.defaultAttributes, attributes));
+          this.name = 'line-label';
+      }
+      getGraphicBounds(graphic, point = {}) {
+          var _a;
+          if (graphic.type !== 'area') {
+              return super.getGraphicBounds(graphic, point);
+          }
+          const { position = 'end' } = this.attribute;
+          const points = ((_a = graphic === null || graphic === void 0 ? void 0 : graphic.attribute) === null || _a === void 0 ? void 0 : _a.points) || [point];
+          const index = position === 'start' ? 0 : points.length - 1;
+          return {
+              x1: points[index].x,
+              x2: points[index].x,
+              y1: points[index].y,
+              y2: points[index].y
+          };
+      }
+      labeling(textBounds, graphicBounds, position = 'end', offset = 0) {
+          return labelingLineOrArea(textBounds, graphicBounds, position, offset);
+      }
+  }
+  AreaLabel.defaultAttributes = {
+      textStyle: {
+          fontSize: 12,
+          fill: '#000',
+          textAlign: 'center',
+          textBaseline: 'middle',
+          boundsPadding: [-1, 0, -1, 0]
+      },
+      position: 'end',
+      offset: 6,
+      pickable: false
+  };
+
   const labelComponentMap = {
       rect: RectLabel,
       symbol: SymbolLabel,
       arc: ArcLabel,
+      line: LineLabel,
+      area: AreaLabel,
       'line-data': LineDataLabel
   };
   class DataLabel extends AbstractComponent {
@@ -22432,6 +22509,7 @@
           this.name = 'data-label';
       }
       render() {
+          var _a;
           const { dataLabels, size } = this.attribute;
           if (!dataLabels || dataLabels.length === 0) {
               return;
@@ -22451,20 +22529,21 @@
               const dataLabel = dataLabels[i];
               const labelComponent = labelComponentMap[dataLabel.type] || LabelBase;
               if (labelComponent) {
-                  const { baseMarkGroupName } = dataLabel;
-                  let component = this._componentMap.get(baseMarkGroupName);
+                  const { baseMarkGroupName, type } = dataLabel;
+                  const id = (_a = dataLabel.id) !== null && _a !== void 0 ? _a : `${baseMarkGroupName}-${type}-${i}`;
+                  let component = this._componentMap.get(id);
                   if (component) {
                       component.setBitmapTool(tool);
                       component.setBitmap(bitmap);
                       component.setAttributes(dataLabel);
-                      currentComponentMap.set(baseMarkGroupName, component);
+                      currentComponentMap.set(id, component);
                   }
                   else {
                       component = new labelComponent(dataLabel);
                       component.setBitmap(bitmap);
                       component.setBitmapTool(tool);
                       this.add(component);
-                      currentComponentMap.set(baseMarkGroupName, component);
+                      currentComponentMap.set(id, component);
                   }
               }
           }
@@ -24710,13 +24789,6 @@
   }
   vutils.mixin(CircleAxisGrid, CircleAxisMixin);
 
-  var DataZoomActiveTag;
-  (function (DataZoomActiveTag) {
-      DataZoomActiveTag["startHandler"] = "startHandler";
-      DataZoomActiveTag["endHandler"] = "endHandler";
-      DataZoomActiveTag["middleHandler"] = "middleHandler";
-      DataZoomActiveTag["background"] = "background";
-  })(DataZoomActiveTag || (DataZoomActiveTag = {}));
   const DEFAULT_DATA_ZOOM_ATTRIBUTES = {
       orient: 'bottom',
       showDetail: 'auto',
@@ -24815,6 +24887,14 @@
       }
   };
 
+  exports.DataZoomActiveTag = void 0;
+  (function (DataZoomActiveTag) {
+      DataZoomActiveTag["startHandler"] = "startHandler";
+      DataZoomActiveTag["endHandler"] = "endHandler";
+      DataZoomActiveTag["middleHandler"] = "middleHandler";
+      DataZoomActiveTag["background"] = "background";
+  })(exports.DataZoomActiveTag || (exports.DataZoomActiveTag = {}));
+
   const delayMap$1 = {
       debounce: vutils.debounce,
       throttle: vutils.throttle
@@ -24842,23 +24922,23 @@
           this._onHandlerPointerDown = (e, tag) => {
               e.stopPropagation();
               if (tag === 'start') {
-                  this._activeTag = DataZoomActiveTag.startHandler;
+                  this._activeTag = exports.DataZoomActiveTag.startHandler;
                   this._activeItem = this._startHandler;
               }
               else if (tag === 'end') {
-                  this._activeTag = DataZoomActiveTag.endHandler;
+                  this._activeTag = exports.DataZoomActiveTag.endHandler;
                   this._activeItem = this._endHandler;
               }
               else if (tag === 'middleRect') {
-                  this._activeTag = DataZoomActiveTag.middleHandler;
+                  this._activeTag = exports.DataZoomActiveTag.middleHandler;
                   this._activeItem = this._middleHandlerRect;
               }
               else if (tag === 'middleSymbol') {
-                  this._activeTag = DataZoomActiveTag.middleHandler;
+                  this._activeTag = exports.DataZoomActiveTag.middleHandler;
                   this._activeItem = this._middleHandlerSymbol;
               }
               else if (tag === 'background') {
-                  this._activeTag = DataZoomActiveTag.background;
+                  this._activeTag = exports.DataZoomActiveTag.background;
                   this._activeItem = this._background;
               }
               this._activeState = true;
@@ -24866,6 +24946,7 @@
               this._activeCache.lastPos = this.eventPosToStagePos(e);
           };
           this._onHandlerPointerMove = (e) => {
+              var _a;
               e.stopPropagation();
               const { start: startAttr, end: endAttr, brushSelect, realTime = true } = this.attribute;
               const pos = this.eventPosToStagePos(e);
@@ -24873,24 +24954,24 @@
               const dis = (pos[attPos] - this._activeCache.lastPos[attPos]) / max;
               let { start, end } = this.state;
               if (this._activeState) {
-                  if (this._activeTag === DataZoomActiveTag.middleHandler) {
+                  if (this._activeTag === exports.DataZoomActiveTag.middleHandler) {
                       this.moveZoomWithMiddle((this.state.start + this.state.end) / 2 + dis);
                   }
-                  else if (this._activeTag === DataZoomActiveTag.startHandler) {
+                  else if (this._activeTag === exports.DataZoomActiveTag.startHandler) {
                       if (start + dis > end) {
                           start = end;
                           end = start + dis;
-                          this._activeTag = DataZoomActiveTag.endHandler;
+                          this._activeTag = exports.DataZoomActiveTag.endHandler;
                       }
                       else {
                           start = start + dis;
                       }
                   }
-                  else if (this._activeTag === DataZoomActiveTag.endHandler) {
+                  else if (this._activeTag === exports.DataZoomActiveTag.endHandler) {
                       if (end + dis < start) {
                           end = start;
                           start = end + dis;
-                          this._activeTag = DataZoomActiveTag.startHandler;
+                          this._activeTag = exports.DataZoomActiveTag.startHandler;
                       }
                       else {
                           end = end + dis;
@@ -24903,7 +24984,7 @@
               end = Math.min(Math.max(end, 0), 1);
               if (startAttr !== start || endAttr !== end) {
                   this.setStateAttr(start, end, true);
-                  realTime && this._updateStateCallback && this._updateStateCallback(start, end);
+                  realTime && ((_a = this._updateStateCallback) === null || _a === void 0 ? void 0 : _a.call(this, start, end, this._activeTag));
                   this._dispatchChangeEvent(start, end);
               }
           };
@@ -25008,10 +25089,11 @@
           };
       }
       _onHandlerPointerUp(e) {
+          var _a;
           e.preventDefault();
           const { start, end, brushSelect, realTime = true } = this.attribute;
           if (this._activeState) {
-              if (this._activeTag === DataZoomActiveTag.background) {
+              if (this._activeTag === exports.DataZoomActiveTag.background) {
                   const pos = this.eventPosToStagePos(e);
                   this.backgroundDragZoom(this._activeCache.startPos, pos);
               }
@@ -25020,7 +25102,7 @@
           brushSelect && this.renderDragMask();
           if (!realTime || start !== this.state.start || end !== this.state.end) {
               this.setStateAttr(this.state.start, this.state.end, true);
-              this._updateStateCallback && this._updateStateCallback(this.state.start, this.state.end);
+              (_a = this._updateStateCallback) === null || _a === void 0 ? void 0 : _a.call(this, this.state.start, this.state.end, this._activeTag);
               this._dispatchChangeEvent(this.state.start, this.state.end);
           }
       }
@@ -25070,11 +25152,11 @@
           const { dragMaskStyle } = this.attribute;
           const { position, width, height } = this.getLayoutAttrFromConfig();
           if (this._isHorizontal) {
-              this._dragMask = this._container.createOrUpdateChild('dragMask', Object.assign({ x: vutils.clamp(this.dragMaskSize() < 0 ? this._activeCache.lastPos.x : this._activeCache.startPos.x, position.x, position.x + width), y: position.y, width: (this._activeState && this._activeTag === DataZoomActiveTag.background && Math.abs(this.dragMaskSize())) ||
+              this._dragMask = this._container.createOrUpdateChild('dragMask', Object.assign({ x: vutils.clamp(this.dragMaskSize() < 0 ? this._activeCache.lastPos.x : this._activeCache.startPos.x, position.x, position.x + width), y: position.y, width: (this._activeState && this._activeTag === exports.DataZoomActiveTag.background && Math.abs(this.dragMaskSize())) ||
                       0, height }, dragMaskStyle), 'rect');
           }
           else {
-              this._dragMask = this._container.createOrUpdateChild('dragMask', Object.assign({ x: position.x, y: vutils.clamp(this.dragMaskSize() < 0 ? this._activeCache.lastPos.y : this._activeCache.startPos.y, position.y, position.y + height), width, height: (this._activeState && this._activeTag === DataZoomActiveTag.background && Math.abs(this.dragMaskSize())) ||
+              this._dragMask = this._container.createOrUpdateChild('dragMask', Object.assign({ x: position.x, y: vutils.clamp(this.dragMaskSize() < 0 ? this._activeCache.lastPos.y : this._activeCache.startPos.y, position.y, position.y + height), width, height: (this._activeState && this._activeTag === exports.DataZoomActiveTag.background && Math.abs(this.dragMaskSize())) ||
                       0 }, dragMaskStyle), 'rect');
           }
       }
@@ -25393,13 +25475,14 @@
           this.dispatchEvent(changeEvent);
       }
       setStartAndEnd(start, end) {
+          var _a;
           const { start: startAttr, end: endAttr } = this.attribute;
           if (vutils.isValid(start) && vutils.isValid(end) && (start !== this.state.start || end !== this.state.end)) {
               this.state.start = start;
               this.state.end = end;
               if (startAttr !== this.state.start || endAttr !== this.state.end) {
                   this.setStateAttr(start, end, true);
-                  this._updateStateCallback && this._updateStateCallback(start, end);
+                  (_a = this._updateStateCallback) === null || _a === void 0 ? void 0 : _a.call(this, start, end, this._activeTag);
                   this._dispatchChangeEvent(start, end);
               }
           }
@@ -26486,51 +26569,23 @@
               const target = e.target;
               if ((_a = target === null || target === void 0 ? void 0 : target.name) === null || _a === void 0 ? void 0 : _a.startsWith(exports.LEGEND_ELEMENT_NAME.item)) {
                   const legendItem = target.delegate;
-                  const selected = legendItem.hasState(exports.LegendStateValue.selected);
-                  if (selected) {
-                      this._setLegendItemState(legendItem, exports.LegendStateValue.selectedHover, e);
-                  }
-                  else {
-                      this._setLegendItemState(legendItem, exports.LegendStateValue.unSelectedHover, e);
-                  }
-                  const focusButton = legendItem.getChildren()[0].find(node => node.name === exports.LEGEND_ELEMENT_NAME.focus, false);
-                  if (focusButton) {
-                      focusButton.setAttribute('visible', true);
+                  if (this._lastActiveItem) {
+                      if (this._lastActiveItem.id === legendItem.id) {
+                          return;
+                      }
+                      this._unHover(this._lastActiveItem, e);
                   }
-                  this._dispatchEvent(exports.LegendEvent.legendItemHover, legendItem, e);
+                  this._hover(legendItem, e);
+              }
+              else if (this._lastActiveItem) {
+                  this._unHover(this._lastActiveItem, e);
+                  this._lastActiveItem = null;
               }
           };
           this._onUnHover = (e) => {
-              var _a;
-              const target = e.target;
-              if ((_a = target === null || target === void 0 ? void 0 : target.name) === null || _a === void 0 ? void 0 : _a.startsWith(exports.LEGEND_ELEMENT_NAME.item)) {
-                  const legendItem = target.delegate;
-                  let attributeUpdate = false;
-                  if (legendItem.hasState(exports.LegendStateValue.unSelectedHover) ||
-                      legendItem.hasState(exports.LegendStateValue.selectedHover)) {
-                      attributeUpdate = true;
-                  }
-                  legendItem.removeState(exports.LegendStateValue.unSelectedHover);
-                  legendItem.removeState(exports.LegendStateValue.selectedHover);
-                  legendItem
-                      .getChildren()[0]
-                      .getChildren()
-                      .forEach((child) => {
-                      if (!attributeUpdate &&
-                          (child.hasState(exports.LegendStateValue.unSelectedHover) || child.hasState(exports.LegendStateValue.selectedHover))) {
-                          attributeUpdate = true;
-                      }
-                      child.removeState(exports.LegendStateValue.unSelectedHover);
-                      child.removeState(exports.LegendStateValue.selectedHover);
-                  });
-                  const focusButton = legendItem.getChildren()[0].find(node => node.name === exports.LEGEND_ELEMENT_NAME.focus, false);
-                  if (focusButton) {
-                      focusButton.setAttribute('visible', false);
-                  }
-                  if (attributeUpdate) {
-                      this._dispatchEvent(exports.LegendEvent.legendItemAttributeUpdate, legendItem, e);
-                  }
-                  this._dispatchEvent(exports.LegendEvent.legendItemUnHover, legendItem, e);
+              if (this._lastActiveItem) {
+                  this._unHover(this._lastActiveItem, e);
+                  this._lastActiveItem = null;
               }
           };
           this._onClick = (e) => {
@@ -26720,7 +26775,7 @@
           const { hover = true, select = true } = this.attribute;
           if (hover) {
               this._itemsContainer.addEventListener('pointermove', this._onHover);
-              this._itemsContainer.addEventListener('pointerout', this._onUnHover);
+              this._itemsContainer.addEventListener('pointerleave', this._onUnHover);
           }
           if (select) {
               this._itemsContainer.addEventListener('pointerdown', this._onClick);
@@ -26748,6 +26803,7 @@
               itemGroup = createGroup(Object.assign({ x: 0, y: 0 }, background === null || background === void 0 ? void 0 : background.style));
               this._appendDataToShape(itemGroup, exports.LEGEND_ELEMENT_NAME.item, item, itemGroup, background === null || background === void 0 ? void 0 : background.state);
           }
+          itemGroup.id = `${id !== null && id !== void 0 ? id : label}-${index}`;
           itemGroup.addState(isSelected ? exports.LegendStateValue.selected : exports.LegendStateValue.unSelected);
           const innerGroup = createGroup({
               x: 0,
@@ -26756,22 +26812,26 @@
           });
           itemGroup.add(innerGroup);
           let focusStartX = 0;
-          const shapeSize = vutils.get(shapeAttr, 'style.size', DEFAULT_SHAPE_SIZE);
-          const shapeSpace = vutils.get(shapeAttr, 'space', DEFAULT_SHAPE_SPACE);
-          const itemShape = createSymbol(Object.assign(Object.assign({ x: 0, y: 0, symbolType: 'circle', strokeBoundsBuffer: 0 }, shape), shapeAttr.style));
-          Object.keys(shapeAttr.state || {}).forEach(key => {
-              const color = shapeAttr.state[key].fill ||
-                  shapeAttr.state[key].stroke;
-              if (shape.fill && vutils.isNil(shapeAttr.state[key].fill) && color) {
-                  shapeAttr.state[key].fill = color;
-              }
-              if (shape.stroke && vutils.isNil(shapeAttr.state[key].stroke) && color) {
-                  shapeAttr.state[key].stroke = color;
-              }
-          });
-          this._appendDataToShape(itemShape, exports.LEGEND_ELEMENT_NAME.itemShape, item, itemGroup, shapeAttr === null || shapeAttr === void 0 ? void 0 : shapeAttr.state);
-          itemShape.addState(isSelected ? exports.LegendStateValue.selected : exports.LegendStateValue.unSelected);
-          innerGroup.add(itemShape);
+          let shapeSize = 0;
+          let shapeSpace = 0;
+          if ((shapeAttr === null || shapeAttr === void 0 ? void 0 : shapeAttr.visible) !== false) {
+              shapeSize = vutils.get(shapeAttr, 'style.size', DEFAULT_SHAPE_SIZE);
+              shapeSpace = vutils.get(shapeAttr, 'space', DEFAULT_SHAPE_SPACE);
+              const itemShape = createSymbol(Object.assign(Object.assign({ x: 0, y: 0, symbolType: 'circle', strokeBoundsBuffer: 0 }, shape), shapeAttr.style));
+              Object.keys(shapeAttr.state || {}).forEach(key => {
+                  const color = shapeAttr.state[key].fill ||
+                      shapeAttr.state[key].stroke;
+                  if (shape.fill && vutils.isNil(shapeAttr.state[key].fill) && color) {
+                      shapeAttr.state[key].fill = color;
+                  }
+                  if (shape.stroke && vutils.isNil(shapeAttr.state[key].stroke) && color) {
+                      shapeAttr.state[key].stroke = color;
+                  }
+              });
+              this._appendDataToShape(itemShape, exports.LEGEND_ELEMENT_NAME.itemShape, item, itemGroup, shapeAttr === null || shapeAttr === void 0 ? void 0 : shapeAttr.state);
+              itemShape.addState(isSelected ? exports.LegendStateValue.selected : exports.LegendStateValue.unSelected);
+              innerGroup.add(itemShape);
+          }
           let focusShape;
           let focusSpace = 0;
           if (focus) {
@@ -26973,6 +27033,48 @@
           this._pager.addEventListener('toNext', onPaging);
           return true;
       }
+      _hover(legendItem, e) {
+          this._lastActiveItem = legendItem;
+          const selected = legendItem.hasState(exports.LegendStateValue.selected);
+          if (selected) {
+              this._setLegendItemState(legendItem, exports.LegendStateValue.selectedHover, e);
+          }
+          else {
+              this._setLegendItemState(legendItem, exports.LegendStateValue.unSelectedHover, e);
+          }
+          const focusButton = legendItem.getChildren()[0].find(node => node.name === exports.LEGEND_ELEMENT_NAME.focus, false);
+          if (focusButton) {
+              focusButton.setAttribute('visible', true);
+          }
+          this._dispatchEvent(exports.LegendEvent.legendItemHover, legendItem, e);
+      }
+      _unHover(legendItem, e) {
+          let attributeUpdate = false;
+          if (legendItem.hasState(exports.LegendStateValue.unSelectedHover) || legendItem.hasState(exports.LegendStateValue.selectedHover)) {
+              attributeUpdate = true;
+          }
+          legendItem.removeState(exports.LegendStateValue.unSelectedHover);
+          legendItem.removeState(exports.LegendStateValue.selectedHover);
+          legendItem
+              .getChildren()[0]
+              .getChildren()
+              .forEach((child) => {
+              if (!attributeUpdate &&
+                  (child.hasState(exports.LegendStateValue.unSelectedHover) || child.hasState(exports.LegendStateValue.selectedHover))) {
+                  attributeUpdate = true;
+              }
+              child.removeState(exports.LegendStateValue.unSelectedHover);
+              child.removeState(exports.LegendStateValue.selectedHover);
+          });
+          const focusButton = legendItem.getChildren()[0].find(node => node.name === exports.LEGEND_ELEMENT_NAME.focus, false);
+          if (focusButton) {
+              focusButton.setAttribute('visible', false);
+          }
+          if (attributeUpdate) {
+              this._dispatchEvent(exports.LegendEvent.legendItemAttributeUpdate, legendItem, e);
+          }
+          this._dispatchEvent(exports.LegendEvent.legendItemUnHover, legendItem, e);
+      }
       _setLegendItemState(legendItem, stateName, e) {
           const keepCurrentStates = true;
           let attributeUpdate = false;
@@ -30160,7 +30262,7 @@
       }
   };
 
-  const version = "0.17.0-alpha.3";
+  const version = "0.17.0-alpha.4";
 
   exports.AbstractComponent = AbstractComponent;
   exports.ArcInfo = ArcInfo;