@visactor/vchart 1.13.3 → 1.13.4

package/build/index.es.js

@@ -8785,7 +8785,7 @@ let Step$1 = class Step {
       default:
         if (this._t <= 0) this.context.lineTo(this._x, y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x, y, !1 !== this._lastDefined && !1 !== p.defined, p);else {
           const x1 = this._x * (1 - this._t) + x * this._t;
-          this.context.lineTo(x1, this._y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x1, y, !1 !== this._lastDefined && !1 !== p.defined, p);
+          .5 === this._t ? this.context.lineTo(x1, this._y, !1 !== this._lastDefined, this.lastPoint) : this.context.lineTo(x1, this._y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x1, y, !1 !== this._lastDefined && !1 !== p.defined, p);
         }
     }
     this._lastDefined = p.defined, this._x = x, this._y = y, this.lastPoint = p;
@@ -12515,7 +12515,7 @@ let Animate$1 = class Animate {
     let id = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : Generator.GenAutoIncrementId();
     let timeline = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultTimeline;
     let slience = arguments.length > 2 ? arguments[2] : undefined;
-    this.id = id, this.timeline = timeline, this.status = AnimateStatus.INITIAL, this.tailAnimate = new SubAnimate(this), this.subAnimates = [this.tailAnimate], this.timeScale = 1, this.rawPosition = -1, this._startTime = 0, this._duringTime = 0, this.timeline.addAnimate(this), this.slience = slience;
+    this.id = id, this.timeline = timeline || defaultTimeline, this.status = AnimateStatus.INITIAL, this.tailAnimate = new SubAnimate(this), this.subAnimates = [this.tailAnimate], this.timeScale = 1, this.rawPosition = -1, this._startTime = 0, this._duringTime = 0, this.timeline.addAnimate(this), this.slience = slience;
   }
   setTimeline(timeline) {
     timeline !== this.timeline && (this.timeline.removeAnimate(this, !1), timeline.addAnimate(this));
@@ -14377,7 +14377,7 @@ class ResourceLoader {
   }
   static GetFile(url, type) {
     let data = ResourceLoader.cache.get(url);
-    return data ? "init" === data.loadState || "fail" === data.loadState ? Promise.reject() : "loading" === data.loadState ? data.dataPromise.then(data => data.data) : Promise.resolve(data.data) : (data = {
+    return data ? "fail" === data.loadState ? Promise.reject() : "init" === data.loadState || "loading" === data.loadState ? data.dataPromise.then(data => data.data) : Promise.resolve(data.data) : (data = {
       type: type,
       loadState: "init"
     }, ResourceLoader.cache.set(url, data), "arrayBuffer" === type ? data.dataPromise = application.global.loadArrayBuffer(url) : "blob" === type ? data.dataPromise = application.global.loadBlob(url) : "json" === type && (data.dataPromise = application.global.loadJson(url)), data.dataPromise.then(data => data.data));
@@ -17178,8 +17178,8 @@ class DefaultImageRenderContribution extends DefaultRectRenderContribution {
   constructor() {
     super(...arguments), this.time = BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
   }
-  drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
-    return super.drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
+  drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
+    return super.drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
   }
 }
 const defaultImageRenderContribution = new DefaultImageRenderContribution();
@@ -17614,7 +17614,7 @@ let DefaultCanvasLineRender = class extends BaseRender {
     this._draw(line, lineAttribute, !1, drawContext, params);
   }
   drawSegmentItem(context, cache, fill, stroke, fillOpacity, strokeOpacity, attribute, defaultAttribute, clipRange, clipRangeByDimension, offsetX, offsetY, line, fillCb, strokeCb) {
-    var _a, _b, _c, _d, _e;
+    var _a;
     if (!cache) return;
     context.beginPath();
     const z = null !== (_a = this.z) && void 0 !== _a ? _a : 0;
@@ -17627,27 +17627,7 @@ let DefaultCanvasLineRender = class extends BaseRender {
       x: originX = 0,
       x: originY = 0
     } = attribute;
-    !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke()));
-    let {
-      connectedType: connectedType,
-      connectedX: connectedX,
-      connectedY: connectedY,
-      connectedStyle: connectedStyle
-    } = attribute;
-    if (isArray$1(defaultAttribute) ? (connectedType = null !== (_b = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _b ? _b : defaultAttribute[1].connectedType, connectedX = null !== (_c = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _c ? _c : defaultAttribute[1].connectedX, connectedY = null !== (_d = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _d ? _d : defaultAttribute[1].connectedY, connectedStyle = null !== (_e = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _e ? _e : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), "none" !== connectedType) {
-      context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {
-        offsetX: offsetX,
-        offsetY: offsetY,
-        offsetZ: z,
-        drawConnect: !0,
-        mode: connectedType,
-        zeroX: connectedX,
-        zeroY: connectedY
-      });
-      const da = [];
-      isArray$1(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute), !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.stroke()));
-    }
-    return !1;
+    return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke())), !1;
   }
   drawLinearLineHighPerformance(line, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, lineAttribute, drawContext, params, fillCb, strokeCb) {
     var _a;
@@ -17679,7 +17659,8 @@ let DefaultCanvasLineRender = class extends BaseRender {
         segments: segments,
         points: points,
         closePath: closePath,
-        curveTension = lineAttribute.curveTension
+        curveTension = lineAttribute.curveTension,
+        connectedType = lineAttribute.connectedType
       } = line.attribute;
     if (!this.valid(line, lineAttribute, fillCb, strokeCb)) return;
     let {
@@ -17691,6 +17672,9 @@ let DefaultCanvasLineRender = class extends BaseRender {
       clipRangeByDimension = lineAttribute.clipRangeByDimension
     } = line.attribute;
     if (1 === clipRange && !segments && !points.some(p => !1 === p.defined) && "linear" === curveType) return this.drawLinearLineHighPerformance(line, context, !!fill, !!stroke, fillOpacity, strokeOpacity, x, y, lineAttribute, drawContext, params, fillCb, strokeCb);
+    function parsePoint(points, connectedType) {
+      return "none" === connectedType ? points : points.filter(p => !1 !== p.defined);
+    }
     if (line.shouldUpdateShape()) {
       const {
           points: points,
@@ -17712,7 +17696,7 @@ let DefaultCanvasLineRender = class extends BaseRender {
             y: lastSeg.endY,
             defined: lastSeg.curves[lastSeg.curves.length - 1].defined
           } : index > 1 && (startPoint.x = lastSeg.endX, startPoint.y = lastSeg.endY, startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined);
-          const data = calcLineCache(seg.points, curveType, {
+          const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
             startPoint: startPoint,
             curveTension: curveTension
           });
@@ -17731,7 +17715,7 @@ let DefaultCanvasLineRender = class extends BaseRender {
         }
       } else {
         if (!points || !points.length) return line.cache = null, void line.clearUpdateShapeTag();
-        line.cache = calcLineCache(_points, curveType, {
+        line.cache = calcLineCache(parsePoint(_points, connectedType), curveType, {
           curveTension: curveTension
         });
       }
@@ -17763,11 +17747,6 @@ DefaultCanvasLineRender = __decorate$1q([injectable()], DefaultCanvasLineRender)
 
 function drawAreaSegments(path, segPath, percent, params) {
   var _a;
-  const {
-    drawConnect = !1,
-    mode = "none"
-  } = params || {};
-  if (drawConnect && "none" === mode) return;
   const {
     top: top,
     bottom: bottom
@@ -17777,34 +17756,11 @@ function drawAreaSegments(path, segPath, percent, params) {
     const topList = [],
       bottomList = [];
     let lastDefined = !0;
-    if (drawConnect) {
-      let lastCurve,
-        lastBottomCurve,
-        defined0 = !0;
-      const n = top.curves.length;
-      top.curves.forEach((curve, i) => {
-        const bototmCurve = bottom.curves[n - i - 1];
-        let currentTopCurve = curve,
-          currentBottomCurve = bototmCurve;
-        if (curve.originP1 === curve.originP2) return lastCurve = curve, void (lastBottomCurve = bototmCurve);
-        if (lastCurve && lastCurve.originP1 === lastCurve.originP2 && (currentTopCurve = lastCurve, currentBottomCurve = lastBottomCurve), curve.defined) defined0 || (topList.push(currentTopCurve), bottomList.push(currentBottomCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0, defined0 = !defined0);else {
-          const {
-            originP1: originP1,
-            originP2: originP2
-          } = curve;
-          let validTopCurve, validBottomCurve;
-          originP1 && !1 !== originP1.defined ? (validTopCurve = currentTopCurve, validBottomCurve = currentBottomCurve) : originP1 && !1 !== originP2.defined && (validTopCurve = curve, validBottomCurve = bototmCurve), defined0 ? (defined0 = !defined0, topList.push(validTopCurve || curve), bottomList.push(validBottomCurve || bototmCurve)) : validTopCurve && (defined0 = !defined0, topList.push(validTopCurve || curve), bottomList.push(validBottomCurve || bototmCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0);
-        }
-        lastCurve = curve;
-      }), drawAreaConnectBlock(path, topList, bottomList, params);
-    } else {
-      for (let i = 0, n = top.curves.length; i < n; i++) {
-        const topCurve = top.curves[i];
-        lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])), lastDefined = !lastDefined) : lastDefined && (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1]));
-      }
-      drawAreaBlock(path, topList, bottomList, params);
+    for (let i = 0, n = top.curves.length; i < n; i++) {
+      const topCurve = top.curves[i];
+      lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])), lastDefined = !lastDefined) : lastDefined && (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1]));
     }
