@visactor/vchart 1.1.1-beta.1 → 1.1.1

package/build/index.js

@@ -41365,24 +41365,6 @@
 	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] : {};
@@ -41461,17 +41443,9 @@
 	    this._bmpTool = bmpTool;
 	  }
 	  render() {
-	    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);
+	    const currentBaseMarks = this._checkMarks(),
+	      labels = this.layout(currentBaseMarks);
+	    this._smartInvert(labels), this._renderLabels(labels);
 	  }
 	  _bindEvent(target) {
 	    if (!target) return;
@@ -41490,53 +41464,52 @@
 	    const text = createText(attributes);
 	    return this._bindEvent(text), this._setStates(text), text;
 	  }
-	  _prepare() {
+	  _checkMarks() {
 	    var _a;
 	    const baseMarks = this.getBaseMarks(),
 	      currentBaseMarks = [];
-	    if (baseMarks.forEach(mark => {
+	    return baseMarks.forEach(mark => {
 	      "willRelease" !== mark.releaseStatus && currentBaseMarks.push(mark);
-	    }), null === (_a = this._idToGraphic) || void 0 === _a || _a.clear(), this._baseMarks = currentBaseMarks, !currentBaseMarks || 0 === currentBaseMarks.length) return;
+	    }), this._prevRelationMap = new Map(this._relationMap), null === (_a = this._relationMap) || void 0 === _a || _a.clear(), currentBaseMarks;
+	  }
+	  layout(currentMarks) {
 	    const {
+	      textStyle: textStyle,
+	      position: position,
+	      offset: offset
+	    } = this.attribute;
+	    let {
 	      data: data
 	    } = this.attribute;
-	    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 = [];
+	    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());
 	    for (let i = 0; i < data.length; i++) {
 	      const textData = data[i],
-	        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));
+	        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);
+	      }
 	    }
-	    return labels;
+	    return this._baseMarks = currentMarks, !1 !== this.attribute.overlap && (labels = this.overlapping(labels, this.attribute.overlap)), labels;
 	  }
-	  _overlapping(labels) {
-	    var _a, _b, _c, _d;
+	  overlapping(labels) {
+	    let option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	    var _a, _b, _c, _d, _e;
 	    if (0 === labels.length) return [];
-	    const option = this.attribute.overlap,
-	      result = [],
+	    const 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,
@@ -41557,45 +41530,27 @@
 	    }));
 	    for (let i = 0; i < labels.length; i++) {
 	      if (!1 === labels[i].visible) continue;
-	      const text = labels[i],
-	        baseMark = this._idToGraphic.get(text.attribute.id);
+	      const text = createText(labels[i]),
+	        baseMark = null === (_e = this._baseMarks) || void 0 === _e ? void 0 : _e[i];
 	      if (text.update(), canPlace(bmpTool, bitmap, text.AABBBounds, clampForce)) {
 	        if (!checkBounds) {
-	          bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
+	          bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(Object.assign({}, text.attribute));
 	          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(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);
+	          bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(Object.assign({}, text.attribute));
 	          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) {
-	        text.setAttributes({
+	        result.push(Object.assign(Object.assign({}, text.attribute), {
 	          x: hasPlace.x,
 	          y: hasPlace.y
-	        }), result.push(text);
+	        }));
 	        break;
 	      }
-	      !hasPlace && !hideOnHit && result.push(text);
+	      !hasPlace && !hideOnHit && result.push(Object.assign({}, text.attribute));
 	    }
 	    return isFunction(this.onAfterLabelOverlap) && this.onAfterLabelOverlap(bitmap), result;
 	  }
@@ -41627,16 +41582,17 @@
 	      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._graphicToText || new Map(),
+	      prevTextMap = this._textMap || new Map(),
 	      texts = [];
-	    labels.forEach((text, index) => {
-	      const relatedGraphic = this._idToGraphic.get(text.attribute.id),
+	    labels.forEach((label, index) => {
+	      const text = this._createLabelText(label),
+	        relatedGraphic = this._relationMap.get(label._relatedIndex),
 	        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(text.attribute, "fadeIn");
+	        } = getAnimationAttributes(label, "fadeIn");
 	        this.add(text), relatedGraphic.onAnimateBind = () => {
 	          text.setAttributes(from);
 	          const listener = this._afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, {
@@ -41661,7 +41617,7 @@
 	      disableAnimation ? this.removeChild(label) : null == label || label.animate().to(getAnimationAttributes(label.attribute, "fadeOut").to, duration, easing).onEnd(() => {
 	        this.removeChild(label);
 	      });
-	    }), this._graphicToText = currentTextMap;
+	    }), this._textMap = currentTextMap;
 	  }
 	  _afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, _ref) {
 	    let {
@@ -41704,32 +41660,21 @@
 	    return listener;
 	  }
 	  _smartInvert(labels) {
-	    const option = this.attribute.smartInvert || {},
-	      {
-	        textType: textType,
-	        contrastRatiosThreshold: contrastRatiosThreshold,
-	        alternativeColors: alternativeColors
-	      } = option;
-	    for (let i = 0; i < labels.length; i++) {
-	      const label = labels[i];
+	    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];
 	      if (!label) continue;
-	      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)
-	        });
+	      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);
 	      }
 	    }
 	  }
@@ -58088,7 +58033,7 @@
 	VChart.useMark([ComponentMark, GroupMark, ImageMark]);
 	Factory.registerRegion('region', Region);
 	Factory.registerLayout('base', Layout);
-	const version = "1.1.1-beta.1";
+	const version = "1.1.1";
 	Logger.getInstance(LoggerLevel.Error);
 
 	var SeriesMarkNameEnum;