@visactor/vrender-components 0.21.0-alpha.1 → 0.21.0-alpha.3

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import { tau, halfPi as halfPi$1, AABBBounds, degreeToRadian, Point, PointService, abs, max, min, atan2, epsilon, Matrix, pi2, Logger, TextMeasure, EventEmitter, isBoolean, isObject, isFunction, isString, cos, sin, pi, isArray, pointAt, isNumber, getDecimalPlaces, isNil, Color, OBBBounds, has, normalTransform, isValidUrl, isBase64, acos, sqrt, transformBoundsWithMatrix, arrayEqual, getContextFont, rotatePoint, clampAngleByRadian, asin, Bounds, getRectIntersect, isRectIntersect, isPlainObject, merge, clamp, clampRange, normalizePadding, debounce, throttle, hexToRgb, crossProduct, isValid, isEmpty, rectInsideAnotherRect, radianToDegree, getAngleByPoint, polarToCartesian, array, isValidNumber, calculateAnchorOfBounds, computeQuadrant, isGreater, isLess, isNumberClose, normalizeAngle, flattenArray, cloneDeep, get, last, isRotateAABBIntersect, mixin, isEqual, interpolateString, minInArray, maxInArray, binaryFuzzySearchInNumberRange, polygonContainPoint } from '@visactor/vutils';
+import { tau, halfPi as halfPi$1, AABBBounds, degreeToRadian, Point, PointService, abs, max, min, atan2, epsilon, Matrix, pi2, Logger, isNumberClose, TextMeasure, EventEmitter, isBoolean, isObject, isFunction, isString, cos, sin, pi, isArray, pointAt, isNumber, getDecimalPlaces, isNil, Color, OBBBounds, has, normalTransform, isValidUrl, isBase64, acos, sqrt, transformBoundsWithMatrix, arrayEqual, getContextFont, rotatePoint, clampAngleByRadian, asin, Bounds, getRectIntersect, isRectIntersect, isPlainObject, merge, clamp, clampRange, normalizePadding, debounce, throttle, hexToRgb, crossProduct, isValid, isEmpty, rectInsideAnotherRect, radianToDegree, getAngleByPoint, polarToCartesian, array, isValidNumber, calculateAnchorOfBounds, computeQuadrant, isGreater, isLess, normalizeAngle, flattenArray, cloneDeep, get, last, isRotateAABBIntersect, mixin, isEqual, interpolateString, minInArray, maxInArray, binaryFuzzySearchInNumberRange, polygonContainPoint } from '@visactor/vutils';
 import { isContinuous, isDiscrete, LinearScale } from '@visactor/vscale';
 
 class Generator {
@@ -860,11 +860,12 @@ function parseSvgPath(str) {
   for (let i = 0, len = paths.length; i < len; i++) if (currPath = paths[i], coordsStr = currPath.slice(1), commandChar = currPath[0], currCommandData = [commandChar], coordsStrArr = coordsStr.match(rePathCommand), null !== coordsStrArr) {
     for (let i = 0, len = coordsStrArr.length; i < len; i++) coordStr = coordsStrArr[i], coordNumber = parseFloat(coordStr), Number.isNaN(coordNumber) || currCommandData.push(coordNumber);
     if (standardCommandLen = commandLengths[commandChar], currCommandData.length - 1 > standardCommandLen) {
-      let subCommand;
+      let subCommand,
+        bestCommandChar = commandChar;
       for (let i = 1, len = currCommandData.length; i < len; i += standardCommandLen) {
-        subCommand = [commandChar];
+        subCommand = [bestCommandChar];
         for (let j = i, subLen = i + standardCommandLen; j < subLen; j++) subCommand.push(currCommandData[j]);
-        result.push(subCommand);
+        result.push(subCommand), "m" === bestCommandChar ? bestCommandChar = "l" : "M" === bestCommandChar && (bestCommandChar = "L");
       }
     } else result.push(currCommandData);
   } else result.push(currCommandData);
@@ -2008,6 +2009,7 @@ const DefaultStrokeStyle = Object.assign({
 const DefaultTextStyle = {
   text: "",
   maxLineWidth: 1 / 0,
+  maxWidth: 1 / 0,
   textAlign: "left",
   textBaseline: "alphabetic",
   fontSize: 16,
@@ -2075,6 +2077,7 @@ const DefaultAttribute = Object.assign(Object.assign(Object.assign({
   zIndex: 0,
   layout: null,
   boundsPadding: 0,
+  fillStrokeOrder: 0,
   renderStyle: "default",
   pickMode: "accurate",
   customPickShape: null,
@@ -2145,6 +2148,7 @@ const DefaultLineAttribute = Object.assign(Object.assign(Object.assign({}, Defau
 });
 const DefaultPathAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
   path: new CustomPath2D(),
+  fillStrokeOrder: 1,
   customPath: () => {
     Logger.getInstance().warn("空函数");
   }
@@ -2350,10 +2354,32 @@ let ATextMeasure = class {
   configure(service, env) {
     this.canvas = service.canvas, this.context = service.context, service.bindTextMeasure(this);
   }
-  measureTextWidth(text, options) {
-    if (!this.context) return this.estimate(text, options).width;
+  _measureTextWithoutAlignBaseline(text, options, compatible) {
     this.context.setTextStyleWithoutAlignBaseline(options);
-    return this.context.measureText(text).width;
+    const metrics = this.context.measureText(text);
+    return compatible ? this.compatibleMetrics(metrics, options) : metrics;
+  }
+  _measureTextWithAlignBaseline(text, options, compatible) {
+    this.context.setTextStyle(options);
+    const metrics = this.context.measureText(text);
+    return compatible ? this.compatibleMetrics(metrics, options) : metrics;
+  }
+  compatibleMetrics(metrics, options) {
+    if (null == metrics.actualBoundingBoxAscent || null == metrics.actualBoundingBoxDescent || null == metrics.fontBoundingBoxAscent || null == metrics.fontBoundingBoxDescent) {
+      const {
+        ascent: ascent,
+        descent: descent
+      } = this.measureTextBoundADscentEstimate(options);
+      metrics.actualBoundingBoxAscent = ascent, metrics.actualBoundingBoxDescent = descent, metrics.fontBoundingBoxAscent = ascent, metrics.fontBoundingBoxDescent = descent;
+    }
+    if (null == metrics.actualBoundingBoxLeft || null == metrics.actualBoundingBoxRight) {
+      const {
+        left: left,
+        right: right
+      } = this.measureTextBoundLeftRightEstimate(options);
+      metrics.actualBoundingBoxLeft = left, metrics.actualBoundingBoxRight = right;
+    }
+    return metrics;
   }
   estimate(text, _ref) {
     let {
@@ -2367,19 +2393,85 @@ let ATextMeasure = class {
       height: fontSize
     };
   }
-  measureTextPixelHeight(text, options) {
+  measureTextWidth(text, options, textMeasure) {
+    return this.context ? (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithoutAlignBaseline(text, options)).width : this.estimate(text, options).width;
+  }
+  measureTextBoundsWidth(text, options, textMeasure) {
+    return this.context ? (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithoutAlignBaseline(text, options)).width : this.estimate(text, options).width;
+  }
+  measureTextBoundsLeftRight(text, options, textMeasure) {
+    return this.context ? {
+      left: (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithAlignBaseline(text, options, !0)).actualBoundingBoxLeft,
+      right: textMeasure.actualBoundingBoxRight
+    } : this.measureTextBoundLeftRightEstimate(options);
+  }
+  measureTextPixelHeight(text, options, textMeasure) {
     var _a;
-    if (!this.context) return null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize;
-    this.context.setTextStyleWithoutAlignBaseline(options);
-    const textMeasure = this.context.measureText(text);
-    return Math.abs(textMeasure.actualBoundingBoxAscent - textMeasure.actualBoundingBoxDescent);
+    return this.context ? (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithoutAlignBaseline(text, options, !0), Math.abs(textMeasure.actualBoundingBoxAscent - textMeasure.actualBoundingBoxDescent)) : null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize;
   }
-  measureTextBoundHieght(text, options) {
+  measureTextPixelADscent(text, options, textMeasure) {
+    return this.context ? {
+      ascent: (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithAlignBaseline(text, options, !0)).actualBoundingBoxAscent,
+      descent: textMeasure.actualBoundingBoxDescent
+    } : this.measureTextBoundADscentEstimate(options);
+  }
+  measureTextBoundHieght(text, options, textMeasure) {
     var _a;
-    if (!this.context) return null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize;
-    this.context.setTextStyleWithoutAlignBaseline(options);
-    const textMeasure = this.context.measureText(text);
-    return Math.abs(textMeasure.fontBoundingBoxAscent - textMeasure.fontBoundingBoxDescent);
+    return this.context ? (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithoutAlignBaseline(text, options, !0), Math.abs(textMeasure.fontBoundingBoxAscent - textMeasure.fontBoundingBoxDescent)) : null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize;
+  }
+  measureTextBoundADscent(text, options, textMeasure) {
+    return this.context ? {
+      ascent: (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithAlignBaseline(text, options, !0)).fontBoundingBoxAscent,
+      descent: textMeasure.fontBoundingBoxDescent
+    } : this.measureTextBoundADscentEstimate(options);
+  }
+  measureTextBoundADscentEstimate(options) {
+    var _a;
+    const fontSize = null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize,
+      {
+        textBaseline: textBaseline
+      } = options;
+    return "bottom" === textBaseline ? {
+      ascent: fontSize,
+      descent: 0
+    } : "middle" === textBaseline ? {
+      ascent: fontSize / 2,
+      descent: fontSize / 2
+    } : "alphabetic" === textBaseline ? {
+      ascent: .79 * fontSize,
+      descent: .21 * fontSize
+    } : {
+      ascent: 0,
+      descent: fontSize
+    };
+  }
+  measureTextBoundLeftRightEstimate(options) {
+    var _a;
+    const fontSize = null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize,
+      {
+        textAlign: textAlign
+      } = options;
+    return "center" === textAlign ? {
+      left: fontSize / 2,
+      right: fontSize / 2
+    } : "right" === textAlign || "end" === textAlign ? {
+      left: fontSize,
+      right: 0
+    } : {
+      left: 0,
+      right: fontSize
+    };
+  }
+  measureTextPixelADscentAndWidth(text, options) {
+    if (!this.context) return Object.assign(Object.assign({}, this.measureTextBoundADscentEstimate(options)), {
+      width: this.estimate(text, options).width
+    });
+    const out = this._measureTextWithoutAlignBaseline(text, options, !0);
+    return {
+      ascent: out.actualBoundingBoxAscent,
+      descent: out.actualBoundingBoxDescent,
+      width: out.width
+    };
   }
   measureText(text, options) {
     return this.context ? (this.context.setTextStyleWithoutAlignBaseline(options), this.context.measureText(text)) : this.estimate(text, options);
@@ -2457,6 +2549,14 @@ let ATextMeasure = class {
     return data;
   }
   _clipTextEnd(text, options, width, leftIdx, rightIdx) {
+    if (leftIdx === rightIdx) {
+      Logger.getInstance().warn(`【_clipTextEnd】不应该走到这里${text}, ${leftIdx}, ${rightIdx}`);
+      const subText = text.substring(0, rightIdx + 1);
+      return {
+        str: subText,
+        width: this.measureTextWidth(subText, options)
+      };
+    }
     const middleIdx = Math.floor((leftIdx + rightIdx) / 2),
       subText = text.substring(0, middleIdx + 1),
       strWidth = this.measureTextWidth(subText, options);
@@ -2490,7 +2590,7 @@ let ATextMeasure = class {
   }
   _clipTextStart(text, options, width, leftIdx, rightIdx) {
     const middleIdx = Math.ceil((leftIdx + rightIdx) / 2),
-      subText = text.substring(middleIdx - 1, text.length - 1),
+      subText = text.substring(middleIdx - 1, text.length),
       strWidth = this.measureTextWidth(subText, options);
     let length;
     if (strWidth > width) {
@@ -2498,18 +2598,18 @@ let ATextMeasure = class {
         str: "",
         width: 0
       };
-      const str = text.substring(middleIdx, text.length - 1);
+      const str = text.substring(middleIdx, text.length);
       return length = this.measureTextWidth(str, options), length <= width ? {
         str: str,
         width: length
-      } : this._clipTextStart(text, options, width, middleIdx, text.length - 1);
+      } : this._clipTextStart(text, options, width, middleIdx, text.length);
     }
     if (strWidth < width) {
       if (middleIdx <= 0) return {
         str: text,
         width: this.measureTextWidth(text, options)
       };
-      const str = text.substring(middleIdx - 2, text.length - 1);
+      const str = text.substring(middleIdx - 2, text.length);
       return length = this.measureTextWidth(str, options), length >= width ? {
         str: subText,
         width: strWidth
@@ -2817,7 +2917,7 @@ let DefaultWindow = class {
   }
   hasSubView() {
     const viewBox = this._handler.getViewBox();
-    return !(0 === viewBox.x1 && 0 === viewBox.y1 && this.width === viewBox.width() && this.height === viewBox.height());
+    return !(0 === viewBox.x1 && 0 === viewBox.y1 && isNumberClose(this.width, viewBox.width()) && isNumberClose(this.height, viewBox.height()));
   }
   isVisible(bbox) {
     return this._handler.isVisible(bbox);
@@ -7497,7 +7597,8 @@ let DefaultCanvasArcRender = class extends BaseRender {
         fill = arcAttribute.fill,
         stroke = arcAttribute.stroke,
         x: originX = arcAttribute.x,
-        y: originY = arcAttribute.y
+        y: originY = arcAttribute.y,
+        fillStrokeOrder = arcAttribute.fillStrokeOrder
       } = arc.attribute,
       data = this.valid(arc, arcAttribute, fillCb, strokeCb);
     if (!data) return;
@@ -7533,7 +7634,17 @@ let DefaultCanvasArcRender = class extends BaseRender {
       isFullStroke: isFullStroke,
       stroke: arrayStroke
     } = parseStroke(stroke);
-    if ((doFill || isFullStroke) && (context.beginPath(), drawArcPath(arc, context, x, y, outerRadius, innerRadius), beforeRenderContribitionsRuned = !0, context.setShadowBlendStyle && context.setShadowBlendStyle(arc, arc.attribute, arcAttribute), this.beforeRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb), doFill && (fillCb ? fillCb(context, arc.attribute, arcAttribute) : fVisible && (context.setCommonStyle(arc, arc.attribute, originX - x, originY - y, arcAttribute), context.fill())), doStroke && isFullStroke && (strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, originX - x, originY - y, arcAttribute), context.stroke()))), !isFullStroke && doStroke) {
+    if (doFill || isFullStroke) {
+      context.beginPath(), drawArcPath(arc, context, x, y, outerRadius, innerRadius), beforeRenderContribitionsRuned = !0, context.setShadowBlendStyle && context.setShadowBlendStyle(arc, arc.attribute, arcAttribute), this.beforeRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb);
+      const _runFill = () => {
+          doFill && (fillCb ? fillCb(context, arc.attribute, arcAttribute) : fVisible && (context.setCommonStyle(arc, arc.attribute, originX - x, originY - y, arcAttribute), context.fill()));
+        },
+        _runStroke = () => {
+          doStroke && isFullStroke && (strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, originX - x, originY - y, arcAttribute), context.stroke()));
+        };
+      fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke());
+    }
+    if (!isFullStroke && doStroke) {
       context.beginPath();
       drawArcPath(arc, context, x, y, outerRadius, innerRadius, arrayStroke);
       beforeRenderContribitionsRuned || this.beforeRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb), strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke());
@@ -7551,14 +7662,20 @@ let DefaultCanvasArcRender = class extends BaseRender {
             fill = arcAttribute.fill
           } = arc.attribute,
           startAngle = endAngle;
-        if (this.drawArcTailCapPath(arc, context, x, y, outerRadius, innerRadius, startAngle, startAngle + capAngle), beforeRenderContribitionsRuned || this.beforeRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb), doFill) {
-          const color = fill;
-          if ("conical" === color.gradient) {
-            const lastColor = getConicGradientAt(0, 0, endAngle, color);
-            fillCb || fillVisible && (context.setCommonStyle(arc, arc.attribute, x, y, arcAttribute), context.fillStyle = lastColor, context.fill());
-          }
-        }
-        doStroke && (strokeCb || sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke()));
+        this.drawArcTailCapPath(arc, context, x, y, outerRadius, innerRadius, startAngle, startAngle + capAngle), beforeRenderContribitionsRuned || this.beforeRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb);
+        const _runFill = () => {
+            if (doFill) {
+              const color = fill;
+              if ("conical" === color.gradient) {
+                const lastColor = getConicGradientAt(0, 0, endAngle, color);
+                fillCb || fillVisible && (context.setCommonStyle(arc, arc.attribute, x, y, arcAttribute), context.fillStyle = lastColor, context.fill());
+              }
+            }
+          },
+          _runStroke = () => {
+            doStroke && (strokeCb || sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke()));
+          };
+        _runFill(), _runStroke();
       }
     }
     this.afterRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb), tempChangeConicalColor && (fill.startAngle += conicalOffset, fill.endAngle += conicalOffset);
@@ -7596,7 +7713,8 @@ let DefaultCanvasCircleRender = class extends BaseRender {
         startAngle = circleAttribute.startAngle,
         endAngle = circleAttribute.endAngle,
         x: originX = circleAttribute.x,
-        y: originY = circleAttribute.y
+        y: originY = circleAttribute.y,
+        fillStrokeOrder = circleAttribute.fillStrokeOrder
       } = circle.attribute,
       data = this.valid(circle, circleAttribute, fillCb, strokeCb);
     if (!data) return;
@@ -7606,7 +7724,14 @@ let DefaultCanvasCircleRender = class extends BaseRender {
       doFill: doFill,
       doStroke: doStroke
     } = data;
-    context.beginPath(), context.arc(x, y, radius, startAngle, endAngle), context.closePath(), context.setShadowBlendStyle && context.setShadowBlendStyle(circle, circle.attribute, circleAttribute), this.beforeRenderStep(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb), doFill && (fillCb ? fillCb(context, circle.attribute, circleAttribute) : fVisible && (context.setCommonStyle(circle, circle.attribute, originX - x, originY - y, circleAttribute), context.fill())), doStroke && (strokeCb ? strokeCb(context, circle.attribute, circleAttribute) : sVisible && (context.setStrokeStyle(circle, circle.attribute, originX - x, originY - y, circleAttribute), context.stroke())), this.afterRenderStep(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb);
+    context.beginPath(), context.arc(x, y, radius, startAngle, endAngle), context.closePath(), context.setShadowBlendStyle && context.setShadowBlendStyle(circle, circle.attribute, circleAttribute), this.beforeRenderStep(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb);
+    const _runFill = () => {
+        doFill && (fillCb ? fillCb(context, circle.attribute, circleAttribute) : fVisible && (context.setCommonStyle(circle, circle.attribute, originX - x, originY - y, circleAttribute), context.fill()));
+      },
+      _runStroke = () => {
+        doStroke && (strokeCb ? strokeCb(context, circle.attribute, circleAttribute) : sVisible && (context.setStrokeStyle(circle, circle.attribute, originX - x, originY - y, circleAttribute), context.stroke()));
+      };
+    fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb);
   }
   draw(circle, renderService, drawContext, params) {
     const circleAttribute = getTheme(circle, null == params ? void 0 : params.theme).circle;
@@ -8047,7 +8172,7 @@ let DefaultCanvasAreaRender = class extends BaseRender {
     super(), this.areaRenderContribitions = areaRenderContribitions, this.numberType = AREA_NUMBER_TYPE, this.builtinContributions = [defaultAreaTextureRenderContribution, defaultAreaBackgroundRenderContribution], this.init(areaRenderContribitions);
   }
   drawLinearAreaHighPerformance(area, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, areaAttribute, drawContext, params, fillCb, strokeCb) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     const {
       points: points
     } = area.attribute;
@@ -8071,28 +8196,31 @@ let DefaultCanvasAreaRender = class extends BaseRender {
       x: originX = 0,
       x: originY = 0
     } = area.attribute;
-    if (!1 !== fill && (fillCb ? fillCb(context, area.attribute, areaAttribute) : fillOpacity && (context.setCommonStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, areaAttribute, drawContext, fillCb, null, {
+    !1 !== fill && (fillCb ? fillCb(context, area.attribute, areaAttribute) : fillOpacity && (context.setCommonStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, areaAttribute, drawContext, fillCb, null, {
       attribute: area.attribute
-    }), stroke) {
-      const {
-        stroke = areaAttribute && areaAttribute.stroke
-      } = area.attribute;
-      if (isArray(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1]) if (context.beginPath(), stroke[0]) {
-        context.moveTo(startP.x + offsetX, startP.y + offsetY, z);
-        for (let i = 1; i < points.length; i++) {
-          const p = points[i];
-          context.lineTo(p.x + offsetX, p.y + offsetY, z);
-        }
-      } else if (stroke[2]) {
-        const endP = points[points.length - 1];
-        context.moveTo(endP.x + offsetX, endP.y + offsetY, z);
-        for (let i = points.length - 2; i >= 0; i--) {
-          const p = points[i];
-          context.lineTo((null !== (_d = p.x1) && void 0 !== _d ? _d : p.x) + offsetX, (null !== (_e = p.y1) && void 0 !== _e ? _e : p.y) + offsetY, z);
+    }), (() => {
+      var _a, _b;
+      if (stroke) {
+        const {
+          stroke = areaAttribute && areaAttribute.stroke
+        } = area.attribute;
+        if (isArray(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1]) if (context.beginPath(), stroke[0]) {
+          context.moveTo(startP.x + offsetX, startP.y + offsetY, z);
+          for (let i = 1; i < points.length; i++) {
+            const p = points[i];
+            context.lineTo(p.x + offsetX, p.y + offsetY, z);
+          }
+        } else if (stroke[2]) {
+          const endP = points[points.length - 1];
+          context.moveTo(endP.x + offsetX, endP.y + offsetY, z);
+          for (let i = points.length - 2; i >= 0; i--) {
+            const p = points[i];
+            context.lineTo((null !== (_a = p.x1) && void 0 !== _a ? _a : p.x) + offsetX, (null !== (_b = p.y1) && void 0 !== _b ? _b : p.y) + offsetY, z);
+          }
         }
+        strokeCb ? strokeCb(context, area.attribute, areaAttribute) : (context.setStrokeStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute), context.stroke());
       }
-      strokeCb ? strokeCb(context, area.attribute, areaAttribute) : (context.setStrokeStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute), context.stroke());
-    }
+    })();
   }
   drawShape(area, context, x, y, drawContext, params, fillCb, strokeCb) {
     var _a, _b, _c, _d, _e, _f;
@@ -8257,23 +8385,24 @@ let DefaultCanvasAreaRender = class extends BaseRender {
       x: originX = 0,
       x: originY = 0
     } = attribute;
-    if (!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, 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, {
       attribute: attribute
-    }), !1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
-      const {
-        stroke = defaultAttribute && defaultAttribute[1] && defaultAttribute[1].stroke
-      } = attribute;
-      isArray(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();
-    }
-    return !1;
+    }), (() => {
+      if (!1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
+        const {
+          stroke = defaultAttribute && defaultAttribute[1] && defaultAttribute[1].stroke
+        } = attribute;
+        isArray(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();
+      }
+    })(), !1;
   }
 };
 DefaultCanvasAreaRender = __decorate$D([injectable(), __param$t(0, inject(ContributionProvider)), __param$t(0, named(AreaRenderContribution)), __metadata$w("design:paramtypes", [Object])], DefaultCanvasAreaRender);
@@ -8305,7 +8434,8 @@ let DefaultCanvasPathRender = class extends BaseRender {
     const pathAttribute = null !== (_a = this.tempTheme) && void 0 !== _a ? _a : getTheme(path, null == params ? void 0 : params.theme).path,
       {
         x: originX = pathAttribute.x,
-        y: originY = pathAttribute.y
+        y: originY = pathAttribute.y,
+        fillStrokeOrder = pathAttribute.fillStrokeOrder
       } = path.attribute,
       z = null !== (_b = this.z) && void 0 !== _b ? _b : 0,
       data = this.valid(path, pathAttribute, fillCb, strokeCb);
@@ -8320,7 +8450,14 @@ let DefaultCanvasPathRender = class extends BaseRender {
       const path2D = null !== (_c = path.attribute.path) && void 0 !== _c ? _c : pathAttribute.path;
       renderCommandList(path2D.commandList, context, x, y, 1, 1, z);
     }
-    context.setShadowBlendStyle && context.setShadowBlendStyle(path, path.attribute, pathAttribute), this.beforeRenderStep(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, drawContext, fillCb, strokeCb), doStroke && (strokeCb ? strokeCb(context, path.attribute, pathAttribute) : sVisible && (context.setStrokeStyle(path, path.attribute, originX - x, originY - y, pathAttribute), context.stroke())), doFill && (fillCb ? fillCb(context, path.attribute, pathAttribute) : fVisible && (context.setCommonStyle(path, path.attribute, originX - x, originY - y, pathAttribute), context.fill())), this.afterRenderStep(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, drawContext, fillCb, strokeCb);
+    context.setShadowBlendStyle && context.setShadowBlendStyle(path, path.attribute, pathAttribute), this.beforeRenderStep(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, drawContext, fillCb, strokeCb);
+    const _runStroke = () => {
+        doStroke && (strokeCb ? strokeCb(context, path.attribute, pathAttribute) : sVisible && (context.setStrokeStyle(path, path.attribute, originX - x, originY - y, pathAttribute), context.stroke()));
+      },
+      _runFill = () => {
+        doFill && (fillCb ? fillCb(context, path.attribute, pathAttribute) : fVisible && (context.setCommonStyle(path, path.attribute, originX - x, originY - y, pathAttribute), context.fill()));
+      };
+    fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, drawContext, fillCb, strokeCb);
   }
   draw(path, renderService, drawContext, params) {
     const pathAttribute = getTheme(path, null == params ? void 0 : params.theme).path;
@@ -8364,7 +8501,8 @@ let DefaultCanvasRectRender = class extends BaseRender {
         x1: x1,
         y1: y1,
         x: originX = rectAttribute.x,
-        y: originY = rectAttribute.y
+        y: originY = rectAttribute.y,
+        fillStrokeOrder = rectAttribute.fillStrokeOrder
       } = rect.attribute;
     let {
       width: width,
@@ -8383,7 +8521,14 @@ let DefaultCanvasRectRender = class extends BaseRender {
       doFill: doFill,
       doStroke: doStroke
     };
-    context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute), this.beforeRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb, doFillOrStroke), doFillOrStroke.doFill && (fillCb ? fillCb(context, rect.attribute, rectAttribute) : fVisible && (context.setCommonStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.fill())), doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, rect.attribute, rectAttribute) : sVisible && (context.setStrokeStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.stroke())), this.afterRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
+    context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute), this.beforeRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb, doFillOrStroke);
+    const _runFill = () => {
+        doFillOrStroke.doFill && (fillCb ? fillCb(context, rect.attribute, rectAttribute) : fVisible && (context.setCommonStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.fill()));
+      },
+      _runStroke = () => {
+        doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, rect.attribute, rectAttribute) : sVisible && (context.setStrokeStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.stroke()));
+      };
+    fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
   }
   draw(rect, renderService, drawContext, params) {
     const rectAttribute = getTheme(rect, null == params ? void 0 : params.theme).rect;
@@ -8419,7 +8564,8 @@ let DefaultCanvasSymbolRender = class extends BaseRender {
         x: originX = symbolAttribute.x,
         y: originY = symbolAttribute.y,
         scaleX = symbolAttribute.scaleX,
-        scaleY = symbolAttribute.scaleY
+        scaleY = symbolAttribute.scaleY,
+        fillStrokeOrder = symbolAttribute.fillStrokeOrder
       } = symbol.attribute,
       data = this.valid(symbol, symbolAttribute, fillCb, strokeCb);
     if (!data) return;
@@ -8442,14 +8588,27 @@ let DefaultCanvasSymbolRender = class extends BaseRender {
         const obj = Object.assign({}, a);
         obj.fill = null !== (_a = a.fill) && void 0 !== _a ? _a : symbol.attribute.fill, obj.opacity = null !== (_b = a.opacity) && void 0 !== _b ? _b : symbol.attribute.opacity, obj.fillOpacity = symbol.attribute.fillOpacity, obj.stroke = null !== (_c = a.stroke) && void 0 !== _c ? _c : symbol.attribute.stroke, a = obj;
       }
-      a.fill && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : (context.setCommonStyle(symbol, a, originX - x, originY - y, symbolAttribute), context.fill())), a.stroke && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : (context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke()));
+      const _runFill = () => {
+          a.fill && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : (context.setCommonStyle(symbol, a, originX - x, originY - y, symbolAttribute), context.fill()));
+        },
+        _runStroke = () => {
+          a.stroke && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : (context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke()));
+        };
+      fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke());
     };
     if (keepDirIn3d && context.camera && context.project) {
       const p = context.project(x, y, z),
         camera = context.camera;
       context.camera = null, !1 === parsedPath.draw(context, isArray(size) ? [size[0] * scaleX, size[1] * scaleY] : size * scaleX, p.x, p.y, void 0, callback) && context.closePath(), context.camera = camera;
     } else !1 === parsedPath.draw(context, size, x, y, z, callback) && context.closePath();
