@visactor/vchart 1.2.2-beta.2 → 1.2.2-hotfix.0

package/build/index.js

@@ -26008,6 +26008,7 @@
 	    if (heightLimit > 0 && (lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1)), lineClamp && (lineCountLimit = Math.min(lineCountLimit, lineClamp)), "number" == typeof maxLineWidth && maxLineWidth !== 1 / 0) {
 	      if (maxLineWidth > 0) for (let i = 0; i < lines.length; i++) {
 	        const str = lines[i];
+	        let needCut = !0;
 	        if (i === lineCountLimit - 1) {
 	          const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);
 	          linesLayout.push({
@@ -26017,14 +26018,17 @@
 	          break;
 	        }
 	        const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);
-	        if ("" !== str && "" === clip.str) if (ellipsis) {
-	          const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);
-	          clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
-	        } else clip.str = "", clip.width = 0;
+	        if ("" !== str && "" === clip.str) {
+	          if (ellipsis) {
+	            const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);
+	            clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
+	          } else clip.str = "", clip.width = 0;
+	          needCut = !1;
+	        }
 	        if (linesLayout.push({
 	          str: clip.str,
 	          width: clip.width
-	        }), clip.str.length === str.length) ;else {
+	        }), clip.str.length === str.length) ;else if (needCut) {
 	          const newStr = str.substring(clip.str.length);
 	          lines.splice(i + 1, 0, newStr);
 	        }
@@ -30015,7 +30019,8 @@
 	      getBoundingClientRect: () => ({
 	        height: domref.height,
 	        width: domref.width
-	      })
+	      }),
+	      nativeCanvas: _canvas
 	    };
 	    canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas);
 	  });
@@ -31258,7 +31263,10 @@
 	  applyPosition() {}
 	  hide() {}
 	  show() {}
-	  resize(width, height) {}
+	  resize(width, height) {
+	    this._pixelWidth = width * this._dpr, this._pixelHeight = height * this._dpr, this._displayWidth = width, this._displayHeight = height, this._nativeCanvas.width = this._pixelWidth, this._nativeCanvas.height = this._pixelHeight, this._nativeCanvas.nativeCanvas && (this._nativeCanvas.nativeCanvas.width = this._pixelWidth, this._nativeCanvas.nativeCanvas.height = this._pixelHeight);
+	    this._context.dpr = this._dpr;
+	  }
 	  toDataURL(mimeType, quality) {
 	    return "";
 	  }
@@ -31370,7 +31378,9 @@
 	    });
 	  }
 	  releaseWindow() {}
-	  resizeWindow(width, height) {}
+	  resizeWindow(width, height) {
+	    this.canvas.resize(width, height);
+	  }
 	  setDpr(dpr) {
 	    this.canvas.dpr = dpr;
 	  }
@@ -40716,29 +40726,34 @@
 	  }
 	  return t;
 	};
