Merge pull request #647 from ruilisi/textbreak-optimizations

Optimize textbreak processing
ruilisi · Dec 7, 2024 · cab5d3d · cab5d3d
2 parents 4f0399a + 21b74a3
commit cab5d3d
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/packages/core/src/modules/text.ts b/packages/core/src/modules/text.ts
@@ -1062,6 +1062,7 @@ export function getCellTextInfo(
         }
       } else {
         value = value.toString();
+        let parsedTextHeight = 0;
         while (i <= value.length) {
           const str = value.substring(anchor, i);
           const measureText = getMeasureText(str, renderCtx, sheetCtx);
@@ -1192,8 +1193,10 @@ export function getCellTextInfo(
                 });
 
                 splitIndex += 1;
-
                 spaceOrTwoByte = null;
+
+                parsedTextHeight += preTextHeight;
+                if (parsedTextHeight >= cellHeight) break;
               } else {
                 spaceOrTwoByte = null;
                 anchor = i - 1;
@@ -1210,10 +1213,10 @@ export function getCellTextInfo(
                   desc: preMeasureText.actualBoundingBoxDescent,
                   fs: fontSize,
                 });
-
-                // console.log(2);
-
                 splitIndex += 1;
+
+                parsedTextHeight += preTextHeight;
+                if (parsedTextHeight >= cellHeight) break;
               }
             } else if (i === value.length) {
               if (_.isNil(text_all_split[splitIndex])) {
@@ -1649,8 +1652,6 @@ export function getCellTextInfo(
           }
 
           cumWordHeight += size.height;
-          // stop processing if rest of the cell isnt visible
-          if (cumWordHeight >= cellHeight) break;
         }
       }