@visactor/vrender 0.11.0-alpha.2 → 0.11.0

package/dist/index.js

@@ -6938,6 +6938,59 @@
       return genCurveSegments(path, points, 1);
   }
 
+  class CurveContext {
+      _lastX;
+      _lastY;
+      _startX;
+      _startY;
+      constructor(path) {
+          this.path = path;
+          this._lastX = this._lastY = this._startX = this._startY = 0;
+      }
+      moveTo(x, y) {
+          this._lastX = this._startX = x;
+          this._lastY = this._startY = y;
+          return this;
+      }
+      lineTo(x, y) {
+          const curve = this.addLinearCurve(x, y);
+          this.path.curves.push(curve);
+          this._lastX = x;
+          this._lastY = y;
+      }
+      addLinearCurve(x, y) {
+          const curve = new LineCurve(new Point(this._lastX, this._lastY), new Point(x, y));
+          return curve;
+      }
+      quadraticCurveTo(aCPx, aCPy, aX, aY) {
+          throw new Error('CurveContext不支持调用quadraticCurveTo');
+      }
+      bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) {
+          const curve = new CubicBezierCurve(new Point(this._lastX, this._lastY), new Point(cp1x, cp1y), new Point(cp2x, cp2y), new Point(x, y));
+          this.path.curves.push(curve);
+          this._lastX = x;
+          this._lastY = y;
+      }
+      arcTo(aX1, aY1, aX2, aY2, aRadius) {
+          throw new Error('CurveContext不支持调用arcTo');
+      }
+      ellipse(aX, aY, xRadius, yRadius, aRotation, aStartAngle, aEndAngle, aClockwise) {
+          throw new Error('CurveContext不支持调用ellipse');
+      }
+      rect(x, y, w, h) {
+          throw new Error('CurveContext不支持调用rect');
+      }
+      arc(x, y, radius, startAngle, endAngle, counterclockwise) {
+          throw new Error('CurveContext不支持调用arc');
+      }
+      closePath() {
+          if (this.path.curves.length < 2) {
+              return;
+          }
+          this.lineTo(this._startX, this._startY);
+      }
+  }
+
   function calcLineCache$1(points, curveType, params) {
       switch (curveType) {
           case 'linear':
@@ -7500,7 +7553,7 @@
       ellipsis: '…',
       fontVariant: '',
       fontStyle: '',
-      lineHeight: 16,
+      lineHeight: undefined,
       underline: 0,
       lineThrough: 0
   };
@@ -17336,18 +17389,21 @@
       }
       return 0;
   }
-  function textLayoutOffsetY(baseline, h) {
+  function textLayoutOffsetY(baseline, lineHeight, fontSize) {
       if (baseline === 'middle') {
-          return -h / 2;
+          return -lineHeight / 2;
       }
       if (baseline === 'top') {
           return 0;
       }
       if (baseline === 'bottom') {
-          return -h;
+          return -lineHeight;
       }
       if (!baseline || baseline === 'alphabetic') {
-          return -0.79 * h;
+          if (!fontSize) {
+              fontSize = lineHeight;
+          }
+          return -(lineHeight - fontSize) / 2 - 0.79 * fontSize;
       }
       return 0;
   }
@@ -17493,7 +17549,7 @@
           else if (textAlign === 'right' || textAlign === 'end') {
               line.leftOffset = bbox.width - line.width;
           }
-          line.topOffset = lineHeight * 0.79 + origin[1];
+          line.topOffset = (lineHeight - this.textOptions.fontSize) / 2 + this.textOptions.fontSize * 0.79 + origin[1];
           origin[1] += lineHeight;
           return line;
       }
@@ -17596,7 +17652,7 @@
           if (!this.shouldUpdateShape() && this.cache) {
               width = this.cache.clipedWidth;
               const dx = textDrawOffsetX(textAlign, width);
-              const dy = textLayoutOffsetY(textBaseline, lineHeight);
+              const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);
               this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);
               if (stroke) {
                   this._AABBBounds.expand(lineWidth / 2);
@@ -17625,7 +17681,7 @@
           }
           this.clearUpdateShapeTag();
           const dx = textDrawOffsetX(textAlign, width);