+	const _tBounds = new AABBBounds();
 	class PopTip extends AbstractComponent {
 	  constructor(attributes) {
 	    super(merge$2({}, PopTip.defaultAttributes, attributes)), this.name = "poptip", this.positionList = ["top", "tl", "tr", "bottom", "bl", "br", "left", "lt", "lb", "right", "rt", "rb"];
 	  }
 	  render() {
-	    var _a, _b, _c, _d, _e;
+	    var _a, _b, _c, _d, _e, _f, _g, _h;
 	    const {
-	        title = "",
-	        titleStyle = {},
-	        position: position,
-	        content = "",
-	        contentStyle = {},
-	        panel = {},
-	        space = 4,
-	        minWidth = 0,
-	        maxWidth = 1 / 0,
-	        padding = 4,
-	        visible: visible,
-	        state: state,
-	        dx = 0,
-	        dy = 0
-	      } = this.attribute,
-	      parsedPadding = normalizePadding$1(padding),
+	      titleStyle = {},
+	      position: position,
+	      contentStyle = {},
+	      panel = {},
+	      space = 4,
+	      minWidth = 0,
+	      maxWidth = 1 / 0,
+	      padding = 4,
+	      maxWidthPercent: maxWidthPercent,
+	      visible: visible,
+	      state: state,
+	      dx = 0,
+	      dy = 0
+	    } = this.attribute;
+	    let {
+	      title = "",
+	      content = ""
+	    } = this.attribute;
+	    title = this.attribute.titleFormatMethod ? this.attribute.titleFormatMethod(title) : title, content = this.attribute.contentFormatMethod ? this.attribute.contentFormatMethod(content) : content;
+	    const parsedPadding = normalizePadding$1(padding),
 	      group = this.createOrUpdateChild("poptip-content", {
 	        x: 0,
 	        y: 0,
@@ -40747,7 +40762,7 @@
 	      maxLineWidth = maxWidth - parsedPadding[1] - parsedPadding[3],
 	      titleVisible = isValid(title) && !1 !== visible,
 	      titleAttrs = Object.assign(Object.assign({
-	        text: title,
+	        text: isArray$3(title) ? title : [title],
 	        visible: titleVisible
 	      }, titleStyle), {
 	        x: parsedPadding[3],
@@ -40756,7 +40771,7 @@
 	        textAlign: "left",
 	        textBaseline: "top"
 	      }),
-	      titleShape = group.createOrUpdateChild("poptip-title", titleAttrs, "text");
+	      titleShape = group.createOrUpdateChild("poptip-title", titleAttrs, "wrapText");
 	    isEmpty(null == state ? void 0 : state.title) || (titleShape.states = state.title);
 	    const titleBounds = titleShape.AABBBounds,
 	      titleHeight = titleBounds.height(),
@@ -40765,7 +40780,7 @@
 	    titleVisible || (height = 0);
 	    const contentVisible = isValid(content) && !1 !== visible,
 	      contentAttrs = Object.assign(Object.assign({
-	        text: content,
+	        text: isArray$3(content) ? content : [content],
 	        visible: contentVisible
 	      }, contentStyle), {
 	        x: parsedPadding[3],
@@ -40774,7 +40789,7 @@
 	        textAlign: "left",
 	        textBaseline: "top"
 	      }),
-	      contentShape = group.createOrUpdateChild("poptip-content", contentAttrs, "text");
+	      contentShape = group.createOrUpdateChild("poptip-content", contentAttrs, "wrapText");
 	    isEmpty(null == state ? void 0 : state.content) || (contentShape.states = state.content);
 	    const contentBounds = contentShape.AABBBounds,
 	      contentHeight = contentBounds.height(),
@@ -40782,20 +40797,32 @@
 	    contentVisible && (height += contentHeight);
 	    let popTipWidth = max$3(titleWidth + parsedPadding[1] + parsedPadding[3], contentWidth + parsedPadding[1] + parsedPadding[3]);
 	    popTipWidth > maxWidth ? popTipWidth = maxWidth : popTipWidth < minWidth && (popTipWidth = minWidth);
-	    const poptipHeight = parsedPadding[0] + parsedPadding[2] + height,
-	      {
+	    let poptipHeight = parsedPadding[0] + parsedPadding[2] + height;
+	    const {
 	        visible: bgVisible
 	      } = panel,
 	      backgroundStyle = __rest$5(panel, ["visible"]),
 	      symbolSize = null !== (_a = backgroundStyle.size) && void 0 !== _a ? _a : 12,
 	      spaceSize = isArray$3(symbolSize) ? [symbolSize[0] + (null !== (_b = backgroundStyle.space) && void 0 !== _b ? _b : 0), symbolSize[1] + (null !== (_c = backgroundStyle.space) && void 0 !== _c ? _c : 0)] : symbolSize + (null !== (_d = backgroundStyle.space) && void 0 !== _d ? _d : 0),
 	      lineWidth = null !== (_e = backgroundStyle.lineWidth) && void 0 !== _e ? _e : 1,
-	      range = this.stage ? [this.stage.width, this.stage.height] : void 0,
-	      layout = "auto" === position;
-	    let minifyBBoxI,
-	      minifyBBoxSize = 1 / 0;
+	      range = this.stage ? [null !== (_f = this.stage.viewWidth) && void 0 !== _f ? _f : this.stage.width, null !== (_g = this.stage.viewHeight) && void 0 !== _g ? _g : this.stage.height] : void 0;
+	    if (range) {
+	      const b = this.AABBBounds,
+	        leftWidth = null !== (_h = this.attribute.x) && void 0 !== _h ? _h : b.x1,
+	        rightWidth = range[0] - b.x1;
+	      let maxSpace = Math.max(leftWidth, rightWidth);
+	      const buf = (isArray$3(symbolSize) ? symbolSize[0] : 12) + 3;
+	      if (maxSpace = Math.min(maxSpace - buf, maxSpace * maxWidthPercent), maxSpace < popTipWidth) {
+	        popTipWidth = maxSpace;
+	        const buf = parsedPadding[1] + parsedPadding[3];
+	        titleShape.setAttribute("maxLineWidth", maxSpace - buf), contentShape.setAttribute("maxLineWidth", maxSpace - buf), poptipHeight = parsedPadding[0] + parsedPadding[2], titleVisible && (poptipHeight += titleShape.AABBBounds.height() + space), poptipHeight += contentShape.AABBBounds.height();
+	      }
+	    }
+	    const layout = "auto" === position;
+	    let maxBBoxI,
+	      maxBBoxSize = -1 / 0;
 	    for (let i = 0; i < this.positionList.length + 1; i++) {
-	      const p = layout ? this.positionList[i === this.positionList.length ? minifyBBoxI : i] : position,
+	      const p = layout ? this.positionList[i === this.positionList.length ? maxBBoxI : i] : position,
 	        {
 	          angle: angle,
 	          offset: offset,
@@ -40833,13 +40860,14 @@
 	        y: -offset[1] + dy
 	      }), !layout || !range) break;
 	      {
-	        const b = this.AABBBounds,
+	        _tBounds.setValue(0, 0, popTipWidth, poptipHeight).transformWithMatrix(group.globalTransMatrix);
+	        const b = _tBounds,
 	          stageBounds = new Bounds().setValue(0, 0, range[0], range[1]);
 	        if (rectInsideAnotherRect(b, stageBounds, !1)) break;
 	        {
 	          const bbox = getRectIntersect(b, stageBounds, !1),
 	            size = (bbox.x2 - bbox.x1) * (bbox.y2 - bbox.y1);
-	          size < minifyBBoxSize && (minifyBBoxSize = size, minifyBBoxI = i);
+	          size > maxBBoxSize && (maxBBoxSize = size, maxBBoxI = i);
 	        }
 	      }
 	    }
@@ -40939,6 +40967,7 @@
 	    textAlign: "left",
 	    textBaseline: "top"
 	  },
+	  maxWidthPercent: .8,
 	  space: 8,
 	  padding: 10
 	};
