@visactor/vchart 1.1.0 → 1.1.1-beta.1

package/build/index.js

@@ -8617,9 +8617,9 @@
 	    return new OrdinalScale().domain(this._domain).range(this._ordinalRange).unknown(this._unknown);
 	  }
 	  scale(d) {
-	    const special = this._getSpecifiedValue(d);
-	    if (!isNil(special)) return special;
-	    const key = `${d}`;
+	    const key = `${d}`,
+	      special = this._getSpecifiedValue(key);
+	    if (void 0 !== special) return special;
 	    let i = this._index.get(key);
 	    if (!i) {
 	      if (this._unknown !== implicit) return this._unknown;
@@ -9078,12 +9078,33 @@
 	    } else z = ticks$1(i, j, Math.min(j - i, count)).map(this._pows);
 	    return r ? z.reverse() : z;
 	  }
+	  forceTicks() {
+	    let count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 10;
+	    const d = this.calculateVisibleDomain(this._range);
+	    return forceTicks(d[0], d[d.length - 1], count);
+	  }
+	  stepTicks(step) {
+	    const d = this.calculateVisibleDomain(this._range);
+	    return stepTicks(d[0], d[d.length - 1], step);
+	  }
 	  nice() {
 	    return this.domain(nice(this.domain(), {
 	      floor: x => this._pows(Math.floor(this._logs(x))),
 	      ceil: x => this._pows(Math.ceil(this._logs(x)))
 	    }));
 	  }
+	  niceMin() {
+	    const maxD = this._domain[this._domain.length - 1];
+	    this.nice();
+	    const niceDomain = cloneDeep(this._domain);
+	    return this._domain && (niceDomain[niceDomain.length - 1] = maxD, this.domain(niceDomain)), this;
+	  }
+	  niceMax() {
+	    const minD = this._domain[0];
+	    this.nice();
+	    const niceDomain = cloneDeep(this._domain);
+	    return this._domain && (niceDomain[0] = minD, this.domain(niceDomain)), this;
+	  }
 	}
 
 	class PointScale extends BandScale {
@@ -25603,7 +25624,18 @@
 	    Array.isArray(text) ? graphic.updateMultilineAABBBounds(text) : graphic.updateSingallineAABBBounds(text);
 	    const tb1 = this.tempAABBBounds1,
 	      tb2 = this.tempAABBBounds2;
-	    return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix), aabbBounds;
+	    tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2);
+	    const {
+	      scaleX = textTheme.scaleX,
+	      scaleY = textTheme.scaleY,
+	      shadowBlur = textTheme.shadowBlur,
+	      strokeBoundsBuffer = textTheme.strokeBoundsBuffer
+	    } = attribute;
+	    if (shadowBlur) {
+	      const shadowBlurHalfWidth = shadowBlur / Math.abs(scaleX + scaleY);
+	      boundStroke(tb1, shadowBlurHalfWidth, !0, strokeBoundsBuffer), aabbBounds.union(tb1);
+	    }
+	    return this.combindShadowAABBBounds(aabbBounds, graphic), transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix), aabbBounds;
 	  }
 	  updatePathAABBBounds(attribute, pathTheme, aabbBounds, graphic) {
 	    this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePathAABBBoundsImprecise(attribute, pathTheme, aabbBounds, graphic);
@@ -26587,21 +26619,21 @@
 	      x: originX = 0,
 	      x: originY = 0
 	    } = attribute;
-	    if (!1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), !1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
+	    if (!1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), this._areaRenderContribitions || (this._areaRenderContribitions = this.areaRenderContribitions.getContributions() || []), this._areaRenderContribitions.forEach(c => {
+	      c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
+	        attribute: attribute
+	      });
+	    }), !1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
 	      const {
 	        stroke: stroke
 	      } = attribute;
-	      isArray$3(stroke) && stroke[0] && !1 === stroke[1] && (context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, cache.top, clipRange, "auto", {
+	      isArray$3(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1] && (context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, stroke[0] ? cache.top : cache.bottom, clipRange, "auto", {
 	        offsetX: offsetX,
 	        offsetY: offsetY,
 	        offsetZ: offsetZ
 	      })), context.setStrokeStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke();
 	    }
-	    return this._areaRenderContribitions || (this._areaRenderContribitions = this.areaRenderContribitions.getContributions() || []), this._areaRenderContribitions.forEach(c => {
-	      c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
-	        attribute: attribute
-	      });
-	    }), !1;
+	    return !1;
 	  }
 	};
 	DefaultCanvasAreaRender = __decorate$1t([injectable(), __param$L(0, inject(ContributionProvider)), __param$L(0, named(AreaRenderContribution)), __metadata$_("design:paramtypes", [Object])], DefaultCanvasAreaRender);
@@ -34661,7 +34693,7 @@
 	          return this.viewBox.height();
 	        }
 	      }
