VisActor · xile611 · Sep 20, 2024 · Sep 11, 2024 · Sep 11, 2024 · Sep 19, 2024
diff --git a/common/changes/@visactor/vrender-components/fix-arc-label-text-ellipse_2024-09-11-09-51.json b/common/changes/@visactor/vrender-components/fix-arc-label-text-ellipse_2024-09-11-09-51.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: fix maxLineWidth of arc label\n\n",
+      "type": "none",
+      "packageName": "@visactor/vrender-components"
+    }
+  ],
+  "packageName": "@visactor/vrender-components",
+  "email": "dingling112@gmail.com"
+}
diff --git a/common/changes/@visactor/vrender-core/fix-arc-label-text-ellipse_2024-09-11-09-51.json b/common/changes/@visactor/vrender-core/fix-arc-label-text-ellipse_2024-09-11-09-51.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: fix maxLineWidth of arc label\n\n",
+      "type": "none",
+      "packageName": "@visactor/vrender-core"
+    }
+  ],
+  "packageName": "@visactor/vrender-core",
+  "email": "dingling112@gmail.com"
+}
diff --git a/common/changes/@visactor/vrender/fix-arc-label-text-ellipse_2024-09-11-09-51.json b/common/changes/@visactor/vrender/fix-arc-label-text-ellipse_2024-09-11-09-51.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: fix maxLineWidth of arc label\n\n",
+      "type": "none",
+      "packageName": "@visactor/vrender"
+    }
+  ],
+  "packageName": "@visactor/vrender",
+  "email": "dingling112@gmail.com"
+}
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/docs/demos/package.json b/docs/demos/package.json
@@ -12,7 +12,7 @@
     "@internal/eslint-config": "workspace:*",
     "@internal/ts-config": "workspace:*",
     "@visactor/vrender-kits": "workspace:0.14.8",
-    "@visactor/vutils": "~0.18.15",
+    "@visactor/vutils": "~0.18.16",
     "d3-scale-chromatic": "^3.0.0",
     "lodash": "4.17.21",
     "dat.gui": "^0.7.9",

diff --git a/docs/package.json b/docs/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@arco-design/web-react": "2.46.1",
     "@visactor/vchart": "1.3.0",
-    "@visactor/vutils": "~0.18.15",
+    "@visactor/vutils": "~0.18.16",
     "@visactor/vgrammar": "~0.5.7",
     "@visactor/vrender": "workspace:0.20.4",
     "markdown-it": "^13.0.0",

diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json
@@ -26,7 +26,7 @@
   "dependencies": {
     "@visactor/vrender": "workspace:0.20.4",
     "@visactor/react-vrender": "workspace:0.20.4",
-    "@visactor/vutils": "~0.18.15",
+    "@visactor/vutils": "~0.18.16",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"
   },

diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@visactor/vrender": "workspace:0.20.4",
-    "@visactor/vutils": "~0.18.15",
+    "@visactor/vutils": "~0.18.16",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"
   },

diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json
@@ -24,8 +24,8 @@
     "analysis-core": "cross-env DEBUG='Bundler*' bundle -f umd -a -i core.ts"
   },
   "dependencies": {
-    "@visactor/vutils": "~0.18.15",
-    "@visactor/vscale": "~0.18.15",
+    "@visactor/vutils": "~0.18.16",
+    "@visactor/vscale": "~0.18.16",
     "@visactor/vrender-core": "workspace:0.20.4",
     "@visactor/vrender-kits": "workspace:0.20.4"
   },
@@ -34,7 +34,7 @@
     "@internal/eslint-config": "workspace:*",
     "@internal/ts-config": "workspace:*",
     "@rushstack/eslint-patch": "~1.1.4",
-    "@visactor/vscale": "~0.18.15",
+    "@visactor/vscale": "~0.18.16",
     "@types/jest": "^26.0.0",
     "jest": "^26.0.0",
     "jest-electron": "^0.1.12",

diff --git a/packages/vrender-components/src/label/arc.ts b/packages/vrender-components/src/label/arc.ts
@@ -11,7 +11,7 @@ import {
 } from '@visactor/vutils';
 import { LabelBase } from './base';
 import type { ArcLabelAttrs, IPoint, Quadrant, BaseLabelAttrs, LabelItem, IArcLabelLineSpec } from './type';