@@ -40987,7 +41016,8 @@
 	        visibleCb: visibleCb
 	      } = graphic.attribute.poptip || {};
 	      if (!1 === visible || visibleCb && !1 === visibleCb(graphic)) return;
-	      this.poptipComponent || (this.poptipComponent = new PopTip(graphic.attribute.poptip));
+	      const attribute = {};
+	      graphic.attribute.poptip && merge$2(attribute, PopTip.defaultAttributes, graphic.attribute.poptip), this.poptipComponent ? this.poptipComponent.initAttributes(attribute) : this.poptipComponent = new PopTip(attribute);
 	      let poptip = graphic.attribute.poptip || {};
 	      if ("text" === graphic.type && null == poptip.title && null == poptip.content) {
 	        const out = {};
@@ -58418,7 +58448,7 @@
 	VChart.useMark([ComponentMark, GroupMark, ImageMark]);
 	Factory.registerRegion('region', Region);
 	Factory.registerLayout('base', Layout);
-	const version = "1.2.2-beta.2";
+	const version = "1.2.2-hotfix.0";
 	Logger.getInstance(LoggerLevel.Error);
 
 	var SeriesMarkNameEnum;
@@ -60304,8 +60334,8 @@
 	    [exports.RenderModeEnum['mobile-browser']]: {
 	        hover: {
 	            enable: true,
-	            trigger: 'pointerover',
-	            triggerOff: 'pointerout'
+	            trigger: ['pointerdown', 'pointermove'],
+	            triggerOff: ['pointermove', 'pointerleave']
 	        },
 	        select: {
 	            enable: true,
@@ -60315,8 +60345,8 @@
 	    [exports.RenderModeEnum.miniApp]: {
 	        hover: {
 	            enable: true,
-	            trigger: 'pointerover',
-	            triggerOff: 'pointerout'
+	            trigger: ['pointerdown', 'pointermove'],
+	            triggerOff: ['pointermove', 'pointerleave']
 	        },
 	        select: {
 	            enable: true,
@@ -60326,8 +60356,8 @@
 	    [exports.RenderModeEnum.lynx]: {
 	        hover: {
 	            enable: true,
-	            trigger: 'pointerover',
-	            triggerOff: 'pointerout'
+	            trigger: ['pointerdown', 'pointermove'],
+	            triggerOff: ['pointermove', 'pointerleave']
 	        },
 	        select: {
 	            enable: true,