-	    })), params.autoRender && this.enableAutoRender(), !1 === params.disableDirtyBounds && this.enableDirtyBounds(), this.hooks.beforeRender.tap("constructor", this.beforeRender), this.hooks.afterRender.tap("constructor", this.afterRender), this._beforeRender = params.beforeRender, this._afterRender = params.afterRender, this.ticker = params.ticker || defaultTicker, !1 !== params.interactiveLayer && this.initInteractiveLayer();
+	    })), params.autoRender && this.enableAutoRender(), !1 === params.disableDirtyBounds && this.enableDirtyBounds(), this.hooks.beforeRender.tap("constructor", this.beforeRender), this.hooks.afterRender.tap("constructor", this.afterRender), this._beforeRender = params.beforeRender, this._afterRender = params.afterRender, this.ticker = params.ticker || defaultTicker, this.supportInteractiveLayer = !1 !== params.interactiveLayer;
 	  }
 	  get3dOptions(options) {
 	    const {
@@ -34797,8 +34829,8 @@
 	  removeLayer(ILayerId) {
 	    return this.removeChild(this.findChildByUid(ILayerId));
 	  }
-	  initInteractiveLayer() {
-	    this.interactiveLayer = this.createLayer(), this.interactiveLayer.name = "_builtin_interactive";
+	  tryInitInteractiveLayer() {
+	    this.supportInteractiveLayer && !this.interactiveLayer && (this.interactiveLayer = this.createLayer(), this.interactiveLayer.name = "_builtin_interactive");
 	  }
 	  clearViewBox(color) {
 	    this.window.clearViewBox(this._viewBox, color);
@@ -36050,7 +36082,7 @@
 	}(LayoutState || (LayoutState = {}));
 	var HOOK_EVENT;
 	!function (HOOK_EVENT) {
-	  HOOK_EVENT.BEFORE_PARSE_VIEW = "beforeParseView", HOOK_EVENT.AFTER_PARSE_VIEW = "afterParseView", HOOK_EVENT.BEFORE_TRANSFORM = "beforeTransform", HOOK_EVENT.AFTER_TRANSFORM = "afterTransform", HOOK_EVENT.BEFORE_CREATE_VRENDER_STAGE = "beforeCreateVRenderStage", HOOK_EVENT.AFTER_CREATE_VRENDER_STAGE = "afterCreateVRenderStage", HOOK_EVENT.BEFORE_CREATE_VRENDER_LAYER = "beforeCreateVRenderLayer", HOOK_EVENT.AFTER_CREATE_VRENDER_LAYER = "afterCreateVRenderLayer", HOOK_EVENT.BEFORE_VRENDER_DRAW = "beforeVRenderDraw", HOOK_EVENT.AFTER_VRENDER_DRAW = "afterVRenderDraw", HOOK_EVENT.BEFORE_MARK_JOIN = "beforeMarkJoin", HOOK_EVENT.AFTER_MARK_JOIN = "afterMarkJoin", HOOK_EVENT.BEFORE_MARK_UPDATE = "beforeMarkUpdate", HOOK_EVENT.AFTER_MARK_UPDATE = "afterMarkUpdate", HOOK_EVENT.BEFORE_MARK_STATE = "beforeMarkState", HOOK_EVENT.AFTER_MARK_STATE = "afterMarkState", HOOK_EVENT.BEFORE_MARK_ENCODE = "beforeMarkEncode", HOOK_EVENT.AFTER_MARK_ENCODE = "afterMarkEncode", HOOK_EVENT.BEFORE_DO_LAYOUT = "beforeDoLayout", HOOK_EVENT.AFTER_DO_LAYOUT = "afterDoLayout", HOOK_EVENT.BEFORE_MARK_LAYOUT_END = "beforeMarkLayoutEnd", HOOK_EVENT.AFTER_MARK_LAYOUT_END = "afterMarkLayoutEnd", HOOK_EVENT.BEFORE_DO_RENDER = "beforeDoRender", HOOK_EVENT.AFTER_DO_RENDER = "afterDoRender", HOOK_EVENT.BEFORE_MARK_RENDER_END = "beforeMarkRenderEnd", HOOK_EVENT.AFTER_MARK_RENDER_END = "afterMarkRenderEnd", HOOK_EVENT.BEFORE_CREATE_VRENDER_MARK = "beforeCreateVRenderMark", HOOK_EVENT.AFTER_CREATE_VRENDER_MARK = "afterCreateVRenderMark", HOOK_EVENT.BEFORE_ADD_VRENDER_MARK = "beforeAddVRenderMark", HOOK_EVENT.AFTER_ADD_VRENDER_MARK = "afterAddVRenderMark", HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER = "afterVRenderNextRender", HOOK_EVENT.BEFORE_ELEMENT_UPDATE_DATA = "beforeElementUpdateData", HOOK_EVENT.AFTER_ELEMENT_UPDATE_DATA = "afterElementUpdateData", HOOK_EVENT.BEFORE_ELEMENT_STATE = "beforeElementState", HOOK_EVENT.AFTER_ELEMENT_STATE = "afterElementState", HOOK_EVENT.BEFORE_ELEMENT_ENCODE = "beforeElementEncode", HOOK_EVENT.AFTER_ELEMENT_ENCODE = "afterElementEncode", HOOK_EVENT.ANIMATION_START = "animationStart", HOOK_EVENT.ANIMATION_END = "animationEnd", HOOK_EVENT.ELEMENT_ANIMATION_START = "elementAnimationStart", HOOK_EVENT.ELEMENT_ANIMATION_END = "elementAnimationEnd";
+	  HOOK_EVENT.BEFORE_PARSE_VIEW = "beforeParseView", HOOK_EVENT.AFTER_PARSE_VIEW = "afterParseView", HOOK_EVENT.BEFORE_TRANSFORM = "beforeTransform", HOOK_EVENT.AFTER_TRANSFORM = "afterTransform", HOOK_EVENT.BEFORE_CREATE_VRENDER_STAGE = "beforeCreateVRenderStage", HOOK_EVENT.AFTER_CREATE_VRENDER_STAGE = "afterCreateVRenderStage", HOOK_EVENT.BEFORE_CREATE_VRENDER_LAYER = "beforeCreateVRenderLayer", HOOK_EVENT.AFTER_CREATE_VRENDER_LAYER = "afterCreateVRenderLayer", HOOK_EVENT.BEFORE_VRENDER_DRAW = "beforeVRenderDraw", HOOK_EVENT.AFTER_VRENDER_DRAW = "afterVRenderDraw", HOOK_EVENT.BEFORE_MARK_JOIN = "beforeMarkJoin", HOOK_EVENT.AFTER_MARK_JOIN = "afterMarkJoin", HOOK_EVENT.BEFORE_MARK_UPDATE = "beforeMarkUpdate", HOOK_EVENT.AFTER_MARK_UPDATE = "afterMarkUpdate", HOOK_EVENT.BEFORE_MARK_STATE = "beforeMarkState", HOOK_EVENT.AFTER_MARK_STATE = "afterMarkState", HOOK_EVENT.BEFORE_MARK_ENCODE = "beforeMarkEncode", HOOK_EVENT.AFTER_MARK_ENCODE = "afterMarkEncode", HOOK_EVENT.BEFORE_DO_LAYOUT = "beforeDoLayout", HOOK_EVENT.AFTER_DO_LAYOUT = "afterDoLayout", HOOK_EVENT.BEFORE_MARK_LAYOUT_END = "beforeMarkLayoutEnd", HOOK_EVENT.AFTER_MARK_LAYOUT_END = "afterMarkLayoutEnd", HOOK_EVENT.BEFORE_DO_RENDER = "beforeDoRender", HOOK_EVENT.AFTER_DO_RENDER = "afterDoRender", HOOK_EVENT.BEFORE_MARK_RENDER_END = "beforeMarkRenderEnd", HOOK_EVENT.AFTER_MARK_RENDER_END = "afterMarkRenderEnd", HOOK_EVENT.BEFORE_CREATE_VRENDER_MARK = "beforeCreateVRenderMark", HOOK_EVENT.AFTER_CREATE_VRENDER_MARK = "afterCreateVRenderMark", HOOK_EVENT.BEFORE_ADD_VRENDER_MARK = "beforeAddVRenderMark", HOOK_EVENT.AFTER_ADD_VRENDER_MARK = "afterAddVRenderMark", HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER = "afterVRenderNextRender", HOOK_EVENT.BEFORE_ELEMENT_UPDATE_DATA = "beforeElementUpdateData", HOOK_EVENT.AFTER_ELEMENT_UPDATE_DATA = "afterElementUpdateData", HOOK_EVENT.BEFORE_ELEMENT_STATE = "beforeElementState", HOOK_EVENT.AFTER_ELEMENT_STATE = "afterElementState", HOOK_EVENT.BEFORE_ELEMENT_ENCODE = "beforeElementEncode", HOOK_EVENT.AFTER_ELEMENT_ENCODE = "afterElementEncode", HOOK_EVENT.ANIMATION_START = "animationStart", HOOK_EVENT.ANIMATION_END = "animationEnd", HOOK_EVENT.ELEMENT_ANIMATION_START = "elementAnimationStart", HOOK_EVENT.ELEMENT_ANIMATION_END = "elementAnimationEnd", HOOK_EVENT.ALL_ANIMATION_START = "allAnimationStart", HOOK_EVENT.ALL_ANIMATION_END = "allAnimationEnd";
 	}(HOOK_EVENT || (HOOK_EVENT = {}));
 	var GrammarTypeEnum;
 	!function (GrammarTypeEnum) {
@@ -38886,6 +38918,12 @@
 	  recordEnd() {
 	    return this;
 	  }
+	  isAnimating() {
+	    let isAnimating = !1;
+	    return this.animators.forEach(animators => {
+	      isAnimating = isAnimating || animators.some(animator => animator.isAnimating);
+	    }), isAnimating;
+	  }
 	  isElementAnimating(element) {
 	    var _a;
 	    const stateAnimationCounts = null === (_a = this.elementRecorder.get(element)) || void 0 === _a ? void 0 : _a.count;
@@ -38943,7 +38981,7 @@
 	        },
 	        mergedParameters = Object.assign({
 	          [DefaultAnimationParameters]: animationParameters
-	        }, animationParameters),
+	        }, parameters),
 	        animationUnit = this.getAnimationUnit(config.timeline, element, index, animatedElements.length, parameters);
 	      animators.push(this.animateElement(config, animationUnit, element, animationParameters, mergedParameters));
 	    })), animators;
