@visactor/vchart-extension 2.0.5 → 2.0.6

package/build/index.js

@@ -5380,7 +5380,15 @@
 
 	const DEFAULT_TEXT_FONT_FAMILY$1 = "PingFang SC,Helvetica Neue,Microsoft Yahei,system-ui,-apple-system,segoe ui,Roboto,Helvetica,Arial,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol";
 
-	class Application {}
+	const container = new Container();
+
+	const RenderService = Symbol.for("RenderService");
+
+	class Application {
+	  get renderService() {
+	    return this._renderService || (this._renderService = container.get(RenderService)), this._renderService;
+	  }
+	}
 	const application = new Application();
 
 	let idx = 0;
@@ -7519,8 +7527,6 @@
 	  return result.width += space, result;
 	}
 
-	const container = new Container();
-
 	const CanvasFactory = Symbol.for("CanvasFactory");
 
 	function wrapCanvas(params) {
@@ -11392,7 +11398,7 @@
 	      this.cache.layoutData.lines.forEach(item => {
 	        mergedText += item.str;
 	      });
-	      return (Array.isArray(text) ? text.join("") : text) !== mergedText;
+	      return (Array.isArray(text) ? text.join("") : text).toString() !== mergedText;
 	    }
 	    return "vertical" === attribute.direction && this.cache.verticalList && this.cache.verticalList[0] ? this.cache.verticalList[0].map(item => item.text).join("") !== attribute.text.toString() : null != this.clipedText && this.clipedText !== attribute.text.toString();
 	  }
@@ -11491,7 +11497,7 @@
 	    return fontSize ? .1 * fontSize : 0;
 	  }
 	  updateHorizontalMultilineAABBBounds(text) {
-	    var _a;
+	    var _a, _b;
 	    const textTheme = this.getGraphicTheme(),
 	      attribute = this.attribute,
 	      {
@@ -11518,7 +11524,7 @@
 	      const bbox = this.cache.layoutData.bbox;
 	      return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
 	    }
-	    const textMeasure = application.graphicUtil.textMeasure,
+	    const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_b = this.stage) || void 0 === _b ? void 0 : _b.textMeasureId)),
 	      layoutData = new CanvasTextLayout(fontFamily, {
 	        fontSize: fontSize,
 	        fontWeight: fontWeight,
@@ -11536,7 +11542,7 @@
 	    return this.cache.layoutData = layoutData, this.clearUpdateShapeTag(), this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
 	  }
 	  updateWrapAABBBounds(text) {
-	    var _a, _b, _c;
+	    var _a, _b, _c, _d;
 	    const textTheme = this.getGraphicTheme(),
 	      {
 	        fontFamily = textTheme.fontFamily,
@@ -11562,7 +11568,7 @@
 	      const bbox = this.cache.layoutData.bbox;
 	      return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
 	    }
-	    const textMeasure = application.graphicUtil.textMeasure,
+	    const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_b = this.stage) || void 0 === _b ? void 0 : _b.textMeasureId)),
 	      textOptions = {
 	        fontSize: fontSize,
 	        fontWeight: fontWeight,
@@ -11594,7 +11600,7 @@
 	        if ("" !== str && "" === clip.str || clip.wordBreaked) {
 	          if (ellipsis) {
 	            const clipEllipsis = textMeasure.clipTextWithSuffix(str, textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
-	            clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
+	            clip.str = null !== (_c = clipEllipsis.str) && void 0 !== _c ? _c : "", clip.width = null !== (_d = clipEllipsis.width) && void 0 !== _d ? _d : 0;
 	          } else clip.str = "", clip.width = 0;
 	          needCut = !1;
 	        }
@@ -11657,9 +11663,9 @@
 	    return this.cache.layoutData = layoutData, this.clearUpdateShapeTag(), this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
 	  }
 	  updateVerticalMultilineAABBBounds(text) {
-	    var _a, _b;
+	    var _a, _b, _c;
 	    const textTheme = this.getGraphicTheme(),
-	      textMeasure = application.graphicUtil.textMeasure;
+	      textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_a = this.stage) || void 0 === _a ? void 0 : _a.textMeasureId));
 	    let width;
 	    const attribute = this.attribute,
 	      {
@@ -11680,7 +11686,7 @@
 	    } = attribute;
 	    if (!verticalMode) {
 	      const t = textAlign;
-	      textAlign = null !== (_a = Text.baselineMapAlign[textBaseline]) && void 0 !== _a ? _a : "left", textBaseline = null !== (_b = Text.alignMapBaseline[t]) && void 0 !== _b ? _b : "top";
+	      textAlign = null !== (_b = Text.baselineMapAlign[textBaseline]) && void 0 !== _b ? _b : "left", textBaseline = null !== (_c = Text.alignMapBaseline[t]) && void 0 !== _c ? _c : "top";
 	    }
 	    if (width = 0, !this.shouldUpdateShape() && this.cache) {
 	      this.cache.verticalList.forEach(item => {
@@ -14651,7 +14657,7 @@
 	    doFill && (fillCb ? fillCb(context, arc.attribute, arcAttribute) : fVisible && (context.setCommonStyle(arc, arc.attribute, originX - x, originY - y, arcAttribute), context.fill()));
 	  }
 	  _runStroke(arc, context, x, y, arcAttribute, doStroke, isFullStroke, sVisible, strokeCb) {
-	    doStroke && isFullStroke && (strokeCb || sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke()));
+	    doStroke && isFullStroke && (strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke()));
 	  }
 	  draw(arc, renderService, drawContext, params) {
 	    const arcAttribute = getTheme(arc, null == params ? void 0 : params.theme).arc;
@@ -18735,12 +18741,12 @@
 	    const parsedParams = this.parseParams(params, isTimeline);
 	    return animate = isTimeline ? this.executeTimelineItem(parsedParams, graphic, index, count) : this.executeTypeConfigItem(parsedParams, graphic, index, count), animate && this._trackAnimation(animate), animate;
 	  }
-	  stop(type) {
+	  stop(type, callEnd = !0) {
 	    for (; this._animates.length > 0;) {
 	      const animate = this._animates.pop();
-	      null == animate || animate.stop(type);
+	      !1 === callEnd && (animate.status = AnimateStatus.END), null == animate || animate.stop(type);
 	    }
-	    this._animates = [], this._activeCount = 0, this._started && (this._started = !1, this.onEnd());
+	    this._animates = [], this._activeCount = 0, this._started && (this._started = !1, callEnd && this.onEnd());
 	  }
 	}
 	AnimateExecutor.builtInAnimateMap = {};
@@ -18800,7 +18806,7 @@
 	        executor: new AnimateExecutor(this.graphic)
 	      });
 	    }), shouldStopState.forEach(state => {
-	      state.executor.stop();
+	      state.executor.stop(null, !1);
 	    }), shouldApplyState.length) {
 	      shouldApplyState[0].executor.execute(shouldApplyState[0].animationConfig);
 	      for (let i = 0; i < shouldApplyState.length; i++) {
@@ -18851,7 +18857,7 @@
 	  clearState() {
 	    var _a;
 	    null === (_a = this.stateList) || void 0 === _a || _a.forEach(state => {
-	      state.executor.stop();
+	      state.executor.stop(null, !1);
 	    }), this.stateList = null;
 	  }
 	  reApplyState(state) {