fix: line break position does not take into account newline characters (

#1883)
antvis · Dec 27, 2024 · 1424824 · 1424824
1 parent c492468
commit 1424824
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.changeset/sour-hornets-turn.md b/.changeset/sour-hornets-turn.md
@@ -0,0 +1,5 @@
+---
+'@antv/g-lite': patch
+---
+
+fix: line break position does not take into account newline characters
diff --git a/__tests__/demos/bugfix/textWordWrap.ts b/__tests__/demos/bugfix/textWordWrap.ts
@@ -83,14 +83,14 @@ export async function textWordWrap(context: { canvas: Canvas }) {
       fontSize: 12,
       fontWeight: 'normal',
       linkTextFill: '#326EF4',
-      maxLines: 3,
+      maxLines: 1,
       opacity: 1,
       text: '哈哈哈哈\n哈哈哈哈\n哈哈哈哈\n',
       // textAlign: 'right',
       textBaseline: 'top',
       textOverflow: 'ellipsis',
       wordWrap: true,
-      wordWrapWidth: 84,
+      wordWrapWidth: 30,
     },
   });
   const rect2 = new Rect({

diff --git a/packages/g-lite/src/services/TextService.ts b/packages/g-lite/src/services/TextService.ts
@@ -338,6 +338,7 @@ export class TextService {
     parsedStyle: ParsedTextStyleProps,
     offscreenCanvas: CanvasLike,
   ): string {
+    const self = this;
     const {
       wordWrapWidth = 0,
       letterSpacing = 0,
@@ -388,6 +389,9 @@ export class TextService {
         calcWidth(txt) < widthThreshold &&
         textCharIndex < chars.length - 1
       ) {
+        if (self.isNewline(chars[textCharIndex + 1])) {
+          break;
+        }
         textCharIndex += 1;
         txt += chars[textCharIndex];
       }