@visactor/vrender 0.21.0-alpha.3 → 0.21.0-alpha.5

package/dist/index.js

@@ -3997,7 +3997,8 @@
       globalZIndex: 1,
       globalCompositeOperation: "",
       overflow: "hidden",
-      shadowPickMode: "graphic"
+      shadowPickMode: "graphic",
+      keepStrokeScale: !1
     }, DefaultDebugAttribute), DefaultStyle), DefaultTransform);
     function addAttributeToPrototype(obj, c, keys) {
       keys.forEach(key => {
@@ -6501,7 +6502,7 @@
       }
     }
 
-    class DefaultTicker {
+    class DefaultTicker extends EventEmitter {
       set mode(m) {
         this._mode !== m && (this._mode = m, this.setupTickHandler());
       }
@@ -6510,17 +6511,17 @@
       }
       constructor() {
         let timelines = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-        this.handleTick = (handler, params) => {
+        super(), this.handleTick = (handler, params) => {
           const {
             once = !1
           } = null != params ? params : {};
-          this.ifCanStop() ? this.stop() : (this._handlerTick(handler), once || handler.tick(this.interval, this.handleTick));
-        }, this._handlerTick = handler => {
+          this.ifCanStop() ? this.stop() : (this._handlerTick(), once || handler.tick(this.interval, this.handleTick));
+        }, this._handlerTick = () => {
           const time = this.tickerHandler.getTime();
           let delta = 0;
           this.lastFrameTime >= 0 && (delta = time - this.lastFrameTime), this.lastFrameTime = time, this.status === STATUS$1.RUNNING && (this.tickCounts++, this.timelines.forEach(t => {
             t.tick(delta);
-          }));
+          }), this.emit("afterTick"));
         }, this.init(), this.lastFrameTime = -1, this.tickCounts = 0, this.timelines = timelines, this.autoStop = !0;
       }
       init() {
@@ -6616,6 +6617,9 @@
       stop() {
         this.status = STATUS$1.INITIAL, this.setupTickHandler(), this.lastFrameTime = -1;
       }
+      trySyncTickStatus() {
+        this.status === STATUS$1.RUNNING && this._handlerTick();
+      }
     }
 
     class ManualTickHandler {
@@ -7757,7 +7761,7 @@
           lastMatchedIndex = i, lastMatchedPoint = tagMap.get(this.toPoints[i].context);
           break;
         }
-        "clip" === this.newPointAnimateType && 0 !== this.toPoints.length && (Number.isFinite(lastMatchedIndex) ? (this.clipRange = this.toPoints[lastMatchedIndex][this.clipRangeByDimension] / this.toPoints[this.toPoints.length - 1][this.clipRangeByDimension], isValidNumber$1(this.clipRange) ? this.clipRange = clamp$1(this.clipRange, 0, 1) : this.clipRange = 0) : this.clipRange = 0);
+        "clip" === this.newPointAnimateType && 0 !== this.toPoints.length && (Number.isFinite(lastMatchedIndex) ? (this.clipRange = this.toPoints[lastMatchedIndex][this.clipRangeByDimension] / this.toPoints[this.toPoints.length - 1][this.clipRangeByDimension], 1 === this.clipRange && (this.shrinkClipRange = this.toPoints[lastMatchedIndex][this.clipRangeByDimension] / this.fromPoints[this.fromPoints.length - 1][this.clipRangeByDimension]), isValidNumber$1(this.clipRange) ? this.clipRange = clamp$1(this.clipRange, 0, 1) : this.clipRange = 0) : this.clipRange = 0);
         let prevMatchedPoint = this.toPoints[0];
         this.interpolatePoints = this.toPoints.map((point, index) => {
           const matchedPoint = tagMap.get(point.context);
@@ -7769,11 +7773,19 @@
           return newPoint.defined = toPoint.defined, newPoint.context = toPoint.context, newPoint;
         });
       }