@@ -39655,7 +39693,7 @@
 	    if (this.renderContext = this.parseRenderContext(data, parameters), this.init(stage, parameters), this.renderContext.progressive) this.differ.reset(), this.elementMap.clear(), this.evaluateProgressive();else {
 	      const transformData = this.evaluateTransformSync(this._getTransformsBeforeJoin(), null != data ? data : DefaultMarkData, parameters);
 	      let inputData = transformData;
-	      transformData.progressive && (this.renderContext.parameters = parameters, this.renderContext.beforeTransformProgressive = transformData.progressive, inputData = transformData.progressive.output()), this.emit(HOOK_EVENT.BEFORE_MARK_JOIN), this.evaluateJoin(inputData), this.emit(HOOK_EVENT.AFTER_MARK_JOIN), this.emit(HOOK_EVENT.BEFORE_MARK_STATE), this.evaluateState(this.elements, this.spec.state, parameters), this.emit(HOOK_EVENT.AFTER_MARK_STATE), this.emit(HOOK_EVENT.BEFORE_MARK_ENCODE), this.evaluateEncode(this.elements, this._getEncoders(), parameters), this.emit(HOOK_EVENT.AFTER_MARK_ENCODE);
+	      (null == transformData ? void 0 : transformData.progressive) && (this.renderContext.parameters = parameters, this.renderContext.beforeTransformProgressive = transformData.progressive, inputData = transformData.progressive.output()), this.emit(HOOK_EVENT.BEFORE_MARK_JOIN), this.evaluateJoin(inputData), this.emit(HOOK_EVENT.AFTER_MARK_JOIN), this.emit(HOOK_EVENT.BEFORE_MARK_STATE), this.evaluateState(this.elements, this.spec.state, parameters), this.emit(HOOK_EVENT.AFTER_MARK_STATE), this.emit(HOOK_EVENT.BEFORE_MARK_ENCODE), this.evaluateEncode(this.elements, this._getEncoders(), parameters), this.emit(HOOK_EVENT.AFTER_MARK_ENCODE);
 	    }
 	    return this.emit(HOOK_EVENT.BEFORE_MARK_UPDATE), this.update(this.spec), this.emit(HOOK_EVENT.AFTER_MARK_UPDATE), this;
 	  }