-    return;
+    return void drawAreaBlock(path, topList, bottomList, params);
   }
   if (percent <= 0) return;
   let {
@@ -17822,51 +17778,17 @@ function drawAreaSegments(path, segPath, percent, params) {
     lastDefined = !0;
   const topList = [],
     bottomList = [];
-  let lastTopCurve,
-    lastBottomCurve,
-    defined0 = !0;
   for (let i = 0, n = top.curves.length; i < n; i++) {
     const topCurve = top.curves[i],
       curCurveLength = topCurve.getLength(direction),
       percent = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;
     if (percent < 0) break;
-    if (drawedLengthUntilLast += curCurveLength, drawConnect) {
-      const bototmCurve = bottom.curves[n - i - 1];
-      let currentTopCurve = topCurve,
-        currentBottomCurve = bototmCurve;
-      if (topCurve.originP1 === topCurve.originP2) {
-        lastTopCurve = topCurve, lastBottomCurve = bototmCurve;
-        continue;
-      }
-      if (lastTopCurve && lastTopCurve.originP1 === lastTopCurve.originP2 && (currentTopCurve = lastTopCurve, currentBottomCurve = lastBottomCurve), topCurve.defined) defined0 || (topList.push(currentTopCurve), bottomList.push(currentBottomCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0, defined0 = !defined0);else {
-        const {
-          originP1: originP1,
-          originP2: originP2
-        } = topCurve;
-        let validTopCurve, validBottomCurve;
-        originP1 && !1 !== originP1.defined ? (validTopCurve = currentTopCurve, validBottomCurve = currentBottomCurve) : originP1 && !1 !== originP2.defined && (validTopCurve = topCurve, validBottomCurve = bototmCurve), defined0 ? (defined0 = !defined0, topList.push(validTopCurve || topCurve), bottomList.push(validBottomCurve || bototmCurve)) : validTopCurve && (defined0 = !defined0, topList.push(validTopCurve || topCurve), bottomList.push(validBottomCurve || bototmCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0);
-      }
-      lastTopCurve = topCurve;
-    } else {
-      let tc = null,
-        bc = null;
-      lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (tc = topCurve, bc = bottom.curves[n - i - 1]), lastDefined = !lastDefined) : lastDefined && (tc = topCurve, bc = bottom.curves[n - i - 1]), tc && bc && (percent < 1 && (tc = tc.p2 && tc.p3 ? divideCubic(tc, percent)[0] : divideLinear(tc, percent)[0], bc = bc.p2 && bc.p3 ? divideCubic(bc, 1 - percent)[1] : divideLinear(bc, 1 - percent)[1]), tc.defined = lastDefined, bc.defined = lastDefined, topList.push(tc), bottomList.push(bc)), tc = null, bc = null;
-    }
+    drawedLengthUntilLast += curCurveLength;
+    let tc = null,
+      bc = null;
+    lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (tc = topCurve, bc = bottom.curves[n - i - 1]), lastDefined = !lastDefined) : lastDefined && (tc = topCurve, bc = bottom.curves[n - i - 1]), tc && bc && (percent < 1 && (tc = tc.p2 && tc.p3 ? divideCubic(tc, percent)[0] : divideLinear(tc, percent)[0], bc = bc.p2 && bc.p3 ? divideCubic(bc, 1 - percent)[1] : divideLinear(bc, 1 - percent)[1]), tc.defined = lastDefined, bc.defined = lastDefined, topList.push(tc), bottomList.push(bc)), tc = null, bc = null;
   }
-  drawConnect ? drawAreaConnectBlock(path, topList, bottomList, params) : drawAreaBlock(path, topList, bottomList, params);
-}
-function drawAreaConnectBlock(path, topList, bottomList, params) {
-  if (topList.length < 2) return;
-  const {
-    offsetX = 0,
-    offsetY = 0,
-    offsetZ = 0,
-    mode: mode
-  } = params || {};
-  let curve = topList[0];
-  path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), curve = topList[topList.length - 1];
-  let end = curve.p3 || curve.p1;
-  path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ), curve = bottomList[bottomList.length - 1], path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), curve = bottomList[0], end = curve.p3 || curve.p1, path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ), path.closePath();
+  drawAreaBlock(path, topList, bottomList, params);
 }
 function drawAreaBlock(path, topList, bottomList, params) {
   const {
@@ -17967,7 +17889,8 @@ let DefaultCanvasAreaRender = class extends BaseRender {
         fillOpacity = areaAttribute.fillOpacity,
         z = areaAttribute.z,
         strokeOpacity = areaAttribute.strokeOpacity,
-        curveTension = areaAttribute.curveTension
+        curveTension = areaAttribute.curveTension,
+        connectedType = areaAttribute.connectedType
       } = area.attribute,
       data = this.valid(area, areaAttribute, fillCb, strokeCb);
     if (!data) return;
@@ -17984,6 +17907,9 @@ let DefaultCanvasAreaRender = class extends BaseRender {
     let {
       curveType = areaAttribute.curveType
     } = area.attribute;
+    function parsePoint(points, connectedType) {
+      return "connect" !== connectedType ? points : points.filter(p => !1 !== p.defined);
+    }
     if (closePath && "linear" === curveType && (curveType = "linearClosed"), 1 === clipRange && !segments && !points.some(p => !1 === p.defined) && "linear" === curveType) return this.drawLinearAreaHighPerformance(area, context, !!fill, doStroke, fillOpacity, strokeOpacity, x, y, areaAttribute, drawContext, params, fillCb, strokeCb);
     if (area.shouldUpdateShape()) {
       if (segments && segments.length) {
@@ -17997,7 +17923,7 @@ let DefaultCanvasAreaRender = class extends BaseRender {
             x: lastTopSeg.endX,
             y: lastTopSeg.endY
           } : index > 1 && (startPoint.x = lastTopSeg.endX, startPoint.y = lastTopSeg.endY);
-          const data = calcLineCache(seg.points, curveType, {
+          const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
             startPoint: startPoint,
             curveTension: curveTension
           });
@@ -18020,7 +17946,7 @@ let DefaultCanvasAreaRender = class extends BaseRender {
               y: null !== (_d = endPoint.y1) && void 0 !== _d ? _d : endPoint.y
             });
           }
-          bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
+          bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(parsePoint(bottomPoints, connectedType), "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
             curveTension: curveTension
           }), bottomCaches.unshift(lastBottomSeg));
         }