+      onFirstRun() {
+        const lastClipRange = this.target.attribute.clipRange;
+        isValidNumber$1(lastClipRange * this.clipRange) && (this.clipRange *= lastClipRange);
+      }
       onUpdate(end, ratio, out) {
         if (this.points = this.points.map((point, index) => {
           const newPoint = pointInterpolation(this.interpolatePoints[index][0], this.interpolatePoints[index][1], ratio);
           return newPoint.context = point.context, newPoint;
-        }), this.clipRange && (out.clipRange = this.clipRange + (1 - this.clipRange) * ratio), this.segmentsCache && this.to.segments) {
+        }), this.clipRange) {
+          if (this.shrinkClipRange) return void (end ? (out.points = this.toPoints, out.clipRange = 1) : (out.points = this.fromPoints, out.clipRange = this.clipRange - (this.clipRange - this.shrinkClipRange) * ratio));
+          out.clipRange = this.clipRange + (1 - this.clipRange) * ratio;
+        }
+        if (this.segmentsCache && this.to.segments) {
           let start = 0;
           out.segments = this.to.segments.map((segment, index) => {
             const end = start + this.segmentsCache[index],
@@ -12127,7 +12139,8 @@
           x: originX = arcAttribute.x,
           y: originY = arcAttribute.y,
           scaleX = arcAttribute.scaleX,
-          scaleY = arcAttribute.scaleY
+          scaleY = arcAttribute.scaleY,
+          keepStrokeScale = arcAttribute.keepStrokeScale
         } = arc.attribute;
         let {
           innerRadius = arcAttribute.innerRadius,
@@ -12139,7 +12152,7 @@
             {
               distance = arcAttribute[key].distance
             } = borderStyle,
-            d = getScaledStroke(context, distance, context.dpr),
+            d = keepStrokeScale ? distance : getScaledStroke(context, distance, context.dpr),
             deltaAngle = distance / outerRadius,
             sign = "outerBorder" === key ? 1 : -1;
           if (arc.setAttributes({
@@ -12184,14 +12197,15 @@
             x: originX = circleAttribute.x,
             y: originY = circleAttribute.y,
             scaleX = circleAttribute.scaleX,
-            scaleY = circleAttribute.scaleY
+            scaleY = circleAttribute.scaleY,
+            keepStrokeScale = circleAttribute.keepStrokeScale
           } = circle.attribute,
           renderBorder = (borderStyle, key) => {
             const doStroke = !(!borderStyle || !borderStyle.stroke),
               {
                 distance = circleAttribute[key].distance
               } = borderStyle,
-              d = getScaledStroke(context, distance, context.dpr),
+              d = keepStrokeScale ? distance : getScaledStroke(context, distance, context.dpr),
               sign = "outerBorder" === key ? 1 : -1;
             if (context.beginPath(), context.arc(x, y, radius + sign * d, startAngle, endAngle), context.closePath(), context.setShadowBlendStyle && context.setShadowBlendStyle(circle, circle.attribute, circleAttribute), strokeCb) strokeCb(context, borderStyle, circleAttribute[key]);else if (doStroke) {
               const lastOpacity = circleAttribute[key].opacity;
@@ -12310,7 +12324,8 @@
           scaleX = rectAttribute.scaleX,
           scaleY = rectAttribute.scaleY,
           x1: x1,
-          y1: y1
+          y1: y1,
+          keepStrokeScale = rectAttribute.keepStrokeScale
         } = rect.attribute;
         let {
           width: width,
@@ -12323,7 +12338,7 @@
             {
               distance = rectAttribute[key].distance
             } = borderStyle,
-            d = getScaledStroke(context, distance, context.dpr),
+            d = keepStrokeScale ? distance : getScaledStroke(context, distance, context.dpr),
             nextX = x + sign * d,
             nextY = y + sign * d,
             dw = 2 * d;
@@ -12480,14 +12495,15 @@
             x: originX = symbolAttribute.x,
             y: originY = symbolAttribute.y,
             scaleX = symbolAttribute.scaleX,
-            scaleY = symbolAttribute.scaleY
+            scaleY = symbolAttribute.scaleY,
+            keepStrokeScale = symbolAttribute.keepStrokeScale
           } = symbol.attribute,
           renderBorder = (borderStyle, key) => {
             const doStroke = !(!borderStyle || !borderStyle.stroke),
               {
                 distance = symbolAttribute[key].distance
               } = borderStyle,
-              d = getScaledStroke(context, distance, context.dpr),
+              d = keepStrokeScale ? distance : getScaledStroke(context, distance, context.dpr),
               sign = "outerBorder" === key ? 1 : -1;
             if (context.beginPath(), !1 === parsedPath.drawOffset(context, size, x, y, sign * d) && context.closePath(), context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute), strokeCb) strokeCb(context, borderStyle, symbolAttribute[key]);else if (doStroke) {
               const lastOpacity = symbolAttribute[key].opacity;
@@ -13765,16 +13781,8 @@
             verticalMode = textAttribute.verticalMode,
             x: originX = textAttribute.x,
             y: originY = textAttribute.y
-          } = text.attribute;
-        let {
-          textAlign = textAttribute.textAlign,
-          textBaseline = textAttribute.textBaseline
-        } = text.attribute;
-        if (!verticalMode && "vertical" === direction) {
-          const t = textAlign;
-          textAlign = null !== (_a = text.getBaselineMapAlign()[textBaseline]) && void 0 !== _a ? _a : "left", textBaseline = null !== (_b = text.getAlignMapBaseline()[t]) && void 0 !== _b ? _b : "top";
-        }
-        const lineHeight = null !== (_c = calculateLineHeight(text.attribute.lineHeight, fontSize)) && void 0 !== _c ? _c : fontSize,
+          } = text.attribute,
+          lineHeight = null !== (_a = calculateLineHeight(text.attribute.lineHeight, fontSize)) && void 0 !== _a ? _a : fontSize,
           data = this.valid(text, textAttribute, fillCb, strokeCb);
         if (!data) return;
         const {
@@ -13794,7 +13802,7 @@
             const matrix = matrixAllocate.allocate(1, 0, 0, 1, 0, 0);
             matrix.rotateByCenter(Math.PI / 2, _x, _y), context.transformFromMatrix(matrix, !0), matrixAllocate.free(matrix);
           }
-          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());
+          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))), direction && (context.highPerformanceRestore(), context.setTransformForCurrent());
         };
         if (context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z), "horizontal" === direction) {
           const {
@@ -13808,11 +13816,19 @@
           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, {
+            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, line.descent, (line.descent - line.ascent) / 2, z, textAttribute, context, {
               width: line.width
             });
           })));
         } else {
+          let {
+            textAlign = textAttribute.textAlign,
+            textBaseline = textAttribute.textBaseline
+          } = text.attribute;
+          if (!verticalMode) {
+            const t = textAlign;
+            textAlign = null !== (_b = text.getBaselineMapAlign()[textBaseline]) && void 0 !== _b ? _b : "left", textBaseline = null !== (_c = text.getAlignMapBaseline()[t]) && void 0 !== _c ? _c : "top";
+          }
           text.tryUpdateAABBBounds();
           const cache = text.cache,
             {
@@ -13851,12 +13867,10 @@
           computed3dMatrix = !keepDirIn3d;
         this._draw(text, textAttribute, computed3dMatrix, drawContext, params);
       }
-      drawUnderLine(underline, lineThrough, text, x, y, z, textAttribute, context, multiOption) {
+      drawUnderLine(underline, lineThrough, text, anchorX, anchorY, offsetUnderLineY, offsetThroughLineY, z, textAttribute, context, multiOption) {
         if (lineThrough + underline <= 0) return;
         const {
             textAlign = textAttribute.textAlign,
-            textBaseline = textAttribute.textBaseline,
-            fontSize = textAttribute.fontSize,
             fill = textAttribute.fill,
             opacity = textAttribute.opacity,
             underlineOffset = textAttribute.underlineOffset,
@@ -13866,23 +13880,21 @@
           isMulti = !isNil$1(multiOption),
           w = isMulti ? multiOption.width : text.clipedWidth,
           offsetX = isMulti ? 0 : textDrawOffsetX(textAlign, w),
-          offsetY = textLayoutOffsetY(isMulti ? "alphabetic" : textBaseline, fontSize, fontSize),
           attribute = {
             lineWidth: 0,
             stroke: fill,
             opacity: opacity,
             strokeOpacity: fillOpacity
           };
-        let deltaY = isMulti ? -3 : 0;
         if (underline) {
-          attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, x, y, textAttribute), underlineDash && context.setLineDash(underlineDash), context.beginPath();
-          const dy = y + offsetY + fontSize + underlineOffset + deltaY;
-          context.moveTo(x + offsetX, dy, z), context.lineTo(x + offsetX + w, dy, z), context.stroke();
+          attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, anchorX, anchorY, textAttribute), underlineDash && context.setLineDash(underlineDash), context.beginPath();
+          const dy = anchorY + offsetUnderLineY + underlineOffset;
+          context.moveTo(anchorX + offsetX, dy, z), context.lineTo(anchorX + offsetX + w, dy, z), context.stroke();
         }
-        if (isMulti && (deltaY = -1), lineThrough) {
-          attribute.lineWidth = lineThrough, context.setStrokeStyle(text, attribute, x, y, textAttribute), context.beginPath();
-          const dy = y + offsetY + fontSize / 2 + deltaY;
-          context.moveTo(x + offsetX, dy, z), context.lineTo(x + offsetX + w, dy, z), context.stroke();
+        if (lineThrough) {
+          attribute.lineWidth = lineThrough, context.setStrokeStyle(text, attribute, anchorX, anchorY, textAttribute), context.beginPath();
+          const dy = anchorY + offsetThroughLineY;
+          context.moveTo(anchorX + offsetX, dy, z), context.lineTo(anchorX + offsetX + w, dy, z), context.stroke();
         }
       }
     };
@@ -14585,7 +14597,7 @@
           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,
+              str: metrics.width <= lineWidth ? lines[i].toString() : this.textMeasure.clipTextWithSuffix(lines[i], this.textOptions, width, suffix, wordBreak, suffixPosition).str,
               width: width,
               ascent: metrics.ascent,
               descent: metrics.descent
@@ -14782,8 +14794,7 @@
             whiteSpace = textTheme.whiteSpace,
             suffixPosition = textTheme.suffixPosition
           } = attribute,