-    context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute), this.beforeRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb), doFill && !parsedPath.isSvg && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : fVisible && (context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute), context.fill())), doStroke && !parsedPath.isSvg && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : sVisible && (context.setStrokeStyle(symbol, symbol.attribute, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke())), this.afterRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
+    context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute), this.beforeRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
+    const _runFill = () => {
+        doFill && !parsedPath.isSvg && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : fVisible && (context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute), context.fill()));
+      },
+      _runStroke = () => {
+        doStroke && !parsedPath.isSvg && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : sVisible && (context.setStrokeStyle(symbol, symbol.attribute, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke()));
+      };
+    fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
   }
   draw(symbol, renderService, drawContext, params) {
     const symbolAttribute = getTheme(symbol, null == params ? void 0 : params.theme).symbol;
@@ -8624,77 +8783,50 @@ let DefaultCanvasTextRender = class extends BaseRender {
       }
       doStroke && (strokeCb ? strokeCb(context, text.attribute, textAttribute) : sVisible && (context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute), context.strokeText(t, _x, _y, z))), doFill && (fillCb ? fillCb(context, text.attribute, textAttribute) : fVisible && (context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute), context.fillText(t, _x, _y, z), this.drawUnderLine(underline, lineThrough, text, _x, _y, z, textAttribute, context))), direction && (context.highPerformanceRestore(), context.setTransformForCurrent());
     };