@@ -40870,7 +40908,7 @@
 	      }, poptip), {
 	        x: matrix.e,
 	        y: matrix.f
-	      }));
+	      })), drawContext.stage.tryInitInteractiveLayer();
 	      const interactiveLayer = drawContext.stage.getLayer("_builtin_interactive");
 	      interactiveLayer && interactiveLayer.add(this.poptipComponent);
 	    } else 2 === graphic._showPoptip && (graphic._showPoptip = 0, this.poptipComponent && this.poptipComponent.setAttributes({
@@ -41327,6 +41365,24 @@
 	function defaultLabelPosition(type) {
 	  return "rect" === type ? DefaultRectPositions : DefaultPositions;
 	}
+	function clampText(text, width, height) {
+	  const {
+	      x1: x1,
+	      x2: x2,
+	      y1: y1,
+	      y2: y2
+	    } = text.AABBBounds,
+	    minX = Math.min(x1, x2),
+	    maxX = Math.max(x1, x2),
+	    minY = Math.min(y1, y2),
+	    maxY = Math.max(y1, y2);
+	  let dx = 0,
+	    dy = 0;
+	  return minX < 0 && maxX - minX <= width ? dx = -minX : maxX > width && minX - (maxX - width) >= 0 && (dx = width - maxX), minY < 0 && maxY - minY <= height ? dy = -minY : maxY > height && minY - (maxY - height) >= 0 && (dy = height - maxY), {
+	    dx: dx,
+	    dy: dy
+	  };
+	}
 
 	const fadeIn = function () {
 	    let textAttribute = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -41405,9 +41461,17 @@
 	    this._bmpTool = bmpTool;
 	  }
 	  render() {
-	    const currentBaseMarks = this._checkMarks(),
-	      labels = this.layout(currentBaseMarks);
-	    this._smartInvert(labels), this._renderLabels(labels);
+	    this._prepare();
+	    const {
+	      overlap: overlap,
+	      smartInvert: smartInvert,
+	      dataFilter: dataFilter,
+	      customLayoutFunc: customLayoutFunc,
+	      customOverlapFunc: customOverlapFunc
+	    } = this.attribute;
+	    let labels,
+	      data = this.attribute.data;
+	    isFunction(dataFilter) && (data = dataFilter(data)), isFunction(customLayoutFunc) ? labels = customLayoutFunc(data, d => this._idToGraphic.get(d.id)) : (labels = this.layout(data), isFunction(customOverlapFunc) ? labels = customOverlapFunc(labels, d => this._idToGraphic.get(d.id)) : !1 !== overlap && (labels = this._overlapping(labels))), !1 !== smartInvert && this._smartInvert(labels), this._renderLabels(labels);
 	  }
 	  _bindEvent(target) {
 	    if (!target) return;
@@ -41426,52 +41490,53 @@
 	    const text = createText(attributes);
 	    return this._bindEvent(text), this._setStates(text), text;
 	  }
-	  _checkMarks() {
+	  _prepare() {
 	    var _a;
 	    const baseMarks = this.getBaseMarks(),
 	      currentBaseMarks = [];
-	    return baseMarks.forEach(mark => {
+	    if (baseMarks.forEach(mark => {
 	      "willRelease" !== mark.releaseStatus && currentBaseMarks.push(mark);
-	    }), this._prevRelationMap = new Map(this._relationMap), null === (_a = this._relationMap) || void 0 === _a || _a.clear(), currentBaseMarks;
-	  }
-	  layout(currentMarks) {
+	    }), null === (_a = this._idToGraphic) || void 0 === _a || _a.clear(), this._baseMarks = currentBaseMarks, !currentBaseMarks || 0 === currentBaseMarks.length) return;
 	    const {
-	      textStyle: textStyle,
-	      position: position,
-	      offset: offset
-	    } = this.attribute;
-	    let {
 	      data: data
 	    } = this.attribute;
-	    if (isFunction(data) && (data = data({})), !data || 0 === data.length) return [];
-	    let labels = [];
-	    isFunction(this.attribute.sort) && currentMarks && currentMarks.length && (currentMarks = currentMarks.sort(this.attribute.sort)), this._relationMap || (this._relationMap = new Map());
+	    if (data && 0 !== data.length) {
+	      this._idToGraphic || (this._idToGraphic = new Map());
+	      for (let i = 0; i < currentBaseMarks.length; i++) {
+	        const textData = data[i],
+	          baseMark = currentBaseMarks[i];
+	        textData && baseMark && (isValid(textData.id) || (textData.id = `vrender-component-${this.name}-${i}`), this._idToGraphic.set(textData.id, baseMark));
+	      }
+	    }
+	  }
+	  layout() {
+	    let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+	    const {
+	        textStyle = {},
+	        position: position,
+	        offset: offset
+	      } = this.attribute,
+	      labels = [];
 	    for (let i = 0; i < data.length; i++) {
 	      const textData = data[i],
-	        baseMark = null == currentMarks ? void 0 : currentMarks[i],
-	        labelAttribute = Object.assign(Object.assign(Object.assign({}, textStyle), textData), {
-	          _relatedIndex: i
-	        });
-	      if (this._relationMap.set(i, baseMark), textData) {
-	        const text = createText(labelAttribute);
-	        text.update();
-	        const textBounds = this.getGraphicBounds(text),
-	          graphicBounds = this.getGraphicBounds(baseMark, {
-	            x: textData.x,
-	            y: textData.y
-	          }),
-	          textAttributes = this.labeling(textBounds, graphicBounds, isFunction(position) ? position(textData) : position, offset);
-	        if (!textAttributes) continue;
-	        labelAttribute.x = textAttributes.x, labelAttribute.y = textAttributes.y, labels.push(labelAttribute);
-	      }
+	        baseMark = this._idToGraphic.get(textData.id),
+	        labelAttribute = Object.assign(Object.assign({}, textStyle), textData),
+	        text = this._createLabelText(labelAttribute),
+	        textBounds = this.getGraphicBounds(text),
+	        graphicBounds = this.getGraphicBounds(baseMark, {
+	          x: textData.x,
+	          y: textData.y
+	        }),
+	        textLocation = this.labeling(textBounds, graphicBounds, isFunction(position) ? position(textData) : position, offset);
+	      textLocation && (labelAttribute.x = textLocation.x, labelAttribute.y = textLocation.y, text.setAttributes(textLocation), labels.push(text));
 	    }
-	    return this._baseMarks = currentMarks, !1 !== this.attribute.overlap && (labels = this.overlapping(labels, this.attribute.overlap)), labels;
+	    return labels;
 	  }
-	  overlapping(labels) {
-	    let option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-	    var _a, _b, _c, _d, _e;
+	  _overlapping(labels) {
+	    var _a, _b, _c, _d;
 	    if (0 === labels.length) return [];
-	    const result = [],
+	    const option = this.attribute.overlap,
+	      result = [],
 	      baseMarkGroup = this.getBaseMarkGroup(),
 	      size = null !== (_a = option.size) && void 0 !== _a ? _a : {
 	        width: null !== (_b = null == baseMarkGroup ? void 0 : baseMarkGroup.AABBBounds.width()) && void 0 !== _b ? _b : 0,
@@ -41492,27 +41557,45 @@
 	    }));
 	    for (let i = 0; i < labels.length; i++) {
 	      if (!1 === labels[i].visible) continue;
-	      const text = createText(labels[i]),
-	        baseMark = null === (_e = this._baseMarks) || void 0 === _e ? void 0 : _e[i];
+	      const text = labels[i],
+	        baseMark = this._idToGraphic.get(text.attribute.id);
 	      if (text.update(), canPlace(bmpTool, bitmap, text.AABBBounds, clampForce)) {
 	        if (!checkBounds) {
-	          bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(Object.assign({}, text.attribute));
+	          bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
 	          continue;
 	        }
 	        if (checkBounds && (null == baseMark ? void 0 : baseMark.AABBBounds) && canPlaceInside(text.AABBBounds, null == baseMark ? void 0 : baseMark.AABBBounds)) {
-	          bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(Object.assign({}, text.attribute));
+	          bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
+	          continue;
+	        }
+	      }
+	      if (clampForce) {
+	        const {
+	          dx = 0,
+	          dy = 0
+	        } = clampText(text, bmpTool.width, bmpTool.height);
+	        if ((0 !== dx || 0 !== dy) && canPlace(bmpTool, bitmap, {
+	          x1: text.AABBBounds.x1 + dx,
+	          x2: text.AABBBounds.x2 + dx,
+	          y1: text.AABBBounds.y1 + dy,
+	          y2: text.AABBBounds.y2 + dy
+	        })) {
+	          text.setAttributes({
+	            x: text.attribute.x + dx,
+	            y: text.attribute.y + dy
+	          }), result.push(text);
 	          continue;
 	        }
 	      }
 	      let hasPlace = !1;
 	      for (let j = 0; j < strategy.length; j++) if (hasPlace = place$2(bmpTool, bitmap, strategy[j], this.attribute, text, this.getGraphicBounds(baseMark, labels[i]), this.labeling), !1 !== hasPlace) {
-	        result.push(Object.assign(Object.assign({}, text.attribute), {
+	        text.setAttributes({
 	          x: hasPlace.x,
 	          y: hasPlace.y
-	        }));
+	        }), result.push(text);
 	        break;
 	      }
-	      !hasPlace && !hideOnHit && result.push(Object.assign({}, text.attribute));
+	      !hasPlace && !hideOnHit && result.push(text);
 	    }
 	    return isFunction(this.onAfterLabelOverlap) && this.onAfterLabelOverlap(bitmap), result;
 	  }
@@ -41544,17 +41627,16 @@
 	      easing = null !== (_d = animationConfig.easing) && void 0 !== _d ? _d : DefaultLabelAnimation.easing,
 	      delay = null !== (_e = animationConfig.delay) && void 0 !== _e ? _e : 0,
 	      currentTextMap = new Map(),
-	      prevTextMap = this._textMap || new Map(),
+	      prevTextMap = this._graphicToText || new Map(),
 	      texts = [];
-	    labels.forEach((label, index) => {
-	      const text = this._createLabelText(label),
-	        relatedGraphic = this._relationMap.get(label._relatedIndex),
+	    labels.forEach((text, index) => {
+	      const relatedGraphic = this._idToGraphic.get(text.attribute.id),
 	        state = (null == prevTextMap ? void 0 : prevTextMap.get(relatedGraphic)) ? "update" : "enter";
 	      if ("enter" === state) if (texts.push(text), currentTextMap.set(relatedGraphic, text), !disableAnimation && relatedGraphic) {
 	        const {
 	          from: from,
 	          to: to
-	        } = getAnimationAttributes(label, "fadeIn");
+	        } = getAnimationAttributes(text.attribute, "fadeIn");
 	        this.add(text), relatedGraphic.onAnimateBind = () => {
 	          text.setAttributes(from);
 	          const listener = this._afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, {
@@ -41579,7 +41661,7 @@
 	      disableAnimation ? this.removeChild(label) : null == label || label.animate().to(getAnimationAttributes(label.attribute, "fadeOut").to, duration, easing).onEnd(() => {
 	        this.removeChild(label);
 	      });
-	    }), this._textMap = currentTextMap;
+	    }), this._graphicToText = currentTextMap;
 	  }
 	  _afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, _ref) {
 	    let {
@@ -41622,21 +41704,32 @@
 	    return listener;
 	  }
 	  _smartInvert(labels) {
-	    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-	    if (!1 !== this.attribute.smartInvert) for (let i = 0; i < labels.length; i++) {
-	      const label = null == labels ? void 0 : labels[i];
+	    const option = this.attribute.smartInvert || {},
+	      {
+	        textType: textType,
+	        contrastRatiosThreshold: contrastRatiosThreshold,
+	        alternativeColors: alternativeColors
+	      } = option;
+	    for (let i = 0; i < labels.length; i++) {
+	      const label = labels[i];
 	      if (!label) continue;
-	      const isInside = canPlaceInside(createText(label).AABBBounds, null === (_a = this._relationMap.get(label._relatedIndex)) || void 0 === _a ? void 0 : _a.AABBBounds);
-	      if (label.stroke && label.lineWidth > 0) label.fill = labelSmartInvert(label.fill, label.stroke, null === (_b = this.attribute.smartInvert) || void 0 === _b ? void 0 : _b.textType, null === (_c = this.attribute.smartInvert) || void 0 === _c ? void 0 : _c.contrastRatiosThreshold, null === (_d = this.attribute.smartInvert) || void 0 === _d ? void 0 : _d.alternativeColors);else if (isInside) {
-	        const backgroundColor = this._relationMap.get(label._relatedIndex).attribute.fill,
-	          foregroundColor = label.fill;
-	        label.fill = labelSmartInvert(foregroundColor, backgroundColor, null === (_e = this.attribute.smartInvert) || void 0 === _e ? void 0 : _e.textType, null === (_f = this.attribute.smartInvert) || void 0 === _f ? void 0 : _f.contrastRatiosThreshold, null === (_g = this.attribute.smartInvert) || void 0 === _g ? void 0 : _g.alternativeColors);
-	      } else if (label.lineWidth > 0) {
-	        const baseMark = this._relationMap.get(label._relatedIndex);
-	        label.stroke = baseMark.attribute.fill;
-	        const backgroundColor = label.stroke,
-	          foregroundColor = label.fill;
-	        label.fill = labelSmartInvert(foregroundColor, backgroundColor, null === (_h = this.attribute.smartInvert) || void 0 === _h ? void 0 : _h.textType, null === (_j = this.attribute.smartInvert) || void 0 === _j ? void 0 : _j.contrastRatiosThreshold, null === (_k = this.attribute.smartInvert) || void 0 === _k ? void 0 : _k.alternativeColors);
+	      const baseMark = this._idToGraphic.get(label.attribute.id),
+	        isInside = canPlaceInside(label.AABBBounds, null == baseMark ? void 0 : baseMark.AABBBounds);
+	      if (label.attribute.stroke && label.attribute.lineWidth > 0) label.setAttributes({
+	        fill: labelSmartInvert(label.attribute.fill, label.attribute.stroke, textType, contrastRatiosThreshold, alternativeColors)
+	      });else if (isInside) {
+	        const backgroundColor = baseMark.attribute.fill,
+	          foregroundColor = label.attribute.fill;
+	        label.setAttributes({
+	          fill: labelSmartInvert(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, alternativeColors)
+	        });
+	      } else if (label.attribute.lineWidth > 0) {
+	        const backgroundColor = label.attribute.stroke,
+	          foregroundColor = label.attribute.fill;
+	        label.setAttributes({
+	          stroke: baseMark.attribute.fill,
+	          fill: labelSmartInvert(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, alternativeColors)
+	        });
 	      }
 	    }
 	  }
@@ -50541,56 +50634,68 @@
 
 	class ViewAnimate {
 	  constructor(view) {
-	    this.view = view;
+	    this._animations = [], this._onAnimationStart = event => {
+	      0 === this._animations.length && this._view.emit(HOOK_EVENT.ALL_ANIMATION_START, {}), this._animations = this._animations.concat({
+	        config: event.animationConfig,
+	        mark: event.mark
+	      });
+	    }, this._onAnimationEnd = event => {
+	      this._animations = this._animations.filter(animation => animation.config !== event.animationConfig || animation.mark !== event.mark), 0 === this._animations.length && this._view.emit(HOOK_EVENT.ALL_ANIMATION_END, {});
+	    }, this._view = view, this._view.addEventListener(HOOK_EVENT.ANIMATION_START, this._onAnimationStart), this._view.addEventListener(HOOK_EVENT.ANIMATION_END, this._onAnimationEnd);
 	  }
 	  stop() {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.stop();
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.stop) || void 0 === _b || _b.call(_a);
 	    }), this;
 	  }
 	  pause() {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.pause();
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.pause) || void 0 === _b || _b.call(_a);
 	    }), this;
 	  }
 	  resume() {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.resume();
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.resume) || void 0 === _b || _b.call(_a);
 	    }), this;
 	  }
 	  enable() {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.enable();
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.enable) || void 0 === _b || _b.call(_a);
 	    }), this;
 	  }
 	  disable() {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.disable();
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disable) || void 0 === _b || _b.call(_a);
 	    }), this;
 	  }
 	  enableAnimationState(state) {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.enableAnimationState(state);
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.enableAnimationState) || void 0 === _b || _b.call(_a, state);
 	    }), this;
 	  }
 	  disableAnimationState(state) {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.disableAnimationState(state);
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disableAnimationState) || void 0 === _b || _b.call(_a, state);
 	    }), this;
 	  }