-          buf = ignoreBuf ? 0 : 2,
-          lineHeight = this.getLineHeight(attribute, textTheme) + buf;
+          lineHeight = this.getLineHeight(attribute, textTheme);
         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;
@@ -14819,8 +14830,7 @@
             heightLimit = 0,
             lineClamp: lineClamp
           } = this.attribute,
-          buf = ignoreBuf ? 0 : 2,
-          lineHeight = this.getLineHeight(this.attribute, textTheme) + buf;
+          lineHeight = this.getLineHeight(this.attribute, textTheme);
         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;
@@ -14851,8 +14861,8 @@
               });
               break;
             }
-            const clip = textMeasure.clipText(str, textOptions, maxLineWidth, "break-word" === wordBreak);
-            if ("" !== str && "" === clip.str) {
+            const clip = textMeasure.clipText(str, textOptions, maxLineWidth, "break-all" !== wordBreak, "keep-all" === wordBreak);
+            if ("" !== str && "" === clip.str || clip.wordBreaked) {
               if (ellipsis) {
                 const clipEllipsis = textMeasure.clipTextWithSuffix(str, textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
                 clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
@@ -14860,13 +14870,15 @@
               needCut = !1;
             }
             const matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions);
-            if (linesLayout.push({
+            linesLayout.push({
               str: clip.str,
               width: clip.width,
               ascent: matrics.ascent,
               descent: matrics.descent
-            }), clip.str.length === str.length) ;else if (needCut) {
-              const newStr = str.substring(clip.str.length);
+            });
+            let cutLength = clip.str.length;
+            if (!clip.wordBreaked || "" !== str && "" === clip.str || (needCut = !0, cutLength = clip.wordBreaked), clip.str.length === str.length) ;else if (needCut) {
+              const newStr = str.substring(cutLength);
               lines.splice(i + 1, 0, newStr);
             }
           }
@@ -15182,6 +15194,9 @@
           bounds.x1 = -halfS, bounds.x2 = halfS, bounds.y1 = -halfS, bounds.y2 = halfS;
         } else bounds.x1 = -size[0] / 2, bounds.x2 = size[0] / 2, bounds.y1 = -size[1] / 2, bounds.y2 = size[1] / 2;
       }
+      parseSize(size) {
+        return isNumber$1(size) ? size : Math.min(size[0], size[1]);
+      }
     }
 
     function circle(ctx, r, x, y, z) {
@@ -15192,13 +15207,13 @@
         super(...arguments), this.type = "circle", this.pathStr = "M0.5,0A0.5,0.5,0,1,1,-0.5,0A0.5,0.5,0,1,1,0.5,0";
       }
       draw(ctx, size, x, y, z) {
-        return circle(ctx, size / 2, x, y, z);
+        return circle(ctx, this.parseSize(size) / 2, x, y, z);
       }
       drawOffset(ctx, size, x, y, offset, z) {
-        return circle(ctx, size / 2 + offset, x, y, z);
+        return circle(ctx, this.parseSize(size) / 2 + offset, x, y, z);
       }
       drawToSvgPath(size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return `M ${x - r}, ${y} a ${r},${r} 0 1,0 ${2 * r},0 a ${r},${r} 0 1,0 -${2 * r},0`;
       }
     }
@@ -15215,10 +15230,10 @@
         super(...arguments), this.type = "cross", this.pathStr = "M-0.5,-0.2L-0.5,0.2L-0.2,0.2L-0.2,0.5L0.2,0.5L0.2,0.2L0.5,0.2L0.5,-0.2L0.2,-0.2L0.2,-0.5L-0.2,-0.5L-0.2,-0.2Z";
       }
       draw(ctx, size, x, y, z) {
-        return cross(ctx, size / 6, x, y, z);
+        return cross(ctx, this.parseSize(size) / 6, x, y, z);
       }
       drawOffset(ctx, size, x, y, offset, z) {
-        return crossOffset(ctx, size / 6, x, y, offset, z);
+        return crossOffset(ctx, this.parseSize(size) / 6, x, y, offset, z);
       }
     }
     var cross$1 = new CrossSymbol();