-    if (text.isMultiLine) {
-      if (context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z), "horizontal" === direction) {
-        const {
-          multilineLayout: multilineLayout
-        } = text;
-        if (!multilineLayout) return void context.highPerformanceRestore();
-        const {
-          xOffset: xOffset,
-          yOffset: yOffset
-        } = multilineLayout.bbox;
-        doStroke && (strokeCb ? strokeCb(context, text.attribute, textAttribute) : sVisible && (context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute), multilineLayout.lines.forEach(line => {
-          context.strokeText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);
-        }))), doFill && (fillCb ? fillCb(context, text.attribute, textAttribute) : fVisible && (context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute), multilineLayout.lines.forEach(line => {
-          context.fillText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z), this.drawUnderLine(underline, lineThrough, text, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y - textDrawOffsetY("bottom", fontSize) - .05 * fontSize, z, textAttribute, context, {
-            width: line.width
-          });
-        })));
-      } else {
-        text.tryUpdateAABBBounds();
-        const cache = text.cache,
-          {
-            verticalList: verticalList
-          } = cache;
-        context.textAlign = "left", context.textBaseline = "top";
-        const totalHeight = lineHeight * verticalList.length;
-        let totalW = 0;
-        verticalList.forEach(verticalData => {
-          const _w = verticalData.reduce((a, b) => a + (b.width || 0), 0);
-          totalW = max(_w, totalW);
-        });
-        let offsetY = 0,
-          offsetX = 0;
-        "bottom" === textBaseline ? offsetX = -totalHeight : "middle" === textBaseline && (offsetX = -totalHeight / 2), "center" === textAlign ? offsetY -= totalW / 2 : "right" === textAlign && (offsetY -= totalW), verticalList.forEach((verticalData, i) => {
-          const currentW = verticalData.reduce((a, b) => a + (b.width || 0), 0),
-            dw = totalW - currentW;
-          let currentOffsetY = offsetY;
-          "center" === textAlign ? currentOffsetY += dw / 2 : "right" === textAlign && (currentOffsetY += dw), verticalData.forEach(item => {
-            const {
-              text: text,
-              width: width,
-              direction: direction
-            } = item;
-            drawText(text, totalHeight - (i + 1) * lineHeight + offsetX, currentOffsetY, direction), currentOffsetY += width;
-          });
+    if (context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z), "horizontal" === direction) {
+      const {
+        multilineLayout: multilineLayout
+      } = text;
+      if (!multilineLayout) return void context.highPerformanceRestore();
+      const {
+        xOffset: xOffset,
+        yOffset: yOffset
+      } = multilineLayout.bbox;
+      doStroke && (strokeCb ? strokeCb(context, text.attribute, textAttribute) : sVisible && (context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute), multilineLayout.lines.forEach(line => {
+        context.strokeText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);
+      }))), doFill && (fillCb ? fillCb(context, text.attribute, textAttribute) : fVisible && (context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute), multilineLayout.lines.forEach(line => {
+        context.fillText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z), this.drawUnderLine(underline, lineThrough, text, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y - textDrawOffsetY("bottom", fontSize) - .05 * fontSize, z, textAttribute, context, {
+          width: line.width
         });
-      }
-    } else if ("horizontal" === direction) {
-      context.setTextStyle(text.attribute, textAttribute, z);
-      const t = text.clipedText;
-      let dy = 0;
-      lineHeight !== fontSize && ("top" === textBaseline ? dy = (lineHeight - fontSize) / 2 : "middle" === textBaseline || "bottom" === textBaseline && (dy = -(lineHeight - fontSize) / 2)), drawText(t, 0, dy, 0);
+      })));
     } else {
       text.tryUpdateAABBBounds();
-      const cache = text.cache;
-      if (cache) {
-        context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z);
-        const {
+      const cache = text.cache,
+        {
           verticalList: verticalList
         } = cache;
-        let offsetY = 0;
-        const totalW = verticalList[0].reduce((a, b) => a + (b.width || 0), 0);
-        let offsetX = 0;
-        "bottom" === textBaseline ? offsetX = -lineHeight : "middle" === textBaseline && (offsetX = -lineHeight / 2), "center" === textAlign ? offsetY -= totalW / 2 : "right" === textAlign && (offsetY -= totalW), context.textAlign = "left", context.textBaseline = "top", verticalList[0].forEach(item => {
+      context.textAlign = "left", context.textBaseline = "top";
+      const totalHeight = lineHeight * verticalList.length;
+      let totalW = 0;
+      verticalList.forEach(verticalData => {
+        const _w = verticalData.reduce((a, b) => a + (b.width || 0), 0);
+        totalW = max(_w, totalW);
+      });
+      let offsetY = 0,
+        offsetX = 0;
+      "bottom" === textBaseline ? offsetX = -totalHeight : "middle" === textBaseline && (offsetX = -totalHeight / 2), "center" === textAlign ? offsetY -= totalW / 2 : "right" === textAlign && (offsetY -= totalW), verticalList.forEach((verticalData, i) => {
+        const currentW = verticalData.reduce((a, b) => a + (b.width || 0), 0),
+          dw = totalW - currentW;
+        let currentOffsetY = offsetY;
+        "center" === textAlign ? currentOffsetY += dw / 2 : "right" === textAlign && (currentOffsetY += dw), verticalData.forEach(item => {
           const {
             text: text,
             width: width,
             direction: direction
           } = item;
-          drawText(text, offsetX, offsetY, direction), offsetY += width;
+          drawText(text, totalHeight - (i + 1) * lineHeight + offsetX, currentOffsetY, direction), currentOffsetY += width;
         });
-      }
+      });
     }
     transform3dMatrixToContextMatrix && this.restoreTransformUseContext2d(text, textAttribute, z, context), this.afterRenderStep(text, context, x, y, doFill, doStroke, fVisible, sVisible, textAttribute, drawContext, fillCb, strokeCb);
   }
@@ -8823,7 +8955,8 @@ let DefaultCanvasPolygonRender = class extends BaseRender {
         cornerRadius = polygonAttribute.cornerRadius,
         x: originX = polygonAttribute.x,
         y: originY = polygonAttribute.y,
-        closePath = polygonAttribute.closePath
+        closePath = polygonAttribute.closePath,
+        fillStrokeOrder = polygonAttribute.fillStrokeOrder
       } = polygon.attribute,
       data = this.valid(polygon, polygonAttribute, fillCb, strokeCb);
     if (!data) return;
@@ -8833,7 +8966,14 @@ let DefaultCanvasPolygonRender = class extends BaseRender {
       doFill: doFill,
       doStroke: doStroke
     } = data;
-    context.beginPath(), cornerRadius <= 0 || isArray(cornerRadius) && cornerRadius.every(num => 0 === num) ? drawPolygon(context.camera ? context : context.nativeContext, points, x, y) : drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, cornerRadius, closePath), closePath && context.closePath(), context.setShadowBlendStyle && context.setShadowBlendStyle(polygon, polygon.attribute, polygonAttribute), this.beforeRenderStep(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb), doFill && (fillCb ? fillCb(context, polygon.attribute, polygonAttribute) : fVisible && (context.setCommonStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.fill())), doStroke && (strokeCb ? strokeCb(context, polygon.attribute, polygonAttribute) : sVisible && (context.setStrokeStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.stroke())), this.afterRenderStep(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb);
+    context.beginPath(), cornerRadius <= 0 || isArray(cornerRadius) && cornerRadius.every(num => 0 === num) ? drawPolygon(context.camera ? context : context.nativeContext, points, x, y) : drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, cornerRadius, closePath), closePath && context.closePath(), context.setShadowBlendStyle && context.setShadowBlendStyle(polygon, polygon.attribute, polygonAttribute), this.beforeRenderStep(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb);
+    const _runFill = () => {
+        doFill && (fillCb ? fillCb(context, polygon.attribute, polygonAttribute) : fVisible && (context.setCommonStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.fill()));
+      },
+      _runStroke = () => {
+        doStroke && (strokeCb ? strokeCb(context, polygon.attribute, polygonAttribute) : sVisible && (context.setStrokeStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.stroke()));
+      };
+    fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb);
   }
   draw(polygon, renderService, drawContext, params) {
     const polygonAttribute = getTheme(polygon, null == params ? void 0 : params.theme).polygon;
@@ -8876,7 +9016,10 @@ let DefaultCanvasGroupRender = class {
         cornerRadius = groupAttribute.cornerRadius,
         path = groupAttribute.path,
         lineWidth = groupAttribute.lineWidth,
-        visible = groupAttribute.visible
+        visible = groupAttribute.visible,
+        fillStrokeOrder = groupAttribute.fillStrokeOrder,
+        x: originX = groupAttribute.x,
+        y: originY = groupAttribute.y
       } = group.attribute,
       fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
       sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height),
@@ -8902,7 +9045,14 @@ let DefaultCanvasGroupRender = class {
     };
     this._groupRenderContribitions.forEach(c => {
       c.time === BaseRenderContributionTime.beforeFillStroke && c.drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke);
-    }), clip && context.clip(), context.setShadowBlendStyle && context.setShadowBlendStyle(group, group.attribute, groupAttribute), doFillOrStroke.doFill && (fillCb ? fillCb(context, group.attribute, groupAttribute) : fVisible && (context.setCommonStyle(group, group.attribute, x, y, groupAttribute), context.fill())), doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, group.attribute, groupAttribute) : sVisible && (context.setStrokeStyle(group, group.attribute, x, y, groupAttribute), context.stroke())), this._groupRenderContribitions.forEach(c => {
+    }), clip && context.clip(), context.setShadowBlendStyle && context.setShadowBlendStyle(group, group.attribute, groupAttribute);
+    const _runFill = () => {
+        doFillOrStroke.doFill && (fillCb ? fillCb(context, group.attribute, groupAttribute) : fVisible && (context.setCommonStyle(group, group.attribute, originX - x, originY - y, groupAttribute), context.fill()));
+      },
+      _runStroke = () => {
+        doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, group.attribute, groupAttribute) : sVisible && (context.setStrokeStyle(group, group.attribute, originX - x, originY - y, groupAttribute), context.stroke()));
+      };
+    fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this._groupRenderContribitions.forEach(c => {
       c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb);
     });
   }
@@ -8968,6 +9118,7 @@ let DefaultCanvasImageRender = class extends BaseRender {
         x: originX = imageAttribute.x,
         y: originY = imageAttribute.y,
         cornerRadius = imageAttribute.cornerRadius,
+        fillStrokeOrder = imageAttribute.fillStrokeOrder,
         image: url
       } = image.attribute,
       data = this.valid(image, imageAttribute, fillCb);
@@ -8978,20 +9129,26 @@ let DefaultCanvasImageRender = class extends BaseRender {
       doFill: doFill,
       doStroke: doStroke
     } = data;