-import type { IArc, IRichTextAttribute } from '@visactor/vrender-core';
+import type { IArc, IRichTextAttribute, ITextAttribute } from '@visactor/vrender-core';
 // eslint-disable-next-line no-duplicate-imports
 import { type IRichText, type IText, type IArcGraphicAttribute, type IGraphic } from '@visactor/vrender-core';
 import {
@@ -82,7 +82,6 @@ export class ArcInfo {
     this.outerRadius = outerRadius;
     this.circleCenter = circleCenter;
     this.labelVisible = true;
-    this.labelLimit = 0;
   }
 
   getLabelBounds(): IBoundsLike {
@@ -170,7 +169,9 @@ export class ArcLabel extends LabelBase<ArcLabelAttrs> {
     }
 
     const labels = super._layout(texts);
-    const textBoundsArray = labels.map(label => this.getGraphicBounds(label as any));
+    const textBoundsArray = labels.map(label => {
+      return this.getGraphicBounds(label as any);
+    });
     const ellipsisLabelAttribute = {
       ...this.attribute.textStyle,
       text: '…'
@@ -220,16 +221,21 @@ export class ArcLabel extends LabelBase<ArcLabelAttrs> {
           x: basedArc.labelPosition.x,
           y: basedArc.labelPosition.y,
           angle: basedArc.angle,
-          maxLineWidth: basedArc.labelLimit,
           points:
             basedArc.pointA && basedArc.pointB && basedArc.pointC
               ? [basedArc.pointA, basedArc.pointB, basedArc.pointC]
               : undefined,
           line: basedArc.labelLine
         };
-        if (labels[i].type === 'richtext') {
-          (labelAttribute as unknown as IRichTextAttribute).width = basedArc.labelLimit;
+
+        if (basedArc.labelLimit) {
+          if (labels[i].type === 'richtext') {
+            (labelAttribute as unknown as IRichTextAttribute).width = basedArc.labelLimit;
+          } else {
+            (labelAttribute as unknown as ITextAttribute).maxLineWidth = basedArc.labelLimit;
+          }
         }
+
         labels[i].setAttributes(labelAttribute);
       }
     }
@@ -526,12 +532,18 @@ export class ArcLabel extends LabelBase<ArcLabelAttrs> {
         break;
     }
     labelWidth = Math.max(this._ellipsisWidth, labelWidth);
-    arc.labelLimit = labelWidth;
+    const needAdjustLimit = labelWidth < arc.labelSize.width - 1;
+
+    if (needAdjustLimit) {
+      arc.labelLimit = labelWidth;
+    } else {
+      arc.labelLimit = null;
+    }
+
     arc.pointC = { x: cx, y: labelPosition.y };
 
     const align = this._computeAlign(arc, attribute);
-    const targetCenterOffset =
-      getAlignOffset(align) * (arc.labelLimit < arc.labelSize.width ? arc.labelLimit : arc.labelSize.width);
+    const targetCenterOffset = getAlignOffset(align) * (needAdjustLimit ? labelWidth : arc.labelSize.width);
 
     if (labelLayoutAlign === 'edge') {
       // edge 模式下的多行文本对齐方向与其他模式相反

diff --git a/packages/vrender-components/src/util/text.ts b/packages/vrender-components/src/util/text.ts
@@ -9,7 +9,7 @@ import type {
 import { getTextBounds, graphicCreator } from '@visactor/vrender-core';
 import type { ITextMeasureOption } from '@visactor/vutils';
 // eslint-disable-next-line no-duplicate-imports
-import { TextMeasure, isObject } from '@visactor/vutils';
+import { TextMeasure, isObject, isValid } from '@visactor/vutils';
 import { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../constant';
 import type { HTMLTextContent, ReactTextContent, TextContent } from '../core/type';
 
@@ -75,9 +75,13 @@ export function getTextType(attributes: TextContent, typeKey = 'type') {
 }
 
 export function richTextAttributeTransform(attributes: ITextGraphicAttribute & IRichTextAttribute & TextContent) {
+  if (isValid(attributes.maxLineWidth)) {
+    attributes.maxWidth = attributes.maxLineWidth;
+    delete attributes.maxLineWidth;
+  }
+
   attributes.width = attributes.width ?? 0;
   attributes.height = attributes.height ?? 0;
-  attributes.maxWidth = attributes.maxLineWidth;
   attributes.textConfig = (attributes.text as unknown as any).text || attributes.text;
   return attributes;
 }

diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "color-convert": "2.0.1",
-    "@visactor/vutils": "~0.18.15"
+    "@visactor/vutils": "~0.18.16"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

diff --git a/packages/vrender-core/src/graphic/text.ts b/packages/vrender-core/src/graphic/text.ts
@@ -83,7 +83,7 @@ export class Text extends Graphic<ITextGraphicAttribute> implements IText {
       return false;
     }
     this.tryUpdateAABBBounds();
-    if (this.cache.layoutData.lines) {
+    if (this.cache?.layoutData?.lines) {
       let mergedText = '';
       this.cache.layoutData.lines.forEach(item => {
         mergedText += item.str;

diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json
@@ -20,7 +20,7 @@
     "test": ""
   },
   "dependencies": {
-    "@visactor/vutils": "~0.18.15",
+    "@visactor/vutils": "~0.18.16",
     "@visactor/vrender-core": "workspace:0.20.4",
     "@resvg/resvg-js": "2.4.1",
     "roughjs": "4.5.2"

diff --git a/packages/vrender/package.json b/packages/vrender/package.json
@@ -32,7 +32,7 @@
     "@internal/eslint-config": "workspace:*",
     "@internal/ts-config": "workspace:*",
     "@rushstack/eslint-patch": "~1.1.4",
-    "@visactor/vutils": "~0.18.15",
+    "@visactor/vutils": "~0.18.16",
     "canvas": "2.11.2",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",