@@ -15231,13 +15246,13 @@
         super(...arguments), this.type = "diamond", this.pathStr = "M-0.5,0L0,-0.5L0.5,0L0,0.5Z";
       }
       draw(ctx, size, x, y, z) {
-        return diamond(ctx, size / 2, x, y, z);
+        return diamond(ctx, this.parseSize(size) / 2, x, y, z);
       }
       drawFitDir(ctx, size, x, y, z) {
-        return diamond(ctx, size / 2, x, y, z);
+        return diamond(ctx, this.parseSize(size) / 2, x, y, z);
       }
       drawOffset(ctx, size, x, y, offset, z) {
-        return diamond(ctx, size / 2 + offset, x, y, z);
+        return diamond(ctx, this.parseSize(size) / 2 + offset, x, y, z);
       }
     }
     var diamond$1 = new DiamondSymbol();
@@ -15251,10 +15266,10 @@
         super(...arguments), this.type = "square", this.pathStr = "M-0.5,-0.5h1v1h-1Z";
       }
       draw(ctx, size, x, y) {
-        return square(ctx, size / 2, x, y);
+        return square(ctx, this.parseSize(size) / 2, x, y);
       }
       drawOffset(ctx, size, x, y, offset) {
-        return square(ctx, size / 2 + offset, x, y);
+        return square(ctx, this.parseSize(size) / 2 + offset, x, y);
       }
     }
     var square$1 = new SquareSymbol();
@@ -15268,10 +15283,10 @@
         super(...arguments), this.type = "triangleUp", this.pathStr = "M0.5,0.5 L-0.5,0.5 L0,-0.5 Z";
       }
       draw(ctx, size, x, y) {
-        return trianglUpOffset(ctx, size / 2, x, y);
+        return trianglUpOffset(ctx, this.parseSize(size) / 2, x, y);
       }
       drawOffset(ctx, size, x, y, offset) {
-        return trianglUpOffset(ctx, size / 2, x, y, offset);
+        return trianglUpOffset(ctx, this.parseSize(size) / 2, x, y, offset);
       }
     }
     var triangleUp = new TriangleUpSymbol();
@@ -15303,10 +15318,10 @@
         super(...arguments), this.type = "star", this.pathStr = "M0 -1L0.22451398828979266 -0.3090169943749474L0.9510565162951535 -0.30901699437494745L0.3632712640026804 0.1180339887498948L0.5877852522924732 0.8090169943749473L8.326672684688674e-17 0.3819660112501051L-0.587785252292473 0.8090169943749476L-0.3632712640026804 0.11803398874989487L-0.9510565162951536 -0.30901699437494723L-0.22451398828979274 -0.30901699437494734Z";
       }
       draw(ctx, size, transX, transY) {
-        return star(ctx, size / 2, transX, transY);
+        return star(ctx, this.parseSize(size) / 2, transX, transY);
       }
       drawOffset(ctx, size, transX, transY, offset) {
-        return star(ctx, size / 2 + offset, transX, transY);
+        return star(ctx, this.parseSize(size) / 2 + offset, transX, transY);
       }
     }
     var star$1 = new StarSymbol();
@@ -15324,10 +15339,10 @@
         super(...arguments), this.type = "arrow", this.pathStr = "M-0.07142857142857142,0.5L0.07142857142857142,0.5L0.07142857142857142,-0.0625L0.2,-0.0625L0,-0.5L-0.2,-0.0625L-0.07142857142857142,-0.0625Z";
       }
       draw(ctx, size, transX, transY) {
-        return arrow(ctx, size / 2, transX, transY);
+        return arrow(ctx, this.parseSize(size) / 2, transX, transY);
       }
       drawOffset(ctx, size, transX, transY, offset) {
-        return arrow(ctx, size / 2 + offset, transX, transY);
+        return arrow(ctx, this.parseSize(size) / 2 + offset, transX, transY);
       }
     }
     var arrow$1 = new ArrowSymbol();
@@ -15341,10 +15356,10 @@
         super(...arguments), this.type = "wedge", this.pathStr = "M0,-0.5773502691896257L-0.125,0.28867513459481287L0.125,0.28867513459481287Z";
       }
       draw(ctx, size, transX, transY) {
-        return wedge(ctx, size / 2, transX, transY);
+        return wedge(ctx, this.parseSize(size) / 2, transX, transY);
       }
       drawOffset(ctx, size, transX, transY, offset) {
-        return wedge(ctx, size / 2 + offset, transX, transY);
+        return wedge(ctx, this.parseSize(size) / 2 + offset, transX, transY);
       }
     }
     var wedge$1 = new WedgeSymbol();
@@ -15357,10 +15372,10 @@
         super(...arguments), this.type = "stroke", this.pathStr = "";
       }
       draw(ctx, size, transX, transY) {
-        return stroke(ctx, size / 2, transX, transY);
+        return stroke(ctx, this.parseSize(size) / 2, transX, transY);
       }
       drawOffset(ctx, size, transX, transY, offset) {
-        return stroke(ctx, size / 2 + offset, transX, transY);
+        return stroke(ctx, this.parseSize(size) / 2 + offset, transX, transY);
       }
     }
     var stroke$1 = new StrokeSymbol();
@@ -15382,10 +15397,10 @@
         super(...arguments), this.type = "wye", this.pathStr = "M0.25 0.14433756729740646L0.25 0.6443375672974064L-0.25 0.6443375672974064L-0.25 0.14433756729740643L-0.6830127018922193 -0.10566243270259357L-0.4330127018922193 -0.5386751345948129L0 -0.28867513459481287L0.4330127018922193 -0.5386751345948129L0.6830127018922193 -0.10566243270259357Z";
       }
       draw(ctx, size, transX, transY) {
-        return wye(ctx, size / 2, transX, transY);
+        return wye(ctx, this.parseSize(size) / 2, transX, transY);
       }
       drawOffset(ctx, size, transX, transY, offset) {
-        return wye(ctx, size / 2 + offset, transX, transY);
+        return wye(ctx, this.parseSize(size) / 2 + offset, transX, transY);
       }
     }
     var wye$1 = new WyeSymbol();