-          const dy = textLayoutOffsetY(textBaseline, lineHeight);
+          const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);
           this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);
           if (stroke) {
               this._AABBBounds.expand(lineWidth / 2);
@@ -24311,7 +24367,8 @@
       z;
       drawShape(text, context, x, y, drawContext, params, fillCb, strokeCb) {
           const textAttribute = getTheme(text, params?.theme).text;
-          const { text: str, fill = textAttribute.fill, stroke = textAttribute.stroke, fillOpacity = textAttribute.fillOpacity, strokeOpacity = textAttribute.strokeOpacity, opacity = textAttribute.opacity, lineWidth = textAttribute.lineWidth, visible = textAttribute.visible, underline = textAttribute.underline, lineThrough = textAttribute.lineThrough, keepDirIn3d = textAttribute.keepDirIn3d, x: originX = textAttribute.x, y: originY = textAttribute.y } = text.attribute;
+          const { text: str, fill = textAttribute.fill, stroke = textAttribute.stroke, fillOpacity = textAttribute.fillOpacity, strokeOpacity = textAttribute.strokeOpacity, opacity = textAttribute.opacity, lineWidth = textAttribute.lineWidth, visible = textAttribute.visible, underline = textAttribute.underline, lineThrough = textAttribute.lineThrough, keepDirIn3d = textAttribute.keepDirIn3d, fontSize = textAttribute.fontSize, textBaseline = textAttribute.textBaseline, x: originX = textAttribute.x, y: originY = textAttribute.y } = text.attribute;
+          const lineHeight = text.attribute.lineHeight ?? fontSize;
           const fVisible = fillVisible(opacity, fillOpacity);
           const sVisible = strokeVisible(opacity, strokeOpacity);
           const doFill = runFill(fill);
@@ -24362,13 +24419,24 @@
           else {
               context.setTextStyle(text.attribute, textAttribute, z);
               const t = text.clipedText;
+              let dy = 0;
+              if (lineHeight !== fontSize) {
+                  if (textBaseline === 'top') {
+                      dy = (lineHeight - fontSize) / 2;
+                  }
+                  else if (textBaseline === 'middle') ;
+                  else if (textBaseline === 'bottom') {
+                      dy = -(lineHeight - fontSize) / 2;
+                  }
+                  else ;
+              }
               if (doStroke) {
                   if (strokeCb) {
                       strokeCb(context, text.attribute, textAttribute);
                   }
                   else if (sVisible) {
                       context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute);
-                      context.strokeText(t, x, y, z);
+                      context.strokeText(t, x, y + dy, z);
                   }
               }
               if (doFill) {
@@ -24377,8 +24445,8 @@
                   }
                   else if (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);
+                      context.fillText(t, x, y + dy, z);
+                      this.drawUnderLine(underline, lineThrough, text, x, y + dy, z, textAttribute, context);
                   }
               }
           }
@@ -24408,7 +24476,7 @@
           const { textAlign = textAttribute.textAlign, textBaseline = textAttribute.textBaseline, fontSize = textAttribute.fontSize, fill = textAttribute.fill, opacity = textAttribute.opacity, fillOpacity = textAttribute.fillOpacity } = text.attribute;
           const w = text.clipedWidth;
           const offsetX = textDrawOffsetX(textAlign, w);
-          const offsetY = textLayoutOffsetY(textBaseline, fontSize);
+          const offsetY = textLayoutOffsetY(textBaseline, fontSize, fontSize);
           const attribute = { lineWidth: 0, stroke: fill, opacity, strokeOpacity: fillOpacity };
           if (underline) {
               attribute.lineWidth = underline;
@@ -24435,7 +24503,7 @@
           }
           const { textAlign = textAttribute.textAlign, fontSize = textAttribute.fontSize, fill = textAttribute.fill, opacity = textAttribute.opacity, fillOpacity = textAttribute.fillOpacity } = text.attribute;
           const offsetX = textDrawOffsetX(textAlign, w);
-          const offsetY = textLayoutOffsetY('alphabetic', fontSize);
+          const offsetY = textLayoutOffsetY('alphabetic', fontSize, fontSize);
           const attribute = { lineWidth: 0, stroke: fill, opacity, strokeOpacity: fillOpacity };
           let deltaY = -3;
           if (underline) {
@@ -31744,11 +31812,11 @@
               if (picked) {
                   return true;
               }
-              const { textBaseline = textAttribute.textBaseline, textAlign = textAttribute.textAlign } = text.attribute;
+              const { fontSize = textAttribute.fontSize, textBaseline = textAttribute.textBaseline, textAlign = textAttribute.textAlign } = text.attribute;
               const bounds = text.AABBBounds;
               const height = bounds.height();
               const width = bounds.width();
-              const offsetY = textLayoutOffsetY(textBaseline, height);
+              const offsetY = textLayoutOffsetY(textBaseline, height, fontSize);
               const offsetX = textDrawOffsetX(textAlign, width);
               context.rect(offsetX + x, offsetY + y, width, height, z);
               picked = context.isPointInPath(pickPoint.x, pickPoint.y);
@@ -33566,7 +33634,7 @@
       return new Stage(params);
   }
 
-  const version = "0.11.0-alpha.2";
+  const version = "0.11.0";
 
   exports.ACustomAnimate = ACustomAnimate;
   exports.ARC3D_NUMBER_TYPE = ARC3D_NUMBER_TYPE;
@@ -33601,6 +33669,7 @@
   exports.ColorInterpolate = ColorInterpolate;
   exports.Context2dFactory = Context2dFactory;
   exports.ContributionProvider = ContributionProvider;
+  exports.CurveContext = CurveContext;
   exports.CustomEvent = CustomEvent;
   exports.CustomPath2D = CustomPath2D;
   exports.CustomSymbolClass = CustomSymbolClass;