@@ -18031,11 +17957,11 @@ let DefaultCanvasAreaRender = class extends BaseRender {
       } else {
         if (!points || !points.length) return area.cacheArea = null, void area.clearUpdateShapeTag();
         {
-          const topPoints = points,
+          const topPoints = parsePoint(points, connectedType),
             bottomPoints = [];
-          for (let i = points.length - 1; i >= 0; i--) bottomPoints.push({
-            x: null !== (_e = points[i].x1) && void 0 !== _e ? _e : points[i].x,
-            y: null !== (_f = points[i].y1) && void 0 !== _f ? _f : points[i].y
+          for (let i = topPoints.length - 1; i >= 0; i--) bottomPoints.push({
+            x: null !== (_e = topPoints[i].x1) && void 0 !== _e ? _e : topPoints[i].x,
+            y: null !== (_f = topPoints[i].y1) && void 0 !== _f ? _f : topPoints[i].y
           });
           const topCache = calcLineCache(topPoints, curveType, {
               curveTension: curveTension
@@ -18077,20 +18003,10 @@ let DefaultCanvasAreaRender = class extends BaseRender {
     this._draw(area, areaAttribute, !1, drawContext, params);
   }
   drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
-    let ret = !1;
-    return ret = ret || this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, !1, fillCb, strokeCb), ret = ret || this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, !0, fillCb, strokeCb), ret;
+    return this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb);
   }
-  _drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, connect, fillCb, strokeCb) {
-    var _a, _b, _c, _d;
+  _drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
     if (!(cache && cache.top && cache.bottom && cache.top.curves && cache.top.curves.length && cache.bottom.curves && cache.bottom.curves.length)) return;
-    let {
-      connectedType: connectedType,
-      connectedX: connectedX,
-      connectedY: connectedY,
-      connectedStyle: connectedStyle
-    } = attribute;
-    const da = [];
-    if (connect && (isArray$1(defaultAttribute) ? (connectedType = null !== (_a = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _a ? _a : defaultAttribute[1].connectedType, connectedX = null !== (_b = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _b ? _b : defaultAttribute[1].connectedX, connectedY = null !== (_c = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _c ? _c : defaultAttribute[1].connectedY, connectedStyle = null !== (_d = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _d ? _d : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), isArray$1(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute)), connect && "none" === connectedType) return !1;
     context.beginPath();
     const {
       points: points,
@@ -18109,11 +18025,7 @@ let DefaultCanvasAreaRender = class extends BaseRender {
       offsetX: offsetX,
       offsetY: offsetY,
       offsetZ: offsetZ,
-      direction: direction,
-      drawConnect: connect,
-      mode: connectedType,
-      zeroX: connectedX,
-      zeroY: connectedY
+      direction: direction
     }), this.beforeRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
       attribute: attribute
     }), context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute);
@@ -18121,7 +18033,7 @@ let DefaultCanvasAreaRender = class extends BaseRender {
       x: originX = 0,
       x: originY = 0
     } = attribute;
-    return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, connect ? connectedStyle : attribute, originX - offsetX, originY - offsetY, connect ? da : defaultAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
+    return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
       attribute: attribute
     }), (() => {
       if (!1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
@@ -18131,12 +18043,8 @@ let DefaultCanvasAreaRender = class extends BaseRender {
         isArray$1(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1] && (context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, stroke[0] ? cache.top : cache.bottom, clipRange, direction === Direction$1.ROW ? "x" : "y", {
           offsetX: offsetX,
           offsetY: offsetY,
-          offsetZ: offsetZ,
-          drawConnect: connect,
-          mode: connectedType,
-          zeroX: connectedX,
-          zeroY: connectedY
-        })), context.setStrokeStyle(area, connect ? connectedStyle : attribute, originX - offsetX, originY - offsetY, connect ? da : defaultAttribute), context.stroke();
+          offsetZ: offsetZ
+        })), context.setStrokeStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke();
       }
     })(), !1;
   }