@@ -15398,10 +15413,10 @@
         super(...arguments), this.type = "triangleLeft", this.pathStr = "M-0.5,0 L0.5,0.5 L0.5,-0.5 Z";
       }
       draw(ctx, size, x, y) {
-        return trianglLeftOffset(ctx, size / 2, x, y, 0);
+        return trianglLeftOffset(ctx, this.parseSize(size) / 2, x, y, 0);
       }
       drawOffset(ctx, size, x, y, offset) {
-        return trianglLeftOffset(ctx, size / 2, x, y, offset);
+        return trianglLeftOffset(ctx, this.parseSize(size) / 2, x, y, offset);
       }
     }
     var triangleLeft = new TriangleLeftSymbol();
@@ -15415,10 +15430,10 @@
         super(...arguments), this.type = "triangleRight", this.pathStr = "M-0.5,0.5 L0.5,0 L-0.5,-0.5 Z";
       }
       draw(ctx, size, x, y) {
-        return trianglRightOffset(ctx, size / 2, x, y);
+        return trianglRightOffset(ctx, this.parseSize(size) / 2, x, y);
       }
       drawOffset(ctx, size, x, y, offset) {
-        return trianglRightOffset(ctx, size / 2, x, y, offset);
+        return trianglRightOffset(ctx, this.parseSize(size) / 2, x, y, offset);
       }
     }
     var triangleRight = new TriangleRightSymbol();
@@ -15432,10 +15447,10 @@
         super(...arguments), this.type = "triangleDown", this.pathStr = "M-0.5,-0.5 L0.5,-0.5 L0,0.5 Z";
       }
       draw(ctx, size, x, y) {
-        return trianglDownOffset(ctx, size / 2, x, y);
+        return trianglDownOffset(ctx, this.parseSize(size) / 2, x, y);
       }
       drawOffset(ctx, size, x, y, offset) {
-        return trianglDownOffset(ctx, size / 2, x, y, offset);
+        return trianglDownOffset(ctx, this.parseSize(size) / 2, x, y, offset);
       }
     }
     var triangleDown = new TriangleDownSymbol();
@@ -15450,10 +15465,10 @@
         super(...arguments), this.type = "thinTriangle", this.pathStr = "M0,-0.5773502691896257L-0.5,0.28867513459481287L0.5,0.28867513459481287Z";
       }
       draw(ctx, size, x, y) {
-        return thinTriangle(ctx, size / 2 / sqrt3, x, y);
+        return thinTriangle(ctx, this.parseSize(size) / 2 / sqrt3, x, y);
       }
       drawOffset(ctx, size, x, y, offset) {
-        return thinTriangle(ctx, size / 2 / sqrt3 + offset, x, y);
+        return thinTriangle(ctx, this.parseSize(size) / 2 / sqrt3 + offset, x, y);
       }
     }
     var thinTriangle$1 = new ThinTriangleSymbol();
@@ -15467,10 +15482,10 @@
         super(...arguments), this.type = "arrow2Left", this.pathStr = "M 0.25 -0.5 L -0.25 0 l 0.25 0.5";
       }
       draw(ctx, size, transX, transY) {
-        return arrow2Left(ctx, size / 4, transX, transY);
+        return arrow2Left(ctx, this.parseSize(size) / 4, transX, transY);
       }
       drawOffset(ctx, size, transX, transY, offset) {
-        return arrow2Left(ctx, size / 4 + offset, transX, transY);
+        return arrow2Left(ctx, this.parseSize(size) / 4 + offset, transX, transY);
       }
     }
     var arrow2Left$1 = new Arrow2LeftSymbol();
@@ -15484,10 +15499,10 @@
         super(...arguments), this.type = "arrow2Right", this.pathStr = "M -0.25 -0.5 l 0.25 0 l -0.25 0.5";
       }
       draw(ctx, size, transX, transY) {
-        return arrow2Right(ctx, size / 4, transX, transY);
+        return arrow2Right(ctx, this.parseSize(size) / 4, transX, transY);
       }
       drawOffset(ctx, size, transX, transY, offset) {
-        return arrow2Right(ctx, size / 4 + offset, transX, transY);
+        return arrow2Right(ctx, this.parseSize(size) / 4 + offset, transX, transY);
       }
     }
     var arrow2Right$1 = new Arrow2RightSymbol();
@@ -15501,10 +15516,10 @@
         super(...arguments), this.type = "arrow2Up", this.pathStr = "M -0.5 0.25 L 0 -0.25 l 0.5 0.25";
       }
       draw(ctx, size, transX, transY) {
-        return arrow2Up(ctx, size / 4, transX, transY);
+        return arrow2Up(ctx, this.parseSize(size) / 4, transX, transY);
       }
       drawOffset(ctx, size, transX, transY, offset) {
-        return arrow2Up(ctx, size / 4 + offset, transX, transY);
+        return arrow2Up(ctx, this.parseSize(size) / 4 + offset, transX, transY);
       }
     }
     var arrow2Up$1 = new Arrow2UpSymbol();
@@ -15518,10 +15533,10 @@
         super(...arguments), this.type = "arrow2Down", this.pathStr = "M -0.5 -0.25 L 0 0.25 l 0.5 -0.25";
       }
       draw(ctx, size, transX, transY) {
-        return arrow2Down(ctx, size / 4, transX, transY);
+        return arrow2Down(ctx, this.parseSize(size) / 4, transX, transY);
       }
       drawOffset(ctx, size, transX, transY, offset) {
-        return arrow2Down(ctx, size / 4 + offset, transX, transY);
+        return arrow2Down(ctx, this.parseSize(size) / 4 + offset, transX, transY);
       }
     }
     var arrow2Down$1 = new Arrow2DownSymbol();