-    if (context.setShadowBlendStyle && context.setShadowBlendStyle(image, imageAttribute), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb), doFill) if (fillCb) fillCb(context, image.attribute, imageAttribute);else if (fVisible) {
-      if (!url || !image.resources) return;
-      const res = image.resources.get(url);
-      if ("success" !== res.state) return;
-      let needRestore = !1;
-      0 === cornerRadius || isArray(cornerRadius) && cornerRadius.every(num => 0 === num) || (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius), context.save(), context.clip(), needRestore = !0), context.setCommonStyle(image, image.attribute, x, y, imageAttribute);
-      let repeat = 0;
-      if ("repeat" === repeatX && (repeat |= 1), "repeat" === repeatY && (repeat |= 2), repeat) {
-        const pattern = context.createPattern(res.data, repeatStr[repeat]);
-        context.fillStyle = pattern, context.translate(x, y, !0), context.fillRect(0, 0, width, height), context.translate(-x, -y, !0);
-      } else context.drawImage(res.data, x, y, width, height);
-      needRestore && context.restore();
-    }
-    doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), context.stroke())), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
+    context.setShadowBlendStyle && context.setShadowBlendStyle(image, imageAttribute), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
+    const _runFill = () => {
+        if (doFill) if (fillCb) fillCb(context, image.attribute, imageAttribute);else if (fVisible) {
+          if (!url || !image.resources) return;
+          const res = image.resources.get(url);
+          if ("success" !== res.state) return;
+          let needRestore = !1;
+          0 === cornerRadius || isArray(cornerRadius) && cornerRadius.every(num => 0 === num) || (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius), context.save(), context.clip(), needRestore = !0), context.setCommonStyle(image, image.attribute, x, y, imageAttribute);
+          let repeat = 0;
+          if ("repeat" === repeatX && (repeat |= 1), "repeat" === repeatY && (repeat |= 2), repeat) {
+            const pattern = context.createPattern(res.data, repeatStr[repeat]);
+            context.fillStyle = pattern, context.translate(x, y, !0), context.fillRect(0, 0, width, height), context.translate(-x, -y, !0);
+          } else context.drawImage(res.data, x, y, width, height);
+          needRestore && context.restore();
+        }
+      },
+      _runStroke = () => {
+        doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), context.stroke()));
+      };
+    fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
   }
   draw(image, renderService, drawContext) {
     const {
@@ -9384,28 +9541,6 @@ class CanvasTextLayout {
     }
     return bbox.yOffset = "top" === textBaseline ? 0 : "middle" === textBaseline ? bbox.height / -2 : "alphabetic" === textBaseline ? -.79 * bbox.height : -bbox.height, bbox;
   }
-  GetLayout(str, width, height, textAlign, textBaseline, lineHeight, suffix, wordBreak, suffixPosition) {
-    const linesLayout = [],
-      bboxWH = [width, height],
-      bboxOffset = [0, 0];
-    for (; str.length > 0;) {
-      const {
-        str: clipText
-      } = this.textMeasure.clipTextWithSuffix(str, this.textOptions, width, suffix, wordBreak, suffixPosition);
-      linesLayout.push({
-        str: clipText,
-        width: this.textMeasure.measureTextWidth(clipText, this.textOptions)
-      }), str = str.substring(clipText.length);
-    }
-    "left" === textAlign || "start" === textAlign || ("center" === textAlign ? bboxOffset[0] = bboxWH[0] / -2 : "right" !== textAlign && "end" !== textAlign || (bboxOffset[0] = -bboxWH[0])), "top" === textBaseline || ("middle" === textBaseline ? bboxOffset[1] = bboxWH[1] / -2 : "bottom" === textBaseline && (bboxOffset[1] = -bboxWH[1]));
-    const bbox = {
-      xOffset: bboxOffset[0],
-      yOffset: bboxOffset[1],
-      width: bboxWH[0],
-      height: bboxWH[1]
-    };
-    return this.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline, lineHeight);
-  }
   GetLayoutByLines(lines, textAlign, textBaseline, lineHeight) {
     let suffix = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "";
     let wordBreak = arguments.length > 5 ? arguments[5] : undefined;
@@ -9416,18 +9551,29 @@ class CanvasTextLayout {
       bboxWH = [0, 0];
     if ("number" == typeof lineWidth && lineWidth !== 1 / 0) {
       let width;
-      for (let i = 0, len = lines.length; i < len; i++) width = Math.min(this.textMeasure.measureTextWidth(lines[i], this.textOptions), lineWidth), linesLayout.push({
-        str: this.textMeasure.clipTextWithSuffix(lines[i], this.textOptions, width, suffix, wordBreak, suffixPosition).str,
-        width: width
-      });
+      for (let i = 0, len = lines.length; i < len; i++) {
+        const metrics = this.textMeasure.measureTextPixelADscentAndWidth(lines[i], this.textOptions);
+        width = Math.min(metrics.width, lineWidth), linesLayout.push({
+          str: this.textMeasure.clipTextWithSuffix(lines[i], this.textOptions, width, suffix, wordBreak, suffixPosition).str,
+          width: width,
+          ascent: metrics.ascent,
+          descent: metrics.descent
+        });
+      }
       bboxWH[0] = lineWidth;
     } else {
       let width, text;
       lineWidth = 0;
-      for (let i = 0, len = lines.length; i < len; i++) text = lines[i], width = this.textMeasure.measureTextWidth(text, this.textOptions), lineWidth = Math.max(lineWidth, width), linesLayout.push({
-        str: text,
-        width: width
-      });
+      for (let i = 0, len = lines.length; i < len; i++) {
+        text = lines[i];
+        const metrics = this.textMeasure.measureTextPixelADscentAndWidth(lines[i], this.textOptions);
+        width = metrics.width, lineWidth = Math.max(lineWidth, width), linesLayout.push({
+          str: text,
+          width: width,
+          ascent: metrics.ascent,
+          descent: metrics.descent
+        });
+      }
       bboxWH[0] = lineWidth;
     }
     bboxWH[1] = linesLayout.length * lineHeight, bboxWH[0] = linesLayout.reduce((a, b) => Math.max(a, b.width), 0);
@@ -9456,11 +9602,11 @@ class CanvasTextLayout {
     };
   }
   lineOffset(bbox, line, textAlign, textBaseline, lineHeight, origin) {
-    return "left" === textAlign || "start" === textAlign ? line.leftOffset = 0 : "center" === textAlign ? line.leftOffset = (bbox.width - line.width) / 2 : "right" !== textAlign && "end" !== textAlign || (line.leftOffset = bbox.width - line.width), line.topOffset = (lineHeight - this.textOptions.fontSize) / 2 + .79 * this.textOptions.fontSize + origin[1], origin[1] += lineHeight, line;
+    return "left" === textAlign || "start" === textAlign ? line.leftOffset = 0 : "center" === textAlign ? line.leftOffset = (bbox.width - line.width) / 2 : "right" !== textAlign && "end" !== textAlign || (line.leftOffset = bbox.width - line.width), line.topOffset = lineHeight / 2 + (line.ascent - line.descent) / 2 + origin[1], origin[1] += lineHeight, line;
   }
 }
 