+	  isAnimating() {
+	    return 0 !== this._animations.length;
+	  }
 	  animate() {
-	    return this.view.traverseMarkTree(mark => {
+	    return this._view.traverseMarkTree(mark => {
 	      mark.isUpdated && mark.animate && mark.animate.animate(), mark.cleanExitElements(), mark.isUpdated = !1;
 	    }, null, !0), this;
 	  }
-	  release() {}
+	  release() {
+	    this._view.removeEventListener(HOOK_EVENT.ALL_ANIMATION_START, this._onAnimationStart), this._view.removeEventListener(HOOK_EVENT.ALL_ANIMATION_END, this._onAnimationEnd);
+	  }
 	}
 
 	class Interval extends Mark {
@@ -54255,7 +54360,8 @@
 	            },
 	            doLayout: () => {
 	                this._compileChart?.onLayout(this._view);
-	            }
+	            },
+	            logLevel: Logger.getInstance().level()
 	        });
 	        this._setCanvasStyle();
 	        const interactive = this._option.interactive;
@@ -54556,6 +54662,9 @@
 	    static hideTooltip(excludeId = []) {
 	        InstanceManager.forEach(instance => instance?.hideTooltip?.(), excludeId);
 	    }
+	    static getLogger() {
+	        return Logger.getInstance();
+	    }
 	    static InstanceManager = InstanceManager;
 	    static ThemeManager = ThemeManager;
 	    static globalConfig = {
@@ -57694,6 +57803,11 @@
 	            });
 	        });
 	    }