@@ -15534,13 +15549,13 @@
         super(...arguments), this.type = "lineV", this.pathStr = "M0,-0.5L0,0.5";
       }
       draw(ctx, size, x, y, z) {
-        return lineV(ctx, size / 2, x, y);
+        return lineV(ctx, this.parseSize(size) / 2, x, y);
       }
       drawOffset(ctx, size, x, y, offset, z) {
-        return lineV(ctx, size / 2 + offset, x, y);
+        return lineV(ctx, this.parseSize(size) / 2 + offset, x, y);
       }
       drawToSvgPath(size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return `M ${x}, ${y - r} L ${x},${y + r}`;
       }
     }
@@ -15554,13 +15569,13 @@
         super(...arguments), this.type = "lineH", this.pathStr = "M-0.5,0L0.5,0";
       }
       draw(ctx, size, x, y, z) {
-        return lineH(ctx, size / 2, x, y);
+        return lineH(ctx, this.parseSize(size) / 2, x, y);
       }
       drawOffset(ctx, size, x, y, offset, z) {
-        return lineH(ctx, size / 2 + offset, x, y);
+        return lineH(ctx, this.parseSize(size) / 2 + offset, x, y);
       }
       drawToSvgPath(size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return `M ${x - r}, ${y} L ${x + r},${y}`;
       }
     }
@@ -15574,13 +15589,13 @@
         super(...arguments), this.type = "close", this.pathStr = "M-0.5,-0.5L0.5,0.5,M0.5,-0.5L-0.5,0.5";
       }
       draw(ctx, size, x, y, z) {
-        return close(ctx, size / 2, x, y);
+        return close(ctx, this.parseSize(size) / 2, x, y);
       }
       drawOffset(ctx, size, x, y, offset, z) {
-        return close(ctx, size / 2 + offset, x, y);
+        return close(ctx, this.parseSize(size) / 2 + offset, x, y);
       }
       drawToSvgPath(size, x, y, z) {
-        const r = size / 2;
+        const r = this.parseSize(size) / 2;
         return `M ${x - r}, ${y - r} L ${x + r},${y + r} M ${x + r}, ${y - r} L ${x - r},${y + r}`;
       }
     }