-const TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "textAlign", "textBaseline", "heightLimit", "lineClamp", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", "direction", "wordBreak", "heightLimit", "lineClamp", ...GRAPHIC_UPDATE_TAG_KEY];
+const TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "maxWidth", "textAlign", "textBaseline", "heightLimit", "lineClamp", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", "direction", "wordBreak", "heightLimit", "lineClamp", ...GRAPHIC_UPDATE_TAG_KEY];
 class Text extends Graphic {
   get font() {
     const textTheme = this.getGraphicTheme();
@@ -9469,26 +9615,22 @@ class Text extends Graphic {
   get clipedText() {
     var _a;
     const attribute = this.attribute,
-      textTheme = this.getGraphicTheme();
-    if (!this.isSimplify()) return;
-    const {
-      maxLineWidth = textTheme.maxLineWidth
-    } = attribute;
-    return Number.isFinite(maxLineWidth) ? (this.tryUpdateAABBBounds(), this.cache.clipedText) : (null !== (_a = attribute.text) && void 0 !== _a ? _a : textTheme.text).toString();
+      textTheme = this.getGraphicTheme(),
+      maxWidth = this.getMaxWidth(textTheme);
+    return Number.isFinite(maxWidth) ? (this.tryUpdateAABBBounds(), this.cache.clipedText) : (null !== (_a = attribute.text) && void 0 !== _a ? _a : textTheme.text).toString();
   }
   get clipedWidth() {
-    if (this.isSimplify()) return this.tryUpdateAABBBounds(), this.cache.clipedWidth;
+    return this.tryUpdateAABBBounds(), this.cache.clipedWidth;
   }
   get cliped() {
     var _a, _b;
     const textTheme = this.getGraphicTheme(),
       attribute = this.attribute,
-      {
-        maxLineWidth = textTheme.maxLineWidth,
-        text: text,
-        whiteSpace = textTheme.whiteSpace
-      } = attribute;
-    if (!Number.isFinite(maxLineWidth)) return !1;
+      maxWidth = this.getMaxWidth(textTheme);
+    if (!Number.isFinite(maxWidth)) return !1;
+    const {
+      text: text
+    } = this.attribute;
     if (this.tryUpdateAABBBounds(), null === (_b = null === (_a = this.cache) || void 0 === _a ? void 0 : _a.layoutData) || void 0 === _b ? void 0 : _b.lines) {
       let mergedText = "";
       this.cache.layoutData.lines.forEach(item => {
@@ -9499,10 +9641,7 @@ class Text extends Graphic {
     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();
   }
   get multilineLayout() {
-    if (this.isMultiLine) return this.tryUpdateAABBBounds(), this.cache.layoutData;
-  }
-  isSimplify() {
-    return !this.isMultiLine && "vertical" !== this.attribute.direction;
+    return this.tryUpdateAABBBounds(), this.cache.layoutData;
   }
   get isMultiLine() {
     return Array.isArray(this.attribute.text) || "normal" === this.attribute.whiteSpace;
@@ -9575,8 +9714,63 @@ class Text extends Graphic {
     }
     return application.graphicService.combindShadowAABBBounds(aabbBounds, this), null == attribute.forceBoundsHeight && null == attribute.forceBoundsWidth || application.graphicService.updateHTMLTextAABBBounds(attribute, textTheme, aabbBounds), transformBoundsWithMatrix(aabbBounds, aabbBounds, this.transMatrix), aabbBounds;
   }
+  updateSingallineAABBBounds(text) {
+    this.updateMultilineAABBBounds([text]);
+    const layoutData = this.cache.layoutData;
+    if (layoutData) {
+      const line = layoutData.lines[0];
+      this.cache.clipedText = line.str, this.cache.clipedWidth = line.width;
+    }
+    return this._AABBBounds;
+  }
+  updateMultilineAABBBounds(text) {
+    const textTheme = this.getGraphicTheme(),
+      {
+        direction = textTheme.direction,
+        underlineOffset = textTheme.underlineOffset
+      } = this.attribute,
+      b = "horizontal" === direction ? this.updateHorizontalMultilineAABBBounds(text) : this.updateVerticalMultilineAABBBounds(text);
+    return "horizontal" === direction && underlineOffset && this._AABBBounds.add(this._AABBBounds.x1, this._AABBBounds.y2 + underlineOffset), b;
+  }
+  updateHorizontalMultilineAABBBounds(text) {
+    var _a;
+    const textTheme = this.getGraphicTheme(),
+      attribute = this.attribute,
+      {
+        fontFamily = textTheme.fontFamily,
+        textAlign = textTheme.textAlign,
+        textBaseline = textTheme.textBaseline,
+        fontSize = textTheme.fontSize,
+        fontWeight = textTheme.fontWeight,
+        ellipsis = textTheme.ellipsis,
+        maxLineWidth: maxLineWidth,
+        stroke = textTheme.stroke,
+        wrap = textTheme.wrap,
+        ignoreBuf = textTheme.ignoreBuf,
+        lineWidth = textTheme.lineWidth,
+        whiteSpace = textTheme.whiteSpace,
+        suffixPosition = textTheme.suffixPosition
+      } = attribute,
+      buf = ignoreBuf ? 0 : 2,
+      lineHeight = this.getLineHeight(attribute, textTheme) + buf;
+    if ("normal" === whiteSpace || wrap) return this.updateWrapAABBBounds(text);
+    if (!this.shouldUpdateShape() && (null === (_a = this.cache) || void 0 === _a ? void 0 : _a.layoutData)) {
+      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,
+      layoutData = new CanvasTextLayout(fontFamily, {
+        fontSize: fontSize,
+        fontWeight: fontWeight,
+        fontFamily: fontFamily
+      }, textMeasure).GetLayoutByLines(text, textAlign, textBaseline, lineHeight, !0 === ellipsis ? textTheme.ellipsis : ellipsis || void 0, !1, maxLineWidth, suffixPosition),
+      {
+        bbox: bbox
+      } = layoutData;
+    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, _d;
+    var _a, _b, _c;
     const textTheme = this.getGraphicTheme(),
       {
         fontFamily = textTheme.fontFamily,
@@ -9594,18 +9788,19 @@ class Text extends Graphic {
         heightLimit = 0,
         lineClamp: lineClamp
       } = this.attribute,
-      lineHeight = null !== (_a = calculateLineHeight(this.attribute.lineHeight, this.attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : this.attribute.fontSize || textTheme.fontSize,
-      buf = ignoreBuf ? 0 : 2;
-    if (!this.shouldUpdateShape() && (null === (_b = this.cache) || void 0 === _b ? void 0 : _b.layoutData)) {
+      buf = ignoreBuf ? 0 : 2,
+      lineHeight = this.getLineHeight(this.attribute, textTheme) + buf;
+    if (!this.shouldUpdateShape() && (null === (_a = this.cache) || void 0 === _a ? void 0 : _a.layoutData)) {
       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,
-      layoutObj = new CanvasTextLayout(fontFamily, {
+      textOptions = {
         fontSize: fontSize,
         fontWeight: fontWeight,
         fontFamily: fontFamily
-      }, textMeasure),
+      },
+      layoutObj = new CanvasTextLayout(fontFamily, textOptions, textMeasure),
       lines = isArray(text) ? text.map(l => l.toString()) : [text.toString()],
       linesLayout = [],
       bboxWH = [0, 0];
@@ -9615,29 +9810,33 @@ class Text extends Graphic {
         const str = lines[i];
         let needCut = !0;
         if (i === lineCountLimit - 1) {
-          const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1, suffixPosition, i !== lines.length - 1);
+          const clip = textMeasure.clipTextWithSuffix(str, textOptions, maxLineWidth, ellipsis, !1, suffixPosition, i !== lines.length - 1),
+            matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions);
           linesLayout.push({
             str: clip.str,
-            width: clip.width
+            width: clip.width,
+            ascent: matrics.ascent,
+            descent: matrics.descent
           });
           break;
         }
-        const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth, "break-all" !== wordBreak, "keep-all" === wordBreak);
-        if ("" !== str && "" === clip.str || clip.wordBreaked) {
+        const clip = textMeasure.clipText(str, textOptions, maxLineWidth, "break-word" === wordBreak);
+        if ("" !== str && "" === clip.str) {
           if (ellipsis) {
-            const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
-            clip.str = null !== (_c = clipEllipsis.str) && void 0 !== _c ? _c : "", clip.width = null !== (_d = clipEllipsis.width) && void 0 !== _d ? _d : 0;
+            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;
           } else clip.str = "", clip.width = 0;
           needCut = !1;
         }
-        linesLayout.push({
+        const matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions);
+        if (linesLayout.push({
           str: clip.str,
-          width: clip.width
-        });
-        let cutLength = clip.str.length;
-        if (!clip.wordBreaked || "" !== str && "" === clip.str || (needCut = !0, cutLength = clip.wordBreaked), clip.str.length === str.length) ;else if (needCut) {
-          let newStr = str.substring(cutLength);
-          "keep-all" === wordBreak && (newStr = newStr.replace(/^\s+/g, "")), lines.splice(i + 1, 0, newStr);
+          width: clip.width,
+          ascent: matrics.ascent,
+          descent: matrics.descent
+        }), clip.str.length === str.length) ;else if (needCut) {
+          const newStr = str.substring(clip.str.length);
+          lines.splice(i + 1, 0, newStr);
         }
       }
       let maxWidth = 0;
@@ -9650,21 +9849,28 @@ class Text extends Graphic {
         lineWidth = 0;
       for (let i = 0, len = lines.length; i < len; i++) {
         if (i === lineCountLimit - 1) {
-          const clip = layoutObj.textMeasure.clipTextWithSuffix(lines[i], layoutObj.textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
+          const clip = textMeasure.clipTextWithSuffix(lines[i], textOptions, maxLineWidth, ellipsis, !1, suffixPosition),
+            matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions);
           linesLayout.push({
             str: clip.str,
-            width: clip.width
+            width: clip.width,
+            ascent: matrics.ascent,
+            descent: matrics.descent
           }), lineWidth = Math.max(lineWidth, clip.width);
           break;
         }
-        text = lines[i], width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions, "break-word" === wordBreak), lineWidth = Math.max(lineWidth, width), linesLayout.push({
+        text = lines[i], width = textMeasure.measureTextWidth(text, textOptions), lineWidth = Math.max(lineWidth, width);
+        const matrics = textMeasure.measureTextPixelADscentAndWidth(text, textOptions);
+        linesLayout.push({
           str: text,
-          width: width
+          width: width,
+          ascent: matrics.ascent,
+          descent: matrics.descent
         });
       }
       bboxWH[0] = lineWidth;
     }
-    bboxWH[1] = linesLayout.length * (lineHeight + buf);
+    bboxWH[1] = linesLayout.length * lineHeight;
     const bbox = {
       xOffset: 0,
       yOffset: 0,
@@ -9675,210 +9881,12 @@ class Text extends Graphic {
     const layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline, lineHeight);
     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;
   }
-  updateSingallineAABBBounds(text) {
-    const textTheme = this.getGraphicTheme(),
-      {
-        direction = textTheme.direction,
-        underlineOffset = textTheme.underlineOffset
-      } = this.attribute,
-      b = "horizontal" === direction ? this.updateHorizontalSinglelineAABBBounds(text) : this.updateVerticalSinglelineAABBBounds(text);
-    return "horizontal" === direction && underlineOffset && this._AABBBounds.add(this._AABBBounds.x1, this._AABBBounds.y2 + underlineOffset), b;
-  }
-  updateMultilineAABBBounds(text) {
-    const textTheme = this.getGraphicTheme(),
-      {
-        direction = textTheme.direction,
-        underlineOffset = textTheme.underlineOffset
-      } = this.attribute,
-      b = "horizontal" === direction ? this.updateHorizontalMultilineAABBBounds(text) : this.updateVerticalMultilineAABBBounds(text);
-    return "horizontal" === direction && underlineOffset && this._AABBBounds.add(this._AABBBounds.x1, this._AABBBounds.y2 + underlineOffset), b;
-  }
-  updateHorizontalSinglelineAABBBounds(text) {
-    var _a, _b;
-    const textTheme = this.getGraphicTheme(),
-      {
-        wrap = textTheme.wrap
-      } = this.attribute;
-    if (wrap) return this.updateWrapAABBBounds([text]);
-    const textMeasure = application.graphicUtil.textMeasure;
-    let width, str;
-    const attribute = this.attribute,
-      {
-        maxLineWidth = textTheme.maxLineWidth,
-        ellipsis = textTheme.ellipsis,
-        textAlign = textTheme.textAlign,
-        textBaseline = textTheme.textBaseline,
-        fontFamily = textTheme.fontFamily,
-        fontSize = textTheme.fontSize,
-        fontWeight = textTheme.fontWeight,
-        stroke = textTheme.stroke,
-        lineWidth = textTheme.lineWidth,
-        ignoreBuf = textTheme.ignoreBuf,
-        whiteSpace = textTheme.whiteSpace,
-        suffixPosition = textTheme.suffixPosition
-      } = attribute;
-    if ("normal" === whiteSpace) return this.updateWrapAABBBounds(text);
-    const buf = ignoreBuf ? 0 : Math.max(2, .075 * fontSize),
-      textFontSize = attribute.fontSize || textTheme.fontSize,
-      lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, textFontSize)) && void 0 !== _a ? _a : textFontSize + buf;
-    if (!this.shouldUpdateShape() && this.cache) {
-      width = null !== (_b = this.cache.clipedWidth) && void 0 !== _b ? _b : 0;
-      const dx = textDrawOffsetX(textAlign, width),
-        dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);
-      return this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
-    }
-    if (Number.isFinite(maxLineWidth)) {
-      if (ellipsis) {
-        const strEllipsis = !0 === ellipsis ? textTheme.ellipsis : ellipsis,
-          data = textMeasure.clipTextWithSuffix(text.toString(), {
-            fontSize: fontSize,
-            fontWeight: fontWeight,
-            fontFamily: fontFamily
-          }, maxLineWidth, strEllipsis, !1, suffixPosition);
-        str = data.str, width = data.width;
-      } else {
-        const data = textMeasure.clipText(text.toString(), {
-          fontSize: fontSize,
-          fontWeight: fontWeight,
-          fontFamily: fontFamily
-        }, maxLineWidth, !1);
-        str = data.str, width = data.width;
-      }
-      this.cache.clipedText = str, this.cache.clipedWidth = width;
-    } else width = textMeasure.measureTextWidth(text.toString(), {
-      fontSize: fontSize,
-      fontWeight: fontWeight,
-      fontFamily: fontFamily
-    }), this.cache.clipedText = text.toString(), this.cache.clipedWidth = width;
-    this.clearUpdateShapeTag();
-    const dx = textDrawOffsetX(textAlign, width);
-    let lh = lineHeight;
-    application.global && application.global.isSafari() && (lh += .2 * fontSize);
-    const dy = textLayoutOffsetY(textBaseline, lh, fontSize, buf);
-    return this._AABBBounds.set(dx, dy, dx + width, dy + lh), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
-  }
-  getBaselineMapAlign() {
-    return Text.baselineMapAlign;
-  }
-  getAlignMapBaseline() {
-    return Text.alignMapBaseline;
-  }
-  updateVerticalSinglelineAABBBounds(text) {
-    var _a, _b, _c;
-    const textTheme = this.getGraphicTheme(),
-      textMeasure = application.graphicUtil.textMeasure;
-    let width;
-    const attribute = this.attribute,
-      {
-        ignoreBuf = textTheme.ignoreBuf
-      } = attribute,
-      buf = ignoreBuf ? 0 : 2,
-      {
-        maxLineWidth = textTheme.maxLineWidth,
-        ellipsis = textTheme.ellipsis,
-        fontSize = textTheme.fontSize,
-        fontWeight = textTheme.fontWeight,
-        fontFamily = textTheme.fontFamily,
-        stroke = textTheme.stroke,
-        lineWidth = textTheme.lineWidth,
-        verticalMode = textTheme.verticalMode,
-        suffixPosition = textTheme.suffixPosition
-      } = attribute,
-      lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf;
-    let {
-      textAlign = textTheme.textAlign,
-      textBaseline = textTheme.textBaseline
-    } = attribute;
-    if (!verticalMode) {
-      const t = textAlign;
-      textAlign = null !== (_b = Text.baselineMapAlign[textBaseline]) && void 0 !== _b ? _b : "left", textBaseline = null !== (_c = Text.alignMapBaseline[t]) && void 0 !== _c ? _c : "top";
-    }
-    if (!this.shouldUpdateShape() && this.cache) {
-      width = this.cache.clipedWidth;
-      const dx = textDrawOffsetX(textAlign, width),
-        dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);
-      return this._AABBBounds.set(dy, dx, dy + lineHeight, dx + width), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
-    }
-    let verticalList = [verticalLayout(text.toString())];
-    if (Number.isFinite(maxLineWidth)) {
-      if (ellipsis) {
-        const strEllipsis = !0 === ellipsis ? textTheme.ellipsis : ellipsis,
-          data = textMeasure.clipTextWithSuffixVertical(verticalList[0], {
-            fontSize: fontSize,
-            fontWeight: fontWeight,
-            fontFamily: fontFamily
-          }, maxLineWidth, strEllipsis, !1, suffixPosition);
-        verticalList = [data.verticalList], width = data.width;
-      } else {
-        const data = textMeasure.clipTextVertical(verticalList[0], {
-          fontSize: fontSize,
-          fontWeight: fontWeight,
-          fontFamily: fontFamily
-        }, maxLineWidth, !1);
-        verticalList = [data.verticalList], width = data.width;
-      }
-      this.cache.verticalList = verticalList, this.cache.clipedWidth = width;
-    } else width = 0, verticalList[0].forEach(t => {
-      const w = t.direction === TextDirection.HORIZONTAL ? fontSize : textMeasure.measureTextWidth(t.text, {
-        fontSize: fontSize,
-        fontWeight: fontWeight,
-        fontFamily: fontFamily
-      });
-      width += w, t.width = w;
-    }), this.cache.verticalList = verticalList, this.cache.clipedWidth = width;
-    this.clearUpdateShapeTag();
-    const dx = textDrawOffsetX(textAlign, width),
-      dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);
-    return this._AABBBounds.set(dy, dx, dy + lineHeight, dx + width), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
-  }
-  updateHorizontalMultilineAABBBounds(text) {
-    var _a, _b;
-    const textTheme = this.getGraphicTheme(),
-      {
-        wrap = textTheme.wrap
-      } = this.attribute;
-    if (wrap) return this.updateWrapAABBBounds(text);
-    const attribute = this.attribute,
-      {
-        fontFamily = textTheme.fontFamily,
-        textAlign = textTheme.textAlign,
-        textBaseline = textTheme.textBaseline,
-        fontSize = textTheme.fontSize,
-        fontWeight = textTheme.fontWeight,
-        ellipsis = textTheme.ellipsis,
-        maxLineWidth: maxLineWidth,
-        stroke = textTheme.stroke,
-        lineWidth = textTheme.lineWidth,
-        whiteSpace = textTheme.whiteSpace,
-        suffixPosition = textTheme.suffixPosition
-      } = attribute,
-      lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : attribute.fontSize || textTheme.fontSize;
-    if ("normal" === whiteSpace) return this.updateWrapAABBBounds(text);
-    if (!this.shouldUpdateShape() && (null === (_b = this.cache) || void 0 === _b ? void 0 : _b.layoutData)) {
-      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,
-      layoutData = new CanvasTextLayout(fontFamily, {
-        fontSize: fontSize,
-        fontWeight: fontWeight,
-        fontFamily: fontFamily
-      }, textMeasure).GetLayoutByLines(text, textAlign, textBaseline, lineHeight, !0 === ellipsis ? textTheme.ellipsis : ellipsis || void 0, !1, maxLineWidth, suffixPosition),
-      {
-        bbox: bbox
-      } = layoutData;
-    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, _c;
+    var _a, _b;
     const textTheme = this.getGraphicTheme(),
       textMeasure = application.graphicUtil.textMeasure;
     let width;
     const attribute = this.attribute,
-      {
-        ignoreBuf = textTheme.ignoreBuf
-      } = attribute,
-      buf = ignoreBuf ? 0 : 2,
       {
         maxLineWidth = textTheme.maxLineWidth,
         ellipsis = textTheme.ellipsis,
@@ -9890,14 +9898,14 @@ class Text extends Graphic {
         verticalMode = textTheme.verticalMode,
         suffixPosition = textTheme.suffixPosition
       } = attribute,
-      lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf;
+      lineHeight = this.getLineHeight(attribute, textTheme);
     let {
       textAlign = textTheme.textAlign,
       textBaseline = textTheme.textBaseline
     } = attribute;
     if (!verticalMode) {
       const t = textAlign;
-      textAlign = null !== (_b = Text.baselineMapAlign[textBaseline]) && void 0 !== _b ? _b : "left", textBaseline = null !== (_c = Text.alignMapBaseline[t]) && void 0 !== _c ? _c : "top";
+      textAlign = null !== (_a = Text.baselineMapAlign[textBaseline]) && void 0 !== _a ? _a : "left", textBaseline = null !== (_b = Text.alignMapBaseline[t]) && void 0 !== _b ? _b : "top";
     }
     if (width = 0, !this.shouldUpdateShape() && this.cache) {
       this.cache.verticalList.forEach(item => {
@@ -9945,6 +9953,15 @@ class Text extends Graphic {
       dy = textLayoutOffsetY(textBaseline, height, fontSize);
     return this._AABBBounds.set(dy, dx, dy + height, dx + width), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
   }
+  getMaxWidth(theme) {
+    var _a, _b;
+    const attribute = this.attribute;
+    return null !== (_b = null !== (_a = attribute.maxLineWidth) && void 0 !== _a ? _a : attribute.maxWidth) && void 0 !== _b ? _b : theme.maxWidth;
+  }
+  getLineHeight(attribute, textTheme) {
+    var _a;
+    return null !== (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : attribute.fontSize || textTheme.fontSize;
+  }
   needUpdateTags(keys) {
     let k = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : TEXT_UPDATE_TAG_KEY;
     return super.needUpdateTags(keys, k);
@@ -9959,6 +9976,12 @@ class Text extends Graphic {
   getNoWorkAnimateAttr() {
     return Text.NOWORK_ANIMATE_ATTR;
   }
+  getBaselineMapAlign() {
+    return Text.baselineMapAlign;
+  }
+  getAlignMapBaseline() {
+    return Text.alignMapBaseline;
+  }
 }
 Text.NOWORK_ANIMATE_ATTR = Object.assign({
   ellipsis: 1,
@@ -10037,7 +10060,9 @@ class WrapText extends Text {
           const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
           linesLayout.push({
             str: clip.str,
-            width: clip.width
+            width: clip.width,
+            ascent: 0,
+            descent: 0
           });
           break;
         }
@@ -10051,7 +10076,9 @@ class WrapText extends Text {
         }
         if (linesLayout.push({
           str: clip.str,
-          width: clip.width
+          width: clip.width,
+          ascent: 0,
+          descent: 0
         }), clip.str.length === str.length) ;else if (needCut) {
           const newStr = str.substring(clip.str.length);
           lines.splice(i + 1, 0, newStr);
@@ -10070,13 +10097,17 @@ class WrapText extends Text {
           const clip = layoutObj.textMeasure.clipTextWithSuffix(lines[i], layoutObj.textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
           linesLayout.push({
             str: clip.str,
-            width: clip.width
+            width: clip.width,
+            ascent: 0,
+            descent: 0
           }), lineWidth = Math.max(lineWidth, clip.width);
           break;
         }
         text = lines[i], width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions, "break-word" === wordBreak), lineWidth = Math.max(lineWidth, width), linesLayout.push({
           str: text,
-          width: width
+          width: width,
+          ascent: 0,
+          descent: 0
         });
       }
       bboxWH[0] = lineWidth;
@@ -12925,27 +12956,9 @@ function simplifyRadialDist(points, sqTolerance) {
   for (let i = 1, len = points.length; i < len; i++) deltaX = points[i].x - lastX, deltaY = points[i].y - lastY, deltaX * deltaX + deltaY * deltaY > sqTolerance && (lastX = points[i].x, lastY = points[i].y, newPoints.push(points[i]));
   return points[points.length - 1].x === lastX && points[points.length - 1].y === lastY || newPoints.push(points[points.length - 1]), newPoints;
 }
-function simplifyDPStep(points, startIdx, endIdx, sqTolerance, simplified) {
-  let maxSqDist = sqTolerance,
-    nextIdx = startIdx;
-  const startX = points[startIdx].x,
-    startY = points[startIdx].y,
-    vecX2 = points[endIdx].x - startX,
-    vecY2 = points[endIdx].y - startY,
-    sqLength = vecX2 * vecX2 + vecY2 * vecY2;
-  let area, sqArea, sqDistance, vecX1, vecY1;
-  for (let i = startIdx + 1, len = endIdx - 1; i < len; i++) vecX1 = points[i].x - startX, vecY1 = points[i].y - startY, area = vecX1 * vecY2 - vecX2 * vecY1, sqArea = area * area, sqDistance = sqArea / sqLength, sqDistance > maxSqDist && (maxSqDist = sqDistance, nextIdx = i);
-  maxSqDist > sqTolerance && (nextIdx - startIdx > 2 && simplifyDPStep(points, startIdx, nextIdx, sqTolerance, simplified), simplified.push(points[nextIdx], points[nextIdx + 1]), endIdx - nextIdx > 2 && simplifyDPStep(points, nextIdx, endIdx, sqTolerance, simplified));
-}
-function simplifyDouglasPeucker(points, sqTolerance) {
-  const lastIdx = points.length - 1,
-    simplified = [points[0]];
-  return simplifyDPStep(points, 0, lastIdx, sqTolerance, simplified), simplified.push(points[lastIdx]), simplified;
-}
 function flatten_simplify(points, tolerance, highestQuality) {
   if (points.length <= 10) return points;
-  const sqTolerance = void 0 !== tolerance ? tolerance * tolerance : 1;
-  return points = simplifyDouglasPeucker(points = highestQuality ? points : simplifyRadialDist(points, sqTolerance), sqTolerance);
+  return points = highestQuality ? points : simplifyRadialDist(points, void 0 !== tolerance ? tolerance * tolerance : 1);
 }
 
 let loadArcModule = !1;
@@ -13903,10 +13916,8 @@ let DefaultCanvasTextPicker = class extends Base3dPicker {
         } = text.attribute,
         bounds = text.AABBBounds,
         height = bounds.height(),
-        width = bounds.width(),
-        offsetY = textLayoutOffsetY(textBaseline, height, fontSize),
-        offsetX = textDrawOffsetX(textAlign, width);
-      return context.rect(offsetX + x, offsetY + y, width, height, z), picked = context.isPointInPath(pickPoint.x, pickPoint.y), picked;
+        width = bounds.width();
+      return context.rect(bounds.x1, bounds.y1, width, height, z), picked = context.isPointInPath(pickPoint.x, pickPoint.y), picked;
     }, (context, symbolAttribute, themeAttribute) => picked), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && mat4Allocate.free(pickContext.modelMatrix), pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), picked;
   }
 };
@@ -15807,19 +15818,22 @@ function bitmapTool(width, height, padding = { top: 0, left: 0, right: 0, bottom
     scale.height = height;
     return scale;
 }
-function boundToRange($, bound, clamp$1 = false) {
-    if (clamp$1) {
-        const { x1, x2, y1, y2 } = bound;
-        const _x1 = clamp(x1, 0, $.width);
-        const _x2 = clamp(x2, 0, $.width);
-        const _y1 = clamp(y1, 0, $.height);
-        const _y2 = clamp(y2, 0, $.height);
-        return {
-            x1: $.x(_x1),
-            x2: $.x(_x2),
-            y1: $.y(_y1),
-            y2: $.y(_y2)
-        };
+function clampRangeByBitmap($, range) {
+    const { x1, x2, y1, y2 } = range;
+    const _x1 = clamp(x1, 0, $.width);
+    const _x2 = clamp(x2, 0, $.width);
+    const _y1 = clamp(y1, 0, $.height);
+    const _y2 = clamp(y2, 0, $.height);
+    return {
+        x1: $.x(_x1),
+        x2: $.x(_x2),
+        y1: $.y(_y1),
+        y2: $.y(_y2)
+    };
+}
+function boundToRange($, bound, clamp = false) {
+    if (clamp) {
+        return clampRangeByBitmap($, bound);
     }
     return {
         x1: $.x(bound.x1),
@@ -15840,10 +15854,13 @@ function canPlace($, bitmap, bound, checkBound = true, pad = 0) {
         };
     }
     range = boundToRange($, range);
-    const outOfBounds = checkBound && bitmap.outOfBounds(range);
-    if (outOfBounds) {
+    const outOfBounds = bitmap.outOfBounds(range);
+    if (checkBound && outOfBounds) {
         return false;
     }
+    if (outOfBounds) {
+        range = clampRangeByBitmap($, range);
+    }
     return !bitmap.getRange(range);
 }
 function placeToCandidates($, bitmap, text, candidates = [], clampForce = true, pad = 0) {
@@ -16224,6 +16241,71 @@ function loadLabelComponent() {
     registerLine();
 }
 
+function shiftY(texts, option = {}) {
+    const { maxIterations = 10, maxError = 0.1, padding = 1, maxY = Number.MAX_VALUE } = option;
+    const n = texts.length;
+    if (n <= 1) {
+        return texts;
+    }
+    const isIntersect = ([a, b], [c, d]) => {
+        return d > a && b > c;
+    };
+    const textInformation = new Map();
+    const getY0 = (text) => textInformation.get(text).y0;
+    const getY = (text) => textInformation.get(text).y;
+    const getHeight = (text) => textInformation.get(text).height;
+    const getX1 = (text) => textInformation.get(text).x1;
+    const getX2 = (text) => textInformation.get(text).x2;
+    const setY = (text, y) => {
+        textInformation.get(text).y = y;
+    };
+    for (const text of texts) {
+        const { y1, y2, x1, x2 } = text.AABBBounds;
+        textInformation.set(text, { y0: y1, y: y1, height: y2 - y1, x1, x2 });
+    }
+    for (let iter = 0; iter < maxIterations; iter++) {
+        texts.sort((a, b) => getY(a) - getY(b));
+        let error = 0;
+        for (let i = 0; i < n - 1; i++) {
+            const curText = texts[i];
+            let j = i + 1;
+            let nextText;
+            while ((nextText = texts[j]) &&
+                !isIntersect([getX1(curText), getX2(curText)], [getX1(nextText), getX2(nextText)])) {
+                j += 1;
+            }
+            if (nextText) {
+                const y0 = getY(curText);
+                const h0 = getHeight(curText);
+                const y1 = getY(nextText);
+                const delta = y1 - (y0 + h0);
+                if (delta < padding) {
+                    const newDelta = (padding - delta) / 2;
+                    error = Math.max(error, newDelta);
+                    if (y1 + newDelta + getHeight(nextText) > maxY) {
+                        setY(curText, y0 - (padding - delta));
+                    }
+                    else if (y0 - newDelta < 0) {
+                        setY(nextText, y1 + (padding - delta));
+                    }
+                    else {
+                        setY(curText, y0 - newDelta);
+                        setY(nextText, y1 + newDelta);
+                    }
+                }
+            }
+        }
+        if (error < maxError) {
+            break;
+        }
+    }
+    for (const text of texts) {
+        const finalY = text.attribute.y + getY(text) - getY0(text);
+        text.setAttribute('y', finalY);
+    }
+    return texts;
+}
+
 loadLabelComponent();
 class LabelBase extends AbstractComponent {
     setBitmap(bitmap) {
@@ -16537,12 +16619,11 @@ class LabelBase extends AbstractComponent {
         return texts;
     }
     _overlapping(labels) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (labels.length === 0) {
             return [];
         }
         const option = (isObject(this.attribute.overlap) ? this.attribute.overlap : {});
-        const result = [];
         const baseMarkGroup = this.getBaseMarkGroup();
         const size = (_a = option.size) !== null && _a !== void 0 ? _a : {
             width: (_b = baseMarkGroup === null || baseMarkGroup === void 0 ? void 0 : baseMarkGroup.AABBBounds.width()) !== null && _b !== void 0 ? _b : 0,
@@ -16551,12 +16632,55 @@ class LabelBase extends AbstractComponent {
         if (size.width === 0 || size.height === 0) {
             return labels;
         }
-        const { avoidBaseMark, strategy = [], hideOnHit = true, clampForce = true, avoidMarks = [], overlapPadding } = option;
+        const { strategy, priority } = option;
         const bmpTool = this._bmpTool || bitmapTool(size.width, size.height);
         const bitmap = this._bitmap || bmpTool.bitmap();
+        if (priority) {
+            labels = labels.sort((a, b) => priority(b.attribute.data) - priority(a.attribute.data));
+        }
+        if ((strategy === null || strategy === void 0 ? void 0 : strategy.type) === 'shiftY') {
+            return this._overlapGlobal(labels, option, bmpTool, bitmap);
+        }
+        return this._overlapByStrategy(labels, option, bmpTool, bitmap);
+    }
+    _overlapGlobal(labels, option, bmpTool, bitmap) {
+        let result = labels.filter(label => label.attribute.visible && label.attribute.opacity !== 0);
+        const { clampForce = true, hideOnHit = true, overlapPadding, strategy } = option;
+        if (clampForce) {
+            for (let i = 0; i < result.length; i++) {
+                const text = labels[i];
+                const { dx = 0, dy = 0 } = clampText(text, bmpTool.width, bmpTool.height);
+                if (dx !== 0 || dy !== 0) {
+                    text.setAttributes({ x: text.attribute.x + dx, y: text.attribute.y + dy });
+                }
+            }
+        }
+        result = shiftY(result, Object.assign({ maxY: bmpTool.height }, strategy));
+        for (let i = 0; i < result.length; i++) {
+            const text = result[i];
+            const bounds = text.AABBBounds;
+            const range = boundToRange(bmpTool, bounds, true);
+            if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) {
+                bitmap.setRange(range);
+            }
+            else {
+                if (hideOnHit) {
+                    text.setAttributes({ visible: false });
+                }
+                else {
+                    bitmap.setRange(range);
+                }
+            }
+        }
+        return result;
+    }
+    _overlapByStrategy(labels, option, bmpTool, bitmap) {
+        var _a;
+        const { avoidBaseMark, strategy = [], hideOnHit = true, clampForce = true, avoidMarks = [], overlapPadding } = option;
+        const result = [];
         const checkBounds = strategy.some(s => s.type === 'bound');
         if (avoidBaseMark) {
-            (_d = this._baseMarks) === null || _d === void 0 ? void 0 : _d.forEach(mark => {
+            (_a = this._baseMarks) === null || _a === void 0 ? void 0 : _a.forEach(mark => {
                 mark.AABBBounds && bitmap.setRange(boundToRange(bmpTool, mark.AABBBounds, true));
             });
         }
@@ -16573,7 +16697,7 @@ class LabelBase extends AbstractComponent {
             });
         }
         for (let i = 0; i < labels.length; i++) {
-            if (labels[i].visible === false) {
+            if (labels[i].attribute.visible === false) {
                 continue;
             }
             const text = labels[i];
@@ -16840,7 +16964,7 @@ class LabelBase extends AbstractComponent {
         return listener;
     }
     _smartInvert(labels) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         const option = (isObject(this.attribute.smartInvert) ? this.attribute.smartInvert : {});
         const { textType, contrastRatiosThreshold, alternativeColors, mode, interactInvertType } = option;
         const fillStrategy = (_a = option.fillStrategy) !== null && _a !== void 0 ? _a : 'invertBase';
@@ -16857,8 +16981,15 @@ class LabelBase extends AbstractComponent {
                 continue;
             }
             const baseMark = this.getRelatedGraphic(label.attribute);
-            const backgroundColor = baseMark.attribute.fill;
-            const foregroundColor = label.attribute.fill;
+            let backgroundColor = baseMark.attribute.fill;
+            let foregroundColor = label.attribute.fill;
+            if (isObject(backgroundColor) && backgroundColor.gradient) {
+                const firstStopColor = (_g = (_f = backgroundColor.stops) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.color;
+                if (firstStopColor) {
+                    backgroundColor = firstStopColor;
+                    foregroundColor = firstStopColor;
+                }
+            }
             const invertColor = labelSmartInvert(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, alternativeColors, mode);
             const similarColor = contrastAccessibilityChecker(invertColor, brightColor) ? brightColor : darkColor;
             const isInside = this._canPlaceInside(label.AABBBounds, baseMark.AABBBounds);
@@ -18902,12 +19033,14 @@ function autoHide(labels, config) {
         do {
             items = reduce(items, sep);
         } while (items.length >= 3 && hasOverlap(items, sep));
-        const shouldCheck = (length, visibility) => length < 3 || visibility;
-        const checkFirst = shouldCheck(items.length, config.firstVisible);
+        const shouldCheck = (length, visibility, checkLength = true) => {
+            return checkLength ? length < 3 || visibility : visibility;
+        };
+        const checkFirst = shouldCheck(items.length, config.firstVisible, false);
         let checkLast = shouldCheck(items.length, config.lastVisible);
         const firstSourceItem = source[0];
         const lastSourceItem = last(source);
-        if (textIntersect(firstSourceItem, lastSourceItem, sep)) {
+        if (textIntersect(firstSourceItem, lastSourceItem, sep) && checkFirst && checkLast) {
             lastSourceItem.setAttribute('opacity', 0);
             checkLast = false;
         }
@@ -19105,15 +19238,24 @@ function autoLimit(labels, config) {
         return;
     }
     const overflowLimitLength = normalizeOverflowLimitLength(config.overflowLimitLength);
+    const firstLabel = labels[0];
+    const angle = firstLabel.attribute.angle;
+    const hasAngle = !isNil(angle);
+    const cos = hasAngle ? Math.cos(angle) : 1;
+    const sin = hasAngle ? Math.sin(angle) : 0;
+    const isHorizontal = isAngleHorizontal(angle);
+    const isVertical = isAngleVertical(angle);
+    const isX = orient === 'top' || orient === 'bottom';
+    const direction = firstLabel.attribute.direction;
+    const THRESHOLD = 2;
+    const checkBox = !isHorizontal &&
+        !isVertical &&
+        isX &&
+        (labels.length < 2 ||
+            labels.some(label => Math.abs(label.AABBBounds.width() - firstLabel.AABBBounds.width()) >= THRESHOLD)) &&
+        firstLabel.AABBBounds.width() > Math.abs(limitLength / sin);
     labels.forEach(label => {
         var _a;
-        const angle = label.attribute.angle;
-        const hasAngle = !isNil(angle);
-        const cos = hasAngle ? Math.cos(angle) : 1;
-        const sin = hasAngle ? Math.sin(angle) : 0;
-        const isHorizontal = isAngleHorizontal(angle);
-        const isVertical = isAngleVertical(angle);
-        const isX = orient === 'top' || orient === 'bottom';
         if (isX) {
             if (isVertical && Math.floor(label.AABBBounds.height()) <= limitLength) {
                 return;
@@ -19122,7 +19264,6 @@ function autoLimit(labels, config) {
                 return;
             }
         }
-        const direction = label.attribute.direction;
         if (!isX) {
             if (direction === 'vertical' && Math.floor(label.AABBBounds.height()) <= verticalLimitLength) {
                 return;
@@ -19142,12 +19283,18 @@ function autoLimit(labels, config) {
                 const { x1, x2 } = label.AABBBounds;
                 const tan = sin / cos;
                 const verticalSizeLimit = Math.abs(limitLength / sin);
-                if (tan > 0 && x1 <= axisLength && limitLength / tan + x1 > axisLength) {
-                    const lengthLimit = (axisLength - x1) / Math.abs(cos) + overflowLimitLength.right;
+                if (checkBox &&
+                    tan > 0 &&
+                    x1 <= axisLength + overflowLimitLength.right &&
+                    limitLength / tan + x1 > axisLength + overflowLimitLength.right) {
+                    const lengthLimit = (axisLength - x1 + overflowLimitLength.right) / Math.abs(cos);
                     limitLabelLength = Math.min(lengthLimit, verticalSizeLimit);
                 }
-                else if (tan < 0 && x2 >= 0 && limitLength / tan + x2 < 0) {
-                    const lengthLimit = x2 / Math.abs(cos) + overflowLimitLength.left;
+                else if (checkBox &&
+                    tan < 0 &&
+                    x2 >= -overflowLimitLength.left &&
+                    limitLength / tan + x2 < -overflowLimitLength.left) {
+                    const lengthLimit = (x2 + overflowLimitLength.left) / Math.abs(cos);
                     limitLabelLength = Math.min(lengthLimit, verticalSizeLimit);
                 }
                 else {
@@ -19181,24 +19328,37 @@ function autoWrap(labels, config) {
     if (isEmpty(labels) || !isValidNumber(limitLength)) {
         return;
     }
-    const verticalLimitLength = axisLength / labels.length;
-    labels.forEach(label => {
-        var _a;
-        const angle = label.attribute.angle;
-        const isHorizontal = isAngleHorizontal(angle);
-        const isVertical = isAngleVertical(angle);
-        const isX = orient === 'top' || orient === 'bottom';
+    const firstLabel = labels[0];
+    const angle = firstLabel.attribute.angle;
+    const isHorizontal = isAngleHorizontal(angle);
+    const isVertical = isAngleVertical(angle);
+    const isX = orient === 'top' || orient === 'bottom';
+    let verticalLimitLength = axisLength / labels.length;
+    labels.forEach((label, index) => {
+        var _a, _b, _c, _d, _e;
         if (isX) {
             if (isVertical && Math.floor(label.AABBBounds.height()) <= limitLength) {
                 return;
             }
-            if (isHorizontal && Math.floor(label.AABBBounds.width()) <= verticalLimitLength) {
-                return;
+            if (isHorizontal) {
+                const curLabelX = label.attribute.x;
+                const nextLabelX = (_a = labels[index + 1]) === null || _a === void 0 ? void 0 : _a.attribute.x;
+                const lastLabelX = (_b = labels[index - 1]) === null || _b === void 0 ? void 0 : _b.attribute.x;
+                const minGap = getLabelMinGap(curLabelX, nextLabelX, lastLabelX);
+                if (isValidNumber(minGap)) {
+                    verticalLimitLength = min(verticalLimitLength, minGap);
+                }
             }
         }
         else {
-            if (isVertical && Math.floor(label.AABBBounds.height()) <= verticalLimitLength) {
-                return;
+            if (isVertical) {
+                const curLabelY = label.attribute.y;
+                const nextLabelY = (_c = labels[index + 1]) === null || _c === void 0 ? void 0 : _c.attribute.y;
+                const lastLabelY = (_d = labels[index - 1]) === null || _d === void 0 ? void 0 : _d.attribute.y;
+                const minGap = getLabelMinGap(curLabelY, nextLabelY, lastLabelY);
+                if (isValidNumber(minGap)) {
+                    verticalLimitLength = min(verticalLimitLength, minGap);
+                }
             }
             if (isHorizontal && Math.floor(label.AABBBounds.width()) <= limitLength) {
                 return;
@@ -19228,12 +19388,27 @@ function autoWrap(labels, config) {
         }
         label.setAttributes({
             maxLineWidth: limitLabelLength,
-            ellipsis: (_a = label.attribute.ellipsis) !== null && _a !== void 0 ? _a : ellipsis,
+            ellipsis: (_e = label.attribute.ellipsis) !== null && _e !== void 0 ? _e : ellipsis,
             whiteSpace: 'normal',
             heightLimit
         });
     });
 }
+function getLabelMinGap(current, next, prev) {
+    let minGap;
+    if (isValidNumber(next)) {
+        minGap = Math.abs(next - current);
+    }
+    if (isValidNumber(prev)) {
+        if (isValidNumber(minGap)) {
+            minGap = Math.min(Math.abs(current - prev), minGap);
+        }
+        else {
+            minGap = Math.abs(current - prev);
+        }
+    }
+    return minGap;
+}
 
 function alignAxisLabels(labels, start, containerSize, orient, align) {
     if (orient === 'left' || orient === 'right') {
@@ -20056,13 +20231,13 @@ class CircleAxis extends AxisBase {
         if (isEmpty(labelShapes)) {
             return;
         }
-        const { inside, radius, center, width, height, label, orient } = this.attribute;
-        const bounds = width && height
+        const { inside, radius, center, size, label, orient } = this.attribute;
+        const bounds = size
             ? {
                 x1: 0,
                 y1: 0,
-                x2: width,
-                y2: height
+                x2: size.width,
+                y2: size.height
             }
             : {
                 x1: center.x - radius,
@@ -20430,11 +20605,10 @@ const continuousTicks = (scale, op) => {
             while (items.length >= 3 && hasOverlap(items, labelGap)) {
                 items = samplingMethod(items, labelGap);
             }
-            const shouldCheck = (length, visibility) => length < 3 || visibility;
-            const checkFirst = shouldCheck(items.length, op.labelFirstVisible);
-            let checkLast = shouldCheck(items.length, op.labelLastVisible);
+            const checkFirst = op.labelFirstVisible;
+            let checkLast = op.labelLastVisible;
             if (textIntersect(firstSourceItem, lastSourceItem, labelGap)) {
-                if (items.includes(lastSourceItem) && items.length > 1) {
+                if (items.includes(lastSourceItem) && items.length > 1 && checkFirst && checkLast) {
                     items.splice(items.indexOf(lastSourceItem), 1);
                     checkLast = false;
                 }
@@ -24171,10 +24345,10 @@ class LegendBase extends AbstractComponent {
     render() {
         this.removeAllChild(true);
         const { interactive = true, title, padding = 0 } = this.attribute;
-        const parsedPadding = normalizePadding(padding);
+        this._parsedPadding = normalizePadding(padding);
         const innerView = graphicCreator.group({
-            x: parsedPadding[3],
-            y: parsedPadding[0],
+            x: this._parsedPadding[3],
+            y: this._parsedPadding[0],
             pickable: interactive,
             childrenPickable: interactive
         });
@@ -24190,8 +24364,8 @@ class LegendBase extends AbstractComponent {
             this._bindEvents();
         }
         const viewBounds = this._innerView.AABBBounds;
-        this.attribute.width = viewBounds.width() + parsedPadding[1] + parsedPadding[3];
-        this.attribute.height = viewBounds.height() + parsedPadding[0] + parsedPadding[2];
+        this.attribute.width = viewBounds.width() + this._parsedPadding[1] + this._parsedPadding[3];
+        this.attribute.height = viewBounds.height() + this._parsedPadding[0] + this._parsedPadding[2];
     }
     _renderTitle(title) {
         const { text = '', textStyle, padding = 0, background, minWidth, maxWidth, shape } = title;
@@ -24276,6 +24450,7 @@ class DiscreteLegend extends LegendBase {
         this._itemHeightByUser = undefined;
         this._itemHeight = 0;
         this._itemMaxWidth = 0;
+        this._contentMaxHeight = 0;
         this._onHover = (e) => {
             const target = e.target;
             if (target && target.name && target.name.startsWith(LEGEND_ELEMENT_NAME.item)) {
@@ -24380,11 +24555,12 @@ class DiscreteLegend extends LegendBase {
         });
     }
     _renderItems() {
-        const { item: itemAttrs = {}, maxCol = 1, maxRow = 2, maxWidth, maxHeight, defaultSelected, lazyload, autoPage } = this.attribute;
+        const { item: itemAttrs = {}, maxCol = 1, maxRow = 2, maxWidth, defaultSelected, lazyload, autoPage } = this.attribute;
         const { spaceCol = DEFAULT_ITEM_SPACE_COL, spaceRow = DEFAULT_ITEM_SPACE_ROW } = itemAttrs;
         const itemsContainer = this._itemsContainer;
         const { items: legendItems, isHorizontal, startIndex, isScrollbar } = this._itemContext;
         const maxPages = isScrollbar ? 1 : isHorizontal ? maxRow : maxCol;
+        const maxHeight = this._contentMaxHeight;
         let { doWrap, maxWidthInCol, startX, startY, pages } = this._itemContext;
         let item;
         let lastItemWidth = 0;
@@ -24481,7 +24657,7 @@ class DiscreteLegend extends LegendBase {
         return this._itemContext;
     }
     _renderContent() {
-        const { item = {}, items, reversed, maxWidth } = this.attribute;
+        const { item = {}, items, reversed, maxWidth, maxHeight } = this.attribute;
         if (item.visible === false || isEmpty(items)) {
             return;
         }
@@ -24489,6 +24665,7 @@ class DiscreteLegend extends LegendBase {
         if (reversed) {
             legendItems = items === null || items === void 0 ? void 0 : items.reverse();
         }
+        this._contentMaxHeight = Math.max(0, maxHeight - this._parsedPadding[0] - this._parsedPadding[2]);
         const itemsContainer = graphicCreator.group({
             x: 0,
             y: 0
@@ -24526,7 +24703,8 @@ class DiscreteLegend extends LegendBase {
             items: legendItems,
             isHorizontal,
             totalPage: Infinity,
-            isScrollbar: pager && pager.type === 'scrollbar'
+            isScrollbar: pager && pager.type === 'scrollbar',
+            clipContainer: undefined
         };
         this._itemContext = this._renderItems();
         let pagerRendered = false;
@@ -24547,11 +24725,21 @@ class DiscreteLegend extends LegendBase {
         }
         const { hover = true, select = true } = this.attribute;
         if (hover) {
-            this._itemsContainer.addEventListener('pointermove', this._onHover);
-            this._itemsContainer.addEventListener('pointerleave', this._onUnHover);
+            let trigger = 'pointermove';
+            let triggerOff = 'pointerleave';
+            if (isObject(hover)) {
+                hover.trigger && (trigger = hover.trigger);
+                hover.triggerOff && (triggerOff = hover.triggerOff);
+            }
+            this._itemsContainer.addEventListener(trigger, this._onHover);
+            this._itemsContainer.addEventListener(triggerOff, this._onUnHover);
         }
         if (select) {
-            this._itemsContainer.addEventListener('pointerdown', this._onClick);
+            let trigger = 'pointerdown';
+            if (isObject(select) && select.trigger) {
+                trigger = select.trigger;
+            }
+            this._itemsContainer.addEventListener(trigger, this._onClick);
         }
     }
     _autoEllipsis(autoEllipsisStrategy, layoutWidth, labelShape, valueShape) {
@@ -24756,8 +24944,8 @@ class DiscreteLegend extends LegendBase {
     _createScrollbar(compStyle, compSize) {
         const { disableTriggerEvent } = this.attribute;
         return this._itemContext.isHorizontal
-            ? new ScrollBar(Object.assign(Object.assign({ direction: 'horizontal', disableTriggerEvent, range: [0, 0.5], height: 12 }, compStyle), { width: compSize }))
-            : new ScrollBar(Object.assign(Object.assign({ direction: 'vertical', width: 12, range: [0, 0.5] }, compStyle), { height: compSize, disableTriggerEvent }));
+            ? new ScrollBar(Object.assign(Object.assign({ direction: 'horizontal', disableTriggerEvent, range: [0, 0.5], height: compStyle.visible === false ? 0 : 12 }, compStyle), { width: compSize }))
+            : new ScrollBar(Object.assign(Object.assign({ direction: 'vertical', width: compStyle.visible === false ? 0 : 12, range: [0, 0.5] }, compStyle), { height: compSize, disableTriggerEvent }));
     }
     _updatePositionOfPager(renderStartY, compWidth, compHeight) {
         const { pager } = this.attribute;
@@ -24797,9 +24985,26 @@ class DiscreteLegend extends LegendBase {
             });
         }
     }
+    _computeScrollbarDelta() {
+        const { isHorizontal, clipContainer } = this._itemContext;
+        const itemContainerBounds = this._itemsContainer.AABBBounds;
+        const clipContainerBounds = clipContainer.AABBBounds;
+        let delta;
+        let innerViewSize;
+        if (isHorizontal) {
+            innerViewSize = clipContainerBounds.width();
+            delta = innerViewSize / itemContainerBounds.width();
+        }
+        else {
+            innerViewSize = clipContainerBounds.height();
+            delta = innerViewSize / itemContainerBounds.height();
+        }
+        return delta;
+    }
     _updatePositionOfScrollbar(contentWidth, contentHeight, renderStartY) {
-        const { currentPage, totalPage, isHorizontal } = this._itemContext;
-        this._pagerComponent.setScrollRange([(currentPage - 1) / totalPage, currentPage / totalPage]);
+        const { isHorizontal, currentPage, totalPage } = this._itemContext;
+        const start = (currentPage - 1) / totalPage;
+        this._pagerComponent.setScrollRange([start, start + this._computeScrollbarDelta()]);
         if (isHorizontal) {
             this._pagerComponent.setAttributes({
                 x: 0,
@@ -24827,13 +25032,7 @@ class DiscreteLegend extends LegendBase {
                     newPage = this._itemContext.totalPage;
                 }
                 else {
-                    newPage = value[0] * this._itemContext.totalPage;
-                    if (pager.scrollByPosition) {
-                        newPage = newPage + 1;
-                    }
-                    else {
-                        newPage = Math.floor(newPage) + 1;
-                    }
+                    newPage = value[0] * this._itemContext.totalPage + 1;
                 }
                 return newPage;
             }
@@ -24847,6 +25046,7 @@ class DiscreteLegend extends LegendBase {
             const { width, height } = scrollComponent.getSliderRenderBounds();
             const currentScrollValue = direction === 'vertical' ? e.deltaY / height : e.deltaX / width;
             scrollComponent.setScrollRange([preScrollRange[0] + currentScrollValue, preScrollRange[1] + currentScrollValue], true);
+            this.updateScrollMask();
         };
         const onPaging = (e) => {
             const newPage = pageParser(e);
@@ -24858,15 +25058,39 @@ class DiscreteLegend extends LegendBase {
                 this._renderItems();
                 const newTotalPage = Math.ceil(this._itemContext.pages / this._itemContext.maxPages);
                 this._itemContext.totalPage = newTotalPage;
-                this._pagerComponent.setScrollRange([(newPage - 1) / newTotalPage, newPage / newTotalPage]);
+                if (this._itemContext.isScrollbar && this._pagerComponent) {
+                    const newDelta = this._computeScrollbarDelta();
+                    const [start] = this._pagerComponent.getScrollRange();
+                    this._pagerComponent.setScrollRange([start, start + newDelta]);
+                }
             }
-            if (animation) {
-                this._itemsContainer
-                    .animate()
-                    .to({ [channel]: -(newPage - 1) * pageSize }, animationDuration, animationEasing);
+            if (!this._itemContext.isScrollbar) {
+                if (animation) {
+                    this._itemsContainer
+                        .animate()
+                        .to({ [channel]: -(newPage - 1) * pageSize }, animationDuration, animationEasing);
+                }
+                else {
+                    this._itemsContainer.setAttribute(channel, -(newPage - 1) * pageSize);
+                }
             }
             else {
-                this._itemsContainer.setAttribute(channel, -(newPage - 1) * pageSize);
+                const [start] = this._pagerComponent.getScrollRange();
+                let containerSize;
+                if (this._itemContext.isHorizontal) {
+                    containerSize = this._itemsContainer.AABBBounds.width();
+                }
+                else {
+                    containerSize = this._itemsContainer.AABBBounds.height();
+                }
+                const startOffset = containerSize * start;
+                this.updateScrollMask();
+                if (animation) {
+                    this._itemsContainer.animate().to({ [channel]: -startOffset }, animationDuration, animationEasing);
+                }
+                else {
+                    this._itemsContainer.setAttribute(channel, -startOffset);
+                }
             }
         };
         if (this._itemContext.isScrollbar) {
@@ -24885,11 +25109,12 @@ class DiscreteLegend extends LegendBase {
     }
     _renderPager() {
         const renderStartY = this._title ? this._title.AABBBounds.height() + get(this.attribute, 'title.space', 8) : 0;
-        const { maxWidth, maxHeight, maxCol = 1, maxRow = 2, item = {}, pager = {} } = this.attribute;
+        const { maxWidth, maxCol = 1, maxRow = 2, item = {}, pager = {} } = this.attribute;
         const { spaceCol = DEFAULT_ITEM_SPACE_COL, spaceRow = DEFAULT_ITEM_SPACE_ROW } = item;
         const itemsContainer = this._itemsContainer;
         const { space: pagerSpace = DEFAULT_PAGER_SPACE, defaultCurrent = 1 } = pager, compStyle = __rest(pager, ["space", "defaultCurrent"]);
         const { isHorizontal } = this._itemContext;
+        const maxHeight = this._contentMaxHeight;
         let comp;
         let compWidth = 0;
         let compHeight = 0;
@@ -24980,57 +25205,76 @@ class DiscreteLegend extends LegendBase {
         });
         clipGroup.add(itemsContainer);
         this._innerView.add(clipGroup);
+        this._itemContext.clipContainer = clipGroup;
         this._bindEventsOfPager(isHorizontal ? compHeight + spaceRow : compWidth + spaceCol, isHorizontal ? 'y' : 'x');
         return true;
     }
     _renderScrollbar() {
+        var _a;
         const renderStartY = this._title ? this._title.AABBBounds.height() + get(this.attribute, 'title.space', 8) : 0;
-        const { maxWidth, maxHeight, item = {}, pager = {} } = this.attribute;
+        const { maxWidth, item = {}, pager = {} } = this.attribute;
         const { spaceCol = DEFAULT_ITEM_SPACE_COL, spaceRow = DEFAULT_ITEM_SPACE_ROW } = item;
         const itemsContainer = this._itemsContainer;
         const { space: pagerSpace = DEFAULT_PAGER_SPACE, defaultCurrent = 1 } = pager, compStyle = __rest(pager, ["space", "defaultCurrent"]);
         const { isHorizontal } = this._itemContext;
+        const maxHeight = this._contentMaxHeight;
         let comp;
-        let compSize = 0;
         let contentWidth = 0;
         let contentHeight = 0;
         let startY = 0;
         let pages = 1;
         if (isHorizontal) {
-            compSize = maxWidth;
             contentWidth = maxWidth;
             contentHeight = this._itemHeight;
-            comp = this._createScrollbar(compStyle, compSize);
+            comp = this._createScrollbar(compStyle, contentWidth);
             this._pagerComponent = comp;
             this._innerView.add(comp);
-            this._updatePositionOfScrollbar(contentWidth, contentHeight, renderStartY);
         }
         else {
-            compSize = maxHeight;
-            comp = this._createScrollbar(compStyle, compSize);
-            this._pagerComponent = comp;
-            this._innerView.add(comp);
             contentHeight = maxHeight - renderStartY;
             contentWidth = this._itemMaxWidth;
+            comp = this._createScrollbar(compStyle, contentHeight);
+            this._pagerComponent = comp;
+            this._innerView.add(comp);
             if (contentHeight <= 0) {
                 this._innerView.removeChild(comp);
                 return false;
             }
-            itemsContainer.getChildren().forEach((item, index) => {
-                const { height } = item.attribute;
-                pages = Math.floor((startY + height) / contentHeight) + 1;
-                startY += spaceRow + height;
-            });
+            const items = itemsContainer.getChildren();
+            const itemsHeightArr = items.map((item) => item.attribute.height);
+            if (itemsHeightArr.length === 1 || itemsHeightArr.every(entry => entry === itemsHeightArr[0])) {
+                const itemHeight = itemsHeightArr[0];
+                const maxContentHeight = contentHeight;
+                const pageItemsCount = Math.floor(maxContentHeight / (spaceRow + itemHeight));
+                contentHeight = pageItemsCount * (spaceRow + itemHeight);
+                pages = Math.ceil(items.length / pageItemsCount);
+            }
+            else {
+                items.forEach((item, index) => {
+                    const { height } = item.attribute;
+                    const prePages = pages;
+                    const preStartY = startY;
+                    pages = Math.floor((startY + height) / contentHeight) + 1;
+                    startY += spaceRow + height;
+                    if (prePages !== pages &&
+                        index === itemsContainer.getChildren().length - 1 &&
+                        startY - contentHeight >= (1 / 3) * height) {
+                        contentHeight = preStartY + height;
+                        pages -= 1;
+                    }
+                });
+            }
             this._itemContext.totalPage = pages;
             this._itemContext.pages = pages;
-            this._updatePositionOfScrollbar(contentWidth, contentHeight, renderStartY);
         }
         if (defaultCurrent > 1) {
             if (isHorizontal) {
-                itemsContainer.setAttribute('x', -(defaultCurrent - 1) * (contentWidth + spaceCol));
+                const maxOffset = this._itemsContainer.AABBBounds.width() - contentWidth;
+                itemsContainer.setAttribute('x', -Math.min((defaultCurrent - 1) * (contentWidth + spaceCol), maxOffset));
             }
             else {
-                itemsContainer.setAttribute('y', -(defaultCurrent - 1) * (contentHeight + spaceRow));
+                const maxOffset = this._itemsContainer.AABBBounds.height() - contentHeight;
+                itemsContainer.setAttribute('y', -Math.min((defaultCurrent - 1) * (contentHeight + spaceRow), maxOffset));
             }
         }
         const clipGroup = graphicCreator.group({
@@ -25043,9 +25287,89 @@ class DiscreteLegend extends LegendBase {
         });
         clipGroup.add(itemsContainer);
         this._innerView.add(clipGroup);
+        this._itemContext.clipContainer = clipGroup;
+        this._updatePositionOfScrollbar(contentWidth, contentHeight, renderStartY);
+        if ((_a = pager.scrollMask) === null || _a === void 0 ? void 0 : _a.visible) {
+            this.renderScrollMask(clipGroup);
+        }
         this._bindEventsOfPager(isHorizontal ? contentWidth : contentHeight, isHorizontal ? 'x' : 'y');
         return true;
     }
+    renderScrollMask(clipGroup) {
+        const { scrollMask = {} } = this.attribute
+            .pager;
+        const { visible = true, gradientLength = 16, gradientStops } = scrollMask;
+        if (!visible || !gradientStops) {
+            return;
+        }
+        const width = clipGroup.AABBBounds.width();
+        const height = clipGroup.AABBBounds.height();
+        const totalLength = this._itemContext.isHorizontal ? width : height;
+        const startStops = gradientStops.map(stop => {
+            return {
+                offset: (gradientLength * stop.offset) / totalLength,
+                color: stop.color
+            };
+        });
+        const endStops = gradientStops.map(stop => {
+            return {
+                offset: (totalLength - gradientLength * stop.offset) / totalLength,
+                color: stop.color
+            };
+        });
+        const mask = graphicCreator.rect({
+            x: 0,
+            y: 0,
+            width,
+            height
+        });
+        this._scrollMask = mask;
+        this._scrollMaskContext = { startStops, endStops };
+        this.updateScrollMask();
+        clipGroup.add(mask);
+    }
+    updateScrollMask() {
+        if (!this._scrollMask || !this._pagerComponent) {
+            return;
+        }
+        if (!this._itemContext.isScrollbar) {
+            return;
+        }
+        const [start, end] = this._pagerComponent.getScrollRange();
+        const stops = [];
+        if (!isNumberClose(clamp(end, 0, 1), 1)) {
+            stops.push(...this._scrollMaskContext.endStops);
+        }
+        if (!isNumberClose(clamp(start, 0, 1), 0)) {
+            stops.push(...this._scrollMaskContext.startStops);
+        }
+        if (stops.length) {
+            if (this._itemContext.isHorizontal) {
+                this._scrollMask.setAttributes({
+                    fill: {
+                        gradient: 'linear',
+                        x0: 0,
+                        y0: 0,
+                        x1: 1,
+                        y1: 0,
+                        stops
+                    }
+                });
+            }
+            else {
+                this._scrollMask.setAttributes({
+                    fill: {
+                        gradient: 'linear',
+                        x0: 0,
+                        y0: 0,
+                        x1: 0,
+                        y1: 1,
+                        stops
+                    }
+                });
+            }
+        }
+    }
     _renderPagerComponent() {
         if (this._itemContext.isScrollbar) {
             this._renderScrollbar();
@@ -29159,6 +29483,6 @@ EmptyTip.defaultAttributes = {
     }
 };
 
-const version = "0.21.0-alpha.1";
+const version = "0.21.0-alpha.3";
 
 export { AXIS_ELEMENT_NAME, AbstractComponent, ArcInfo, ArcLabel, ArcSegment, AxisStateValue, BasePlayer, Brush, CheckBox, CircleAxis, CircleAxisGrid, CircleCrosshair, ColorContinuousLegend, ContinuousPlayer, DEFAULT_ITEM_SPACE_COL, DEFAULT_ITEM_SPACE_ROW, DEFAULT_LABEL_SPACE, DEFAULT_PAGER_SPACE, DEFAULT_SHAPE_SIZE, DEFAULT_SHAPE_SPACE, DEFAULT_STATES$1 as DEFAULT_STATES, DEFAULT_TITLE_SPACE, DEFAULT_VALUE_SPACE, DataLabel, DataZoom, DataZoomActiveTag, DirectionEnum, DiscreteLegend, DiscretePlayer, EmptyTip, GroupTransition, IMarkAreaLabelPosition, IMarkCommonArcLabelPosition, IMarkLineLabelPosition, IMarkPointItemPosition, IOperateType, Indicator, LEGEND_ELEMENT_NAME, LabelBase, LegendEvent, LegendStateValue, LineAxis, LineAxisGrid, LineCrosshair, LineLabel, LinkPath, MarkArcArea, MarkArcLine, MarkArea, MarkLine, MarkPoint, Pager, PlayerEventEnum, PolygonCrosshair, PopTip, Radio, RectCrosshair, RectLabel, SLIDER_ELEMENT_NAME, ScrollBar, SectorCrosshair, Segment, SizeContinuousLegend, Slider, SymbolLabel, Tag, Timeline, Title, Tooltip, TopZIndex, VTag, alignTextInLine, angle, angleLabelOrientAttribute, angleTo, cartesianTicks, clampRadian, computeOffsetForlimit, continuousTicks, contrastAccessibilityChecker, convertDomainToTickData, createTextGraphicByType, deltaXYToAngle, fuzzyEqualNumber, getAxisBreakSymbolAttrs, getCircleLabelPosition, getCirclePoints, getCircleVerticalVector, getElMap, getHorizontalPath, getMarksByName, getNoneGroupMarksByName, getPolarAngleLabelPosition, getPolygonPath, getSizeHandlerPath, getTextAlignAttrOfVerticalDir, getTextType, getVerticalCoord, getVerticalPath, hasOverlap, htmlAttributeTransform, initTextMeasure, isInRange, isPostiveXAxis, isRichText, isVisible, labelSmartInvert, length, limitShapeInBounds, linearDiscreteTicks, loadPoptip, measureTextSize, normalize, polarAngleAxisDiscreteTicks, polarTicks, reactAttributeTransform, registerArcDataLabel, registerLineDataLabel, registerMarkArcAreaAnimate, registerMarkArcLineAnimate, registerMarkAreaAnimate, registerMarkLineAnimate, registerMarkPointAnimate, registerRectDataLabel, registerSymbolDataLabel, removeRepeatPoint, richTextAttributeTransform, scale, setPoptipTheme, smartInvertStrategy, tan2AngleToAngle, textIntersect, ticks, traverseGroup, version };