@@ -20436,7 +20344,7 @@ let Line$1 = class Line extends Graphic {
       } = attribute,
       b = aabbBounds;
     return points.forEach(p => {
-      !1 === p.defined && "zero" !== connectedType && "connect" !== connectedType || b.add(p.x, p.y);
+      !1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
     }), b;
   }
   updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) {
@@ -20447,7 +20355,7 @@ let Line$1 = class Line extends Graphic {
       b = aabbBounds;
     return segments.forEach(s => {
       s.points.forEach(p => {
-        !1 === p.defined && "zero" !== connectedType && "connect" !== connectedType || b.add(p.x, p.y);
+        !1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
       });
     }), b;
   }
@@ -27738,6 +27646,7 @@ var __decorate$G = undefined && undefined.__decorate || function (decorators, ta
 function makeUpCanvas$4(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanvasList, pixelRatio) {
   const dpr = null != pixelRatio ? pixelRatio : tt.getSystemInfoSync().pixelRatio;
   canvasIdLists.forEach((id, i) => {
+    if (canvasMap.has(id)) return;
     const ctx = tt.createCanvasContext(id),
       canvas = new CanvasWrapDisableWH(ctx.canvas || {}, ctx, dpr, domref.width, domref.height, id);
     ctx.canvas = canvas, canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas);
@@ -27872,7 +27781,13 @@ let LynxContext2d = class extends BrowserContext2d {
   measureText(text) {
     let method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : application.global.measureTextMethod;
     this.setTransform(1, 0, 0, 1, 0, 0, !0, application.global.devicePixelRatio);
-    return super.measureText(text, method);
+    return {
+      width: super.measureText(text, method).width,
+      fontBoundingBoxDescent: void 0,
+      fontBoundingBoxAscent: void 0,
+      actualBoundingBoxAscent: void 0,
+      actualBoundingBoxDescent: void 0
+    };
   }
   createPattern(image, repetition) {
     return null;
@@ -29066,7 +28981,7 @@ function makeUpCanvas$1(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCan
     const dpr = wx.getSystemInfoSync().pixelRatio;
     for (let i = 0; i < canvasIdLists.length; i++) {
       const id = canvasIdLists[i];
-      yield new Promise(resolve => {
+      canvasMap.has(id) || (yield new Promise(resolve => {
         let data = wx.createSelectorQuery();
         component && (data = data.in(component)), data.select(`#${id}`).fields({
           node: !0,
@@ -29078,7 +28993,7 @@ function makeUpCanvas$1(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCan
             height = res[0].height;
           canvas.width = width * dpr, canvas.height = height * dpr, canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas), resolve(null);
         });
-      });
+      }));
     }
   });
 }
@@ -29396,7 +29311,7 @@ function makeUpCanvas(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanva
     const dpr = tt.getSystemInfoSync().pixelRatio;
     for (let i = 0; i < canvasIdLists.length; i++) {
       const id = canvasIdLists[i];
-      yield new Promise(resolve => {
+      canvasMap.has(id) || (yield new Promise(resolve => {
         let data = tt.createSelectorQuery();
         component && (data = data.in(component)), data.select(`#${id}`).node().exec(res => {
           const canvas = res[0].node,
@@ -29404,7 +29319,7 @@ function makeUpCanvas(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanva
             height = canvas.height;
           canvas.width = width * dpr, canvas.height = height * dpr, canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas), resolve(null);
         });
-      });
+      }));
     }
   });
 }
@@ -36058,7 +35973,10 @@ class LabelBase extends AbstractComponent {
       customOverlapFunc: customOverlapFunc
     } = this.attribute;
     let data = this.attribute.data;
-    isFunction$1(dataFilter) && (data = dataFilter(data));
+    if (isFunction$1(dataFilter) && (data = dataFilter(data)), data && data.length) {
+      const seenIds = new Set();
+      data = data.filter(d => !seenIds.has(d.id) && seenIds.add(d.id));
+    }
     let labels = this._initText(data);
     labels = isFunction$1(customLayoutFunc) ? customLayoutFunc(data, labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null) : this._layout(labels), isFunction$1(customOverlapFunc) ? labels = customOverlapFunc(labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null) : !1 !== overlap && (labels = this._overlapping(labels)), isFunction$1(this.attribute.onAfterOverlapping) && this.attribute.onAfterOverlapping(labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null), labels && labels.length && labels.forEach(label => {
       this._bindEvent(label), this._setStatesOfText(label);
@@ -39667,27 +39585,16 @@ class MarkArea extends Marker {
   }
   getPointAttrByPosition(position) {
     const {
-      x1: x1,
-      x2: x2,
-      y1: y1,
-      y2: y2
-    } = this._area.AABBBounds;
-    return position.includes("left") || position.includes("Left") ? {
-      x: x1,
-      y: (y1 + y2) / 2
-    } : position.includes("right") || position.includes("Right") ? {
-      x: x2,
-      y: (y1 + y2) / 2
-    } : position.includes("top") || position.includes("Top") ? {
-      x: (x1 + x2) / 2,
-      y: y1
-    } : position.includes("bottom") || position.includes("Bottom") ? {
-      x: (x1 + x2) / 2,
-      y: y2
-    } : {
-      x: (x1 + x2) / 2,
-      y: (y1 + y2) / 2
-    };
+        x1: x1,
+        x2: x2,
+        y1: y1,
+        y2: y2
+      } = this._area.AABBBounds,
+      result = {
+        x: (x1 + x2) / 2,
+        y: (y1 + y2) / 2
+      };
+    return (position.includes("left") || position.includes("Left")) && (result.x = x1), (position.includes("right") || position.includes("Right")) && (result.x = x2), (position.includes("top") || position.includes("Top")) && (result.y = y1), (position.includes("bottom") || position.includes("Bottom")) && (result.y = y2), result;
   }
   setLabelPos() {
     var _a;
@@ -55299,8 +55206,7 @@ class Animator {
   animate(animationParameters, parameters) {
     return this.isAnimating = !0, this.animateElement(animationParameters, parameters), 0 === this.runnings.length && this.animationEnd(), this;
   }
-  stop() {
-    let stopState = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "end";
+  stop(stopState) {
     let invokeCallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !0;
     return this.runnings.forEach(running => running.stop(stopState)), this.animationEnd(invokeCallback), this;
   }
@@ -55495,7 +55401,7 @@ class Animate {
       var _a;
       element.isReserved && element.diffState !== DiffState.exit && (element.isReserved = !1);
       const prevElementState = null === (_a = this.elementRecorder.get(element)) || void 0 === _a ? void 0 : _a.prevState;
-      this.configs.some(config => prevElementState !== element.diffState && config.state === prevElementState && config.timeline.controlOptions.stopWhenStateChange) && this.clearElementAnimation(element, !1);
+      (this.configs.some(config => prevElementState !== element.diffState && config.state === prevElementState && config.timeline.controlOptions.stopWhenStateChange) || element.diffState === DiffState.exit) && this.clearElementAnimation(element, !1);
     }), this.configs.forEach(config => {
       this.animateByTimeline(config, elements, parameters);
     }), this.mark.cleanExitElements(), this;
@@ -55621,7 +55527,12 @@ class Animate {
         elementCount: animatedElements.length,
         elementIndex: 0
       };
-      animatedElements.forEach((element, index) => {
+      animatedElements.forEach(element => {
+        var _a;
+        (null !== (_a = this.animators.get(config.state)) && void 0 !== _a ? _a : []).filter(animator => animator.element === element && animator.animationOptions.id === config.id).forEach(animator => {
+          animator.stop(null, !1), this.handleAnimatorEnd(animator, !1);
+        });
+      }), animatedElements.forEach((element, index) => {
         animationParameters.elementIndex = index;
         const mergedParameters = Object.assign({
             [DefaultAnimationParameters]: animationParameters
@@ -59112,6 +59023,9 @@ class Region extends LayoutModel {
         super.created();
         const clip = (_a = this._spec.clip) !== null && _a !== void 0 ? _a : this._getClipDefaultValue();
         this._groupMark = this._createGroupMark('regionGroup', this.userId, this.layoutZIndex);
+        if (this._spec.roam) {
+            this._groupMark.setMarkConfig({ interactive: true });
+        }
         this._interactionMark = this._createGroupMark('regionInteractionGroup', ((_b = this.userId) !== null && _b !== void 0 ? _b : this.type) + '_interaction', LayoutZIndex.Interaction);
         if (!isEmpty(this._spec.style)) {
             this._backgroundMark = this._createMark({ type: "rect", name: 'regionBackground' });
@@ -62578,7 +62492,7 @@ const registerVChartCore = () => {
 };
 registerVChartCore();
 
-const version = "1.13.3";
+const version = "1.13.4";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -67765,16 +67679,18 @@ function breakScope(data, points, scopeType = 'count') {
         }, 0);
     const res = [];
     let acc = 0;
+    let resIndex = 0;
     bins.forEach((bin, i) => {
         if (totalLength === 0) {
             res.push([0, i / bins.length - 1]);
         }
         else {
             const length = scopeType === 'count' ? bin.count : bin.max - bin.min;
-            const b0 = res[i - 1] ? res[i - 1][1] : 0;
+            const b0 = res[resIndex - 1] ? res[resIndex - 1][1] : 0;
             const b1 = i === bins.length - 1 ? 1 : Math.min((acc + length) / totalLength, 1);
             if (b0 === b1 && (b0 === 0 || b0 === 1)) ;
             else {
+                resIndex += 1;
                 res.push([b0, b1]);
                 acc += length;
             }
@@ -72707,7 +72623,7 @@ function getDefaultTriggerEventByMode(mode) {
         return {
             start: 'pointerdown',
             move: 'pointermove',
-            end: 'pointerup',
+            end: ['pointerup', 'pointerupoutside'],
             zoom: 'wheel',
             zoomEnd: 'pointerup',
             scroll: 'wheel',
@@ -72718,7 +72634,7 @@ function getDefaultTriggerEventByMode(mode) {
         return {
             start: 'pointerdown',
             move: 'pointermove',
-            end: 'pointerup',
+            end: ['pointerup', 'pointerupoutside'],
             zoom: 'pinch',
             zoomEnd: 'pinchend',
             scroll: 'pan',
@@ -72989,15 +72905,17 @@ class Zoomable {
             });
             this._zoomableTrigger.pointerId = null;
             this._eventObj.off(move, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mousemove);
-            this._eventObj.off(end, { level: Event_Bubble_Level.chart, source: Event_Source_Type.window }, mouseup);
-            this._eventObj.allow(end);
+            end.forEach(endEventType => {
+                this._eventObj.off(endEventType, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mouseup);
+                this._eventObj.allow(endEventType);
+            });
         }, delayTime);
         const mousemove = delayMap[delayType]((params) => {
             if (!this._zoomableTrigger.parserDragEvent(params.event)) {
                 return;
             }
             this._clickEnable = false;
-            this._eventObj.prevent(end, mouseup);
+            end.forEach(endEventType => this._eventObj.prevent(endEventType, mouseup));
             const event = params.event;
             const dx = event.canvasX - moveX;
             const dy = event.canvasY - moveY;
@@ -73013,7 +72931,9 @@ class Zoomable {
             });
         }, delayTime);
         this._eventObj.on(move, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mousemove);
-        this._eventObj.on(end, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mouseup);
+        end.forEach(endEventType => {
+            this._eventObj.on(endEventType, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mouseup);
+        });
     }
 }
 
@@ -79340,8 +79260,9 @@ class BaseWordCloudSeries extends BaseSeries {
         };
     }
     _wordCloudTransformOption() {
-        var _a;
-        return Object.assign(Object.assign({}, this._getCommonTransformOptions()), { layoutType: this._wordCloudConfig.layoutMode, rotate: this._rotateAngles, randomVisible: (_a = this._spec.random) !== null && _a !== void 0 ? _a : DEFAULT_RANDOM, clip: this._wordCloudConfig.drawOutOfBound === 'clip', shrink: this._wordCloudConfig.zoomToFit.shrink, enlarge: this._wordCloudConfig.zoomToFit.enlarge, minFontSize: this._wordCloudConfig.zoomToFit.fontSizeLimitMin, progressiveTime: this._wordCloudConfig.progressiveTime, progressiveStep: this._wordCloudConfig.progressiveStep, repeatFill: this._wordCloudConfig.zoomToFit.repeat });
+        var _a, _b;
+        const wordCloudConfig = (_a = this._wordCloudConfig) !== null && _a !== void 0 ? _a : {};
+        return Object.assign(Object.assign(Object.assign({}, wordCloudConfig), this._getCommonTransformOptions()), { layoutType: this._wordCloudConfig.layoutMode, rotate: this._rotateAngles, randomVisible: (_b = this._spec.random) !== null && _b !== void 0 ? _b : DEFAULT_RANDOM, clip: this._wordCloudConfig.drawOutOfBound === 'clip', shrink: this._wordCloudConfig.zoomToFit.shrink, enlarge: this._wordCloudConfig.zoomToFit.enlarge, minFontSize: this._wordCloudConfig.zoomToFit.fontSizeLimitMin, progressiveTime: this._wordCloudConfig.progressiveTime, progressiveStep: this._wordCloudConfig.progressiveStep, repeatFill: this._wordCloudConfig.zoomToFit.repeat });
     }
     _wordCloudShapeTransformOption() {
         var _a, _b, _c, _d, _e, _f;
@@ -79721,6 +79642,7 @@ class CloudLayout extends BaseLayout {
     this.insertZerosToArray(board, 0, heightArr.length + diffWidth / 2), this._size = [w + (diffWidth << 5), h + diffHeight], bounds && (bounds[0].x += (diffWidth << 5) / 2, bounds[0].y += diffHeight / 2, bounds[1].x += (diffWidth << 5) / 2, bounds[1].y += diffHeight / 2);
   }
   insertZerosToArray(array, index, length) {
+    if (this.options.customInsertZerosToArray) return this.options.customInsertZerosToArray(array, index, length);
     const len = Math.floor(length / 6e4),
       restLen = length % 6e4;
     for (let i = 0; i < len; i++) array.splice(index + 6e4 * i, 0, ...new Array(6e4).fill(0));
@@ -92543,7 +92465,7 @@ class Tooltip extends BaseComponent {
             }
         };
         this._getMouseOutHandler = (needPointerDetection) => (params) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             if (this._isReleased) {
                 return;
             }
@@ -92561,14 +92483,14 @@ class Tooltip extends BaseComponent {
             if (this._enterable) {
                 this._outTimer = setTimeout(() => {
                     this._handleChartMouseOut(params);
-                }, (_d = this._spec.showDelay) !== null && _d !== void 0 ? _d : DEFAULT_SHOW_DELAY);
+                }, (_e = (_d = this._spec) === null || _d === void 0 ? void 0 : _d.showDelay) !== null && _e !== void 0 ? _e : DEFAULT_SHOW_DELAY);
             }
             else {
                 this._handleChartMouseOut(params);
             }
         };
         this._handleChartMouseOut = (params) => {
-            if (this._alwaysShow) {
+            if (this._alwaysShow || this._isReleased) {
                 return;
             }
             if (this._spec.triggerOff !== 'none') {
@@ -92583,7 +92505,7 @@ class Tooltip extends BaseComponent {
             }
         };
         this._getMouseMoveHandler = (isClick) => (params) => {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             if (this._isReleased) {
                 return;
             }
@@ -92613,13 +92535,16 @@ class Tooltip extends BaseComponent {
                 }
                 this._showTimer = setTimeout(() => {
                     this._handleChartMouseMove(params, isClick);
-                }, (_c = this._spec.showDelay) !== null && _c !== void 0 ? _c : DEFAULT_SHOW_DELAY);
+                }, (_d = (_c = this._spec) === null || _c === void 0 ? void 0 : _c.showDelay) !== null && _d !== void 0 ? _d : DEFAULT_SHOW_DELAY);
             }
             else {
                 this._handleChartMouseMove(params, isClick);
             }
         };
         this._handleChartMouseMove = (params, isClick) => {
+            if (this._isReleased) {
+                return;
+            }
             const mouseEventData = this._getMouseEventData(params);
             const { tooltipInfo: { dimension: dimensionInfo }, ignore: { mark: ignoreMark } } = mouseEventData;
             const success = {
@@ -92722,6 +92647,9 @@ class Tooltip extends BaseComponent {
             return 1;
         };
         this.hideTooltip = () => {
+            if (this._isReleased) {
+                return false;
+            }
             const params = {
                 changePositionOnly: false,
                 tooltip: this,
@@ -92834,7 +92762,7 @@ class Tooltip extends BaseComponent {
                 }
             });
             element.addEventListener('pointerleave', () => {
-                var _a, _b;
+                var _a, _b, _c;
                 if (!this._enterable) {
                     return;
                 }
@@ -92843,7 +92771,7 @@ class Tooltip extends BaseComponent {
                     if (newRect &&
                         Object.keys(this._cacheEnterableRect).every(k => this._cacheEnterableRect[k] === newRect[k])) {
                         this._cacheEnterableRect = null;
-                        this._outTimer = setTimeout(this.hideTooltip, (_b = this._spec.showDelay) !== null && _b !== void 0 ? _b : DEFAULT_SHOW_DELAY);
+                        this._outTimer = setTimeout(this.hideTooltip, (_c = (_b = this._spec) === null || _b === void 0 ? void 0 : _b.showDelay) !== null && _c !== void 0 ? _c : DEFAULT_SHOW_DELAY);
                     }
                 }
             });
@@ -101068,8 +100996,14 @@ class BaseTooltipHandler extends BasePlugin {
         this._isReleased = true;
     }
     _getDefaultOption() {
+        var _a, _b;
         const { offset } = this._component.getSpec();
-        return offset ? Object.assign(Object.assign({}, DEFAULT_OPTIONS), offset) : DEFAULT_OPTIONS;
+        return offset
+            ? {
+                offsetX: (_a = offset.x) !== null && _a !== void 0 ? _a : DEFAULT_OPTIONS.offsetX,
+                offsetY: (_b = offset.y) !== null && _b !== void 0 ? _b : DEFAULT_OPTIONS.offsetY
+            }
+            : DEFAULT_OPTIONS;
     }
     _getParentElement(spec) {
         return spec.parentElement;
@@ -101098,9 +101032,8 @@ const getPixelPropertyStr = (num, defaultStr) => {
     }
     return defaultStr !== null && defaultStr !== void 0 ? defaultStr : 'initial';
 };
-const getTextStyle = (style = {}) => {
+const getTextStyle = (style = {}, textStyle = {}) => {
     var _a, _b;
-    const textStyle = {};
     if (isValid$1(style.fontFamily)) {
         textStyle.fontFamily = style.fontFamily;
     }
@@ -101130,8 +101063,15 @@ const getTextStyle = (style = {}) => {
     }
     return textStyle;
 };
+const getLineHeight = (style = {}) => {
+    const { lineHeight } = style;
+    if (style.fontSize) {
+        return calcLayoutNumber(lineHeight, style.fontSize);
+    }
+    return 0;
+};
 const getDomStyle = (spec = {}) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const { style = {}, enterable, transitionDuration } = spec;
     const { panel = {}, titleLabel, shape, keyLabel, valueLabel, spaceRow: commonSpaceRow, align } = style;
     const { panelStyle, panelPadding } = getPanelStyle(panel);
@@ -101169,10 +101109,8 @@ const getDomStyle = (spec = {}) => {
     shapeStyle[marginKey] = getPixelPropertyStr((_b = shape.spacing) !== null && _b !== void 0 ? _b : DEFAULT_SHAPE_SPACING);
     keyStyle[marginKey] = getPixelPropertyStr((_c = keyLabel.spacing) !== null && _c !== void 0 ? _c : DEFAULT_KEY_SPACING);
     valueStyle[marginKey] = getPixelPropertyStr((_d = valueLabel.spacing) !== null && _d !== void 0 ? _d : DEFAULT_VALUE_SPACING);
-    const lineHeight = (_e = keyStyle.lineHeight) !== null && _e !== void 0 ? _e : valueStyle.lineHeight;
-    if (isValid$1(lineHeight)) {
-        rowStyle.lineHeight = /^[0-9]*$/.test(`${lineHeight}`) ? `${lineHeight}px` : `${lineHeight}`;
-    }
+    const lineHeight = Math.max(getLineHeight(valueLabel), getLineHeight(keyLabel));
+    rowStyle.lineHeight = lineHeight > 0 ? `${lineHeight}px` : '20px';
     return {
         panelPadding,
         row: rowStyle,
@@ -101464,19 +101402,22 @@ class DomTooltipHandler extends BaseTooltipHandler {
                             row.classList.add(`${TOOLTIP_PREFIX}-${colName}`);
                             colDiv.appendChild(row);
                         }
-                        let styleByRow = index === content.length - 1 ? {} : Object.assign({}, rowStyle);
+                        const styleByRow = Object.assign({}, rowStyle);
+                        if (index === content.length - 1) {
+                            styleByRow.marginBottom = '0px';
+                        }
                         styleByRow.display = entry.visible === false ? 'none' : 'block';
                         styleByRow.height = 'initial';
                         if (colName === 'key') {
                             row.innerHTML = formatContent(entry.key);
                             if (entry.keyStyle) {
-                                styleByRow = Object.assign(Object.assign({}, styleByRow), getTextStyle(entry.keyStyle));
+                                getTextStyle(entry.keyStyle, styleByRow);
                             }
                         }
                         else if (colName === 'value') {
                             row.innerHTML = formatContent(entry.value);
                             if (entry.valueStyle) {
-                                styleByRow = Object.assign(Object.assign({}, styleByRow), getTextStyle(entry.valueStyle));
+                                getTextStyle(entry.valueStyle, styleByRow);
                             }
                         }
                         else if (colName === 'shape') {