@@ -15614,15 +15629,18 @@
         this.pathStr = "", this.type = type, isArray$1(path) ? this.svgCache = path : this.path = path, this.isSvg = isSvg;
       }
       drawOffset(ctx, size, x, y, offset, z, cb) {
-        return this.isSvg ? !!this.svgCache && (this.svgCache.forEach(item => {
+        return size = this.parseSize(size), this.isSvg ? !!this.svgCache && (this.svgCache.forEach(item => {
           ctx.beginPath(), renderCommandList(item.path.commandList, ctx, x, y, size, size), cb && cb(item.path, item.attribute);
         }), !1) : (renderCommandList(this.path.commandList, ctx, x, y, size + offset, size + offset), !1);
       }
       draw(ctx, size, x, y, z, cb) {
-        return this.drawOffset(ctx, size, x, y, 0, z, cb);
+        return size = this.parseSize(size), this.drawOffset(ctx, size, x, y, 0, z, cb);
+      }
+      parseSize(size) {
+        return isNumber$1(size) ? size : Math.min(size[0], size[1]);
       }
       bounds(size, bounds) {
-        if (this.isSvg) {
+        if (size = this.parseSize(size), this.isSvg) {
           if (!this.svgCache) return;
           return bounds.clear(), void this.svgCache.forEach(_ref => {
             let {
@@ -16305,7 +16323,11 @@
           case "sub":
             baseline += this.descent / 2;
         }
-        "vertical" === direction && (ctx.save(), ctx.rotateAbout(Math.PI / 2, left, baseline), ctx.translate(-this.heightOrigin || -this.lineHeight / 2, -this.descent / 2), ctx.translate(left, baseline), left = 0, baseline = 0), this.character.stroke && (applyStrokeStyle(ctx, this.character), ctx.strokeText(text, left, baseline)), applyFillStyle(ctx, this.character), this.character.fill && ctx.fillText(text, left, baseline), this.character.fill && ("boolean" == typeof this.character.lineThrough || "boolean" == typeof this.character.underline ? (this.character.underline && ctx.fillRect(left, 1 + baseline, this.widthOrigin || this.width, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1), this.character.lineThrough && ctx.fillRect(left, 1 + baseline - this.ascent / 2, this.widthOrigin || this.width, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1)) : "underline" === this.character.textDecoration ? ctx.fillRect(left, 1 + baseline, this.widthOrigin || this.width, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1) : "line-through" === this.character.textDecoration && ctx.fillRect(left, 1 + baseline - this.ascent / 2, this.widthOrigin || this.width, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1)), "vertical" === direction && ctx.restore();
+        "vertical" === direction && (ctx.save(), ctx.rotateAbout(Math.PI / 2, left, baseline), ctx.translate(-this.heightOrigin || -this.lineHeight / 2, -this.descent / 2), ctx.translate(left, baseline), left = 0, baseline = 0);
+        const {
+          lineWidth = 1
+        } = this.character;
+        this.character.stroke && lineWidth && (applyStrokeStyle(ctx, this.character), ctx.strokeText(text, left, baseline)), applyFillStyle(ctx, this.character), this.character.fill && ctx.fillText(text, left, baseline), this.character.fill && ("boolean" == typeof this.character.lineThrough || "boolean" == typeof this.character.underline ? (this.character.underline && ctx.fillRect(left, 1 + baseline, this.widthOrigin || this.width, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1), this.character.lineThrough && ctx.fillRect(left, 1 + baseline - this.ascent / 2, this.widthOrigin || this.width, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1)) : "underline" === this.character.textDecoration ? ctx.fillRect(left, 1 + baseline, this.widthOrigin || this.width, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1) : "line-through" === this.character.textDecoration && ctx.fillRect(left, 1 + baseline - this.ascent / 2, this.widthOrigin || this.width, this.character.fontSize ? Math.max(1, Math.floor(this.character.fontSize / 10)) : 1)), "vertical" === direction && ctx.restore();
       }
       getWidthWithEllips(direction) {
         let text = this.text;
@@ -18522,7 +18544,7 @@
       constructor() {
         let params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         var _a;
-        super({}), this._onVisibleChange = visible => {
+        super({}), this.tickedBeforeRender = !0, this._onVisibleChange = visible => {
           if (!(this._skipRender < 0)) if (visible) {
             if (this.dirtyBounds) {
               const b = this.window.getViewBox();
@@ -18533,7 +18555,10 @@
         }, this.beforeRender = stage => {
           this._beforeRender && this._beforeRender(stage);
         }, this.afterRender = stage => {
-          this.renderCount++, this._afterRender && this._afterRender(stage), this._afterNextRenderCbs && this._afterNextRenderCbs.forEach(cb => cb(stage)), this._afterNextRenderCbs = null;
+          this.renderCount++, this._afterRender && this._afterRender(stage), this._afterNextRenderCbs && this._afterNextRenderCbs.forEach(cb => cb(stage)), this._afterNextRenderCbs = null, this.tickedBeforeRender = !1;
+        }, this.afterTickCb = () => {
+          var _a;
+          this.tickedBeforeRender = !0, "performance" === (null === (_a = this.params.optimize) || void 0 === _a ? void 0 : _a.tickRenderMode) || "rendering" !== this.state && this.render();
         }, this.params = params, this.theme = new Theme(), this.hooks = {
           beforeRender: new SyncHook(["stage"]),
           afterRender: new SyncHook(["stage"])
@@ -18550,7 +18575,7 @@
           main: !0
         })), this.nextFrameRenderLayerSet = new Set(), this.willNextFrameRender = !1, this.stage = this, this.renderStyle = params.renderStyle, params.autoRender && this.enableAutoRender(), params.autoRefresh && this.enableAutoRefresh(), !1 === params.disableDirtyBounds && this.enableDirtyBounds(), params.enableHtmlAttribute && this.enableHtmlAttribute(params.enableHtmlAttribute), params.ReactDOM && this.enableReactAttribute(params.ReactDOM), params.enableLayout && this.enableLayout(), this.hooks.beforeRender.tap("constructor", this.beforeRender), this.hooks.afterRender.tap("constructor", this.afterRender), this._beforeRender = params.beforeRender, this._afterRender = params.afterRender, this.ticker = params.ticker || defaultTicker, this.supportInteractiveLayer = !1 !== params.interactiveLayer, this.timeline = new DefaultTimeline(), this.ticker.addTimeline(this.timeline), this.timeline.pause(), params.optimize || (params.optimize = {}), this.optmize(params.optimize), params.background && isString$1(this._background) && this._background.includes("/") && this.setAttributes({
           background: this._background
-        });
+        }), this.ticker.on("afterTick", this.afterTickCb);
       }
       pauseRender() {
         let sr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
@@ -18779,7 +18804,7 @@
         if ("released" === this.releaseStatus) return;
         this.ticker.start(), this.timeline.resume();
         const state = this.state;
-        this.state = "rendering", this.layerService.prepareStageLayer(this), this._skipRender || (this.lastRenderparams = params, this.hooks.beforeRender.call(this), this._skipRender || (this.renderLayerList(this.children), this.combineLayersToWindow(), this.nextFrameRenderLayerSet.clear()), this.hooks.afterRender.call(this)), this.state = state, this._skipRender && this._skipRender++;
+        this.state = "rendering", this.tickedBeforeRender || this.ticker.trySyncTickStatus(), this.layerService.prepareStageLayer(this), this._skipRender || (this.lastRenderparams = params, this.hooks.beforeRender.call(this), this._skipRender || (this.renderLayerList(this.children), this.combineLayersToWindow(), this.nextFrameRenderLayerSet.clear()), this.hooks.afterRender.call(this)), this.state = state, this._skipRender && this._skipRender++;
       }
       combineLayersToWindow() {
         if ("harmony" === this.global.env) {
@@ -18885,7 +18910,7 @@
           layer.release();
         }), this.interactiveLayer && (this.interactiveLayer.forEachChildren(item => {
           item.setStage && item.setStage(null, null), this.interactiveLayer.removeChild(item);
-        }), this.interactiveLayer.release()), this.window.release(), this.ticker.remTimeline(this.timeline), this.renderService.renderTreeRoots = [];
+        }), this.interactiveLayer.release()), this.window.release(), this.ticker.remTimeline(this.timeline), this.ticker.removeListener("afterTick", this.afterTickCb), this.renderService.renderTreeRoots = [];
       }
       setStage(stage) {}
       dirty(b, matrix) {
@@ -23864,7 +23889,7 @@
           startTime: startTime,
           startPoints: startPoints
         } = this;
-        if (eventType) return eventType;
+        if ("press" === eventType) return eventType;
         let type;
         return type = clock.now() - startTime > this.config.press.time && calcDistance(startPoints[0], point) < this.config.press.threshold ? "press" : "pan", this.eventType = type, type;
       }
@@ -24396,9 +24421,10 @@
             lineJoin = defaultParams.lineJoin,
             lineDash = defaultParams.lineDash,
             lineCap = defaultParams.lineCap,
-            miterLimit = defaultParams.miterLimit
+            miterLimit = defaultParams.miterLimit,
+            keepStrokeScale = defaultParams.keepStrokeScale
           } = attribute;
-          _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
+          _context.lineWidth = keepStrokeScale ? lineWidth : getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
         }
       }
       setTextStyleWithoutAlignBaseline(params, defaultParams, z) {
@@ -25298,8 +25324,9 @@
         return this.canvasRenderer.drawShape(graphic, pickContext, x, y, {}, null, (context, arcAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), picked), (context, arcAttribute, themeAttribute) => {
           if (picked) return !0;
           const lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth,
-            pickStrokeBuffer = arcAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
-          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
+            pickStrokeBuffer = arcAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer,
+            keepStrokeScale = arcAttribute.keepStrokeScale || themeAttribute.keepStrokeScale;
+          return pickContext.lineWidth = keepStrokeScale ? lineWidth + pickStrokeBuffer : getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
         }), pickContext.highPerformanceRestore(), picked;
       }
     }