+	    setPostProcess(key, postProcessFunc, state = 'normal') {
+	        if (this.stateStyle[state]?.[key]) {
+	            this.stateStyle[state][key].postProcess = postProcessFunc;
+	        }
+	    }
 	    getAttribute(key, datum, state = 'normal', opt) {
 	        return this._computeAttribute(key, datum, state, opt);
 	    }
@@ -57749,12 +57863,16 @@
 	        return style;
 	    }
 	    _computeAttribute(key, datum, state, opt) {
-	        let baseValue;
+	        let stateStyle;
 	        if (!this.stateStyle[state]?.[key]) {
-	            baseValue = this._computeStateAttribute(this.stateStyle.normal[key], key, datum, state, opt);
+	            stateStyle = this.stateStyle.normal[key];
 	        }
 	        else {
-	            baseValue = this._computeStateAttribute(this.stateStyle[state][key], key, datum, state, opt);
+	            stateStyle = this.stateStyle[state][key];
+	        }
+	        let baseValue = this._computeStateAttribute(stateStyle, key, datum, state, opt);
+	        if (isFunction(stateStyle?.postProcess)) {
+	            baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView());
 	        }
 	        if (key in this._computeExChannel) {
 	            return this._computeExChannel[key](key, datum, state, opt, baseValue);
@@ -57970,7 +58088,7 @@
 	VChart.useMark([ComponentMark, GroupMark, ImageMark]);
 	Factory.registerRegion('region', Region);
 	Factory.registerLayout('base', Layout);
-	const version = "1.1.0";
+	const version = "1.1.1-beta.1";
 	Logger.getInstance(LoggerLevel.Error);
 
 	var SeriesMarkNameEnum;
@@ -65011,7 +65129,8 @@
 
 	const map = (data, opt) => {
 	    if (data.features) {
-	        data.features.forEach((f) => {
+	        data.features.forEach((f, index) => {
+	            f[DEFAULT_DATA_INDEX] = index;
 	            if (opt.nameMap) {
 	                f.name = opt.nameMap[f.properties?.[opt.nameProperty]];
 	            }
@@ -65125,6 +65244,7 @@
 	        });
 	        if (this._spec.label?.visible) {
 	            this._labelMark = this._createMark(MapSeries.mark.label, {
+	                parent: this.getRegion().getGroupMark(),
 	                skipBeforeLayouted: true,
 	                dataView: this._mapViewData.getDataView(),
 	                dataProductId: this._mapViewData.getProductId()
@@ -65139,10 +65259,16 @@
 	                    if (isValid(datum[this._seriesField ?? DEFAULT_DATA_SERIES_FIELD])) {
 	                        return (this._option.globalScale.getScale('color') ?? this.getDefaultColorScale()).scale(datum[this._seriesField ?? DEFAULT_DATA_SERIES_FIELD]);
 	                    }
-	                    return this._theme?.defaultFillColor;
+	                    return this._spec?.defaultFillColor;
 	                },
 	                path: this.getPath.bind(this)
 	            }, 'normal', AttributeLevel.Series);
+	            pathMark.setPostProcess('fill', result => {
+	                if (!isValid(result)) {
+	                    return this._spec.defaultFillColor;
+	                }
+	                return result;
+	            });
 	            this.setMarkStyle(pathMark, {
 	                smoothScale: true
 	            }, 'normal', AttributeLevel.Built_In);
@@ -65155,9 +65281,7 @@
 	                text: (datum) => {
 	                    return this._getDatumName(datum);
 	                },
-	                x: (datum) => {
-	                    return this.dataToPosition(datum)?.x;
-	                },
+	                x: (datum) => this.dataToPosition(datum)?.x,
 	                y: (datum) => this.dataToPosition(datum)?.y
 	            });
 	        }
@@ -65172,12 +65296,12 @@
 	        this._tooltipHelper = new MapSeriesTooltipHelper(this);
 	    }
 	    getPath(datum) {
-	        const area = this._areaCache.get(datum?.properties?.[this._nameProperty]);
+	        const area = this._areaCache.get(datum[DEFAULT_DATA_INDEX]);
 	        if (area) {
 	            return area.shape;
 	        }
 	        const shape = this._coordinateHelper?.shape(datum);
-	        this._areaCache.set(datum?.properties?.[this._nameProperty], {
+	        this._areaCache.set(datum[DEFAULT_DATA_INDEX], {
 	            shape
 	        });
 	        return shape;
@@ -65221,10 +65345,7 @@
 	            }
 	            const elements = vGrammarMark.elements;
 	            if (mark.type === MarkTypeEnum.path) {
-	                elements.forEach((el) => {
-	                    const graphicItem = el.getGraphicItem();
-	                    graphicItem.scale(scale, scale, scaleCenter);
-	                });
+	                vGrammarMark.group.getGroupGraphicItem().scale(scale, scale, scaleCenter);
 	            }
 	            else {
 	                elements.forEach((el) => {
@@ -65250,10 +65371,7 @@
 	            }
 	            const elements = vGrammarMark.elements;
 	            if (mark.type === MarkTypeEnum.path) {
-	                elements.forEach((el) => {
-	                    const graphicItem = el.getGraphicItem();
-	                    graphicItem.translate(delta[0], delta[1]);
-	                });
+	                vGrammarMark.group.getGroupGraphicItem().translate(delta[0], delta[1]);
 	            }
 	            else {
 	                elements.forEach((el, i) => {
@@ -65280,7 +65398,16 @@
 	        return [Number.NaN, Number.NaN];
 	    }
 	    _getDatumName(datum) {
-	        return datum[this.nameField] ?? datum.properties?.[this.nameField] ?? '';
+	        if (datum[this.nameField]) {
+	            return datum[this.nameField];
+	        }
+	        if (datum.properties?.[this._nameProperty]) {
+	            if (this._spec.nameMap) {
+	                return this._spec.nameMap[datum.properties[this._nameProperty]] ?? '';
+	            }
+	            return datum.properties[this._nameProperty] ?? '';
+	        }
+	        return '';
 	    }
 	    dataToPositionX(data) {
 	        throw new Error('Method not implemented.');
@@ -65294,7 +65421,7 @@
 	        this._mapViewData?.updateData();
 	    }
 	    _getDataIdKey() {
-	        return (datum) => datum?.properties?.[this._nameProperty];
+	        return DEFAULT_DATA_INDEX;
 	    }
 	}
 
@@ -76251,7 +76378,8 @@
 	            map: spec.map,
 	            nameProperty: spec.nameProperty,
 	            nameMap: spec.nameMap,
-	            area: spec.area
+	            area: spec.area,
+	            defaultFillColor: spec.defaultFillColor
 	        };
 	        return series;
 	    }
@@ -82562,6 +82690,7 @@
 	};
 
 	class Indicator extends BaseComponent {
+	    static speckey = 'indicator';
 	    static type = ComponentTypeEnum.indicator;
 	    type = ComponentTypeEnum.indicator;
 	    name = ComponentTypeEnum.indicator;
@@ -82582,7 +82711,7 @@
 	        const indicatorSpec = spec.indicator || options.defaultSpec;
 	        const indicators = array(indicatorSpec)
 	            .filter(s => s && s.visible !== false)
-	            .map(s => new Indicator(s, options));
+	            .map((s, index) => new Indicator(s, { ...options, specIndex: index, specKey: Indicator.speckey }));
 	        return indicators;
 	    }
 	    created() {
@@ -82732,9 +82861,12 @@
 	        return eachSeries(this._regions, s => model === s) || this._regions.includes(model);
 	    }
 	    clear() {
-	        super.clear();
-	        this._indicatorComponent = null;
+	        if (this._indicatorComponent) {
+	            this._container.removeChild(this._indicatorComponent);
+	            this._indicatorComponent = null;
+	        }
 	        this._cacheAttrs = null;
+	        super.clear();
 	    }
 	}