@@ -25572,8 +25599,9 @@
         if (!onlyTranslate || rect.shadowRoot || isNumber$1(cornerRadius, !0) && 0 !== cornerRadius || isArray$1(cornerRadius) && cornerRadius.some(num => 0 !== num)) picked = !1, this.canvasRenderer.drawShape(rect, pickContext, x, y, {}, null, (context, rectAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), picked), (context, rectAttribute, themeAttribute) => {
           if (picked) return !0;
           const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth,
-            pickStrokeBuffer = rectAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
-          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
+            pickStrokeBuffer = rectAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer,
+            keepStrokeScale = rectAttribute.keepStrokeScale || themeAttribute.keepStrokeScale;
+          return pickContext.lineWidth = keepStrokeScale ? lineWidth + pickStrokeBuffer : getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
         });else {
           const {
             fill = rectAttribute.fill,
@@ -25887,9 +25915,10 @@
             lineJoin = defaultParams.lineJoin,
             lineDash = defaultParams.lineDash,
             lineCap = defaultParams.lineCap,
-            miterLimit = defaultParams.miterLimit
+            miterLimit = defaultParams.miterLimit,
+            keepStrokeScale = defaultParams.keepStrokeScale
           } = attribute;
-          _context.globalAlpha = strokeOpacity * opacity * this.baseGlobalAlpha, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, 0 === lineDash[0] && 0 === lineDash[1] || lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
+          _context.globalAlpha = strokeOpacity * opacity * this.baseGlobalAlpha, _context.lineWidth = keepStrokeScale ? lineWidth : getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, 0 === lineDash[0] && 0 === lineDash[1] || lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
         }
       }
       measureText(text) {
@@ -26517,9 +26546,10 @@
             lineJoin = defaultParams.lineJoin,
             lineDash = defaultParams.lineDash,
             lineCap = defaultParams.lineCap,
-            miterLimit = defaultParams.miterLimit
+            miterLimit = defaultParams.miterLimit,
+            keepStrokeScale = defaultParams.keepStrokeScale
           } = attribute;
-          _context.setGlobalAlpha(strokeOpacity * opacity), _context.setLineWidth(getScaledStroke(this, lineWidth, this.dpr)), _context.setStrokeStyle(createColor(this, stroke, params, offsetX, offsetY)), _context.setLineJoin(lineJoin), lineDash && _context.setLineDash(lineDash), _context.setLineCap(lineCap), _context.setMiterLimit(miterLimit);
+          _context.setGlobalAlpha(strokeOpacity * opacity), _context.setLineWidth(keepStrokeScale ? lineWidth : getScaledStroke(this, lineWidth, this.dpr)), _context.setStrokeStyle(createColor(this, stroke, params, offsetX, offsetY)), _context.setLineJoin(lineJoin), lineDash && _context.setLineDash(lineDash), _context.setLineCap(lineCap), _context.setMiterLimit(miterLimit);
         }
       }
       setTextStyleWithoutAlignBaseline(params, defaultParams) {
@@ -27559,9 +27589,10 @@
             lineJoin = defaultParams.lineJoin,
             lineDash = defaultParams.lineDash,
             lineCap = defaultParams.lineCap,
-            miterLimit = defaultParams.miterLimit
+            miterLimit = defaultParams.miterLimit,
+            keepStrokeScale = defaultParams.keepStrokeScale
           } = attribute;
-          _context.globalAlpha = strokeOpacity * opacity * this.baseGlobalAlpha, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, 0 === lineDash[0] && 0 === lineDash[1] || lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
+          _context.globalAlpha = strokeOpacity * opacity * this.baseGlobalAlpha, _context.lineWidth = keepStrokeScale ? lineWidth : getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, 0 === lineDash[0] && 0 === lineDash[1] || lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
         }
       }
       measureText(text) {
@@ -27968,8 +27999,9 @@
         return this.canvasRenderer.drawShape(graphic, pickContext, x, y, {}, null, context => !!picked || (picked = context.isPointInPath(pickPoint.x, pickPoint.y), picked), (context, lineAttribute, themeAttribute) => {
           if (picked) return !0;
           const lineWidth = lineAttribute.lineWidth || themeAttribute.lineWidth,
-            pickStrokeBuffer = lineAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
-          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
+            pickStrokeBuffer = lineAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer,
+            keepStrokeScale = lineAttribute.keepStrokeScale || themeAttribute.keepStrokeScale;
+          return pickContext.lineWidth = keepStrokeScale ? lineWidth + pickStrokeBuffer : getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
         }), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && mat4Allocate.free(pickContext.modelMatrix), pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), picked;
       }
     }
@@ -28104,8 +28136,9 @@
         return this.canvasRenderer.drawShape(symbol, pickContext, x, y, {}, null, (context, symbolAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(pickPoint.x, pickPoint.y), picked), (context, symbolAttribute, themeAttribute) => {
           if (picked) return !0;
           const lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth,
-            pickStrokeBuffer = symbolAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
-          return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
+            pickStrokeBuffer = symbolAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer,
+            keepStrokeScale = symbolAttribute.keepStrokeScale || themeAttribute.keepStrokeScale;
+          return pickContext.lineWidth = keepStrokeScale ? lineWidth + pickStrokeBuffer : getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
         }), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && mat4Allocate.free(pickContext.modelMatrix), pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), picked;
       }
     };
@@ -28199,8 +28232,10 @@
             } = text.attribute,
             bounds = text.AABBBounds,
             height = bounds.height(),
-            width = bounds.width();
-          return context.rect(bounds.x1, bounds.y1, width, height, z), picked = context.isPointInPath(pickPoint.x, pickPoint.y), picked;
+            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;
         }, (context, symbolAttribute, themeAttribute) => picked), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && mat4Allocate.free(pickContext.modelMatrix), pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), picked;
       }
     };
@@ -28540,7 +28575,7 @@
 
     const roughModule = _roughModule;
 
-    const version = "0.21.0-alpha.3";
+    const version = "0.21.0-alpha.5";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);