From 1fb391d551813f04f9181e154eb18983d9bfec9f Mon Sep 17 00:00:00 2001
From: Anton Lavrevov <lavrton@gmail.com>
Date: Thu, 20 Mar 2025 14:26:01 -0500
Subject: [PATCH] better text calculations on ellipsis config

---
 rollup.config.cjs => rollup.config.mjs |  2 --
 src/shapes/Text.ts                     | 17 ++++++++++++++---
 test/unit/Text-test.ts                 |  3 ++-
 3 files changed, 16 insertions(+), 6 deletions(-)
 rename rollup.config.cjs => rollup.config.mjs (96%)

diff --git a/rollup.config.cjs b/rollup.config.mjs
similarity index 96%
rename from rollup.config.cjs
rename to rollup.config.mjs
index 3e7aa510..8d3f7f5c 100644
--- a/rollup.config.cjs
+++ b/rollup.config.mjs
@@ -1,8 +1,6 @@
 // import resolve from 'rollup-plugin-node-resolve';
 import typescript from 'rollup-plugin-typescript2';
 
-const pkg = require('./package.json');
-
 export default {
   input: `src/index.ts`,
   output: [
diff --git a/src/shapes/Text.ts b/src/shapes/Text.ts
index 984b553d..eeeb6026 100644
--- a/src/shapes/Text.ts
+++ b/src/shapes/Text.ts
@@ -534,12 +534,23 @@ export class Text extends Shape<TextConfig> {
               // Convert array indices to string
               lineArray = stringToArray(line),
               substr = lineArray.slice(0, mid + 1).join(''),
-              substrWidth = this._getTextWidth(substr) + additionalWidth;
+              substrWidth = this._getTextWidth(substr);
 
-            if (substrWidth <= maxWidth) {
+            // Only add ellipsis width when we need to consider truncation
+            // for the current line (when it might be the last visible line)
+            const shouldConsiderEllipsis =
+              shouldAddEllipsis &&
+              fixedHeight &&
+              currentHeightPx + lineHeightPx > maxHeightPx;
+
+            const effectiveWidth = shouldConsiderEllipsis
+              ? substrWidth + additionalWidth
+              : substrWidth;
+
+            if (effectiveWidth <= maxWidth) {
               low = mid + 1;
               match = substr;
-              matchWidth = substrWidth;
+              matchWidth = substrWidth; // Store actual text width without ellipsis
             } else {
               high = mid;
             }
diff --git a/test/unit/Text-test.ts b/test/unit/Text-test.ts
index b2d7ea52..eba4159f 100644
--- a/test/unit/Text-test.ts
+++ b/test/unit/Text-test.ts
@@ -545,7 +545,7 @@ describe('Text', function () {
   });
 
   // ======================================================
-  it('multiline with ellipsis', function () {
+  it.only('multiline with ellipsis', function () {
     var stage = addStage();
     var layer = new Konva.Layer();
 
@@ -569,6 +569,7 @@ describe('Text', function () {
     assert.equal(text.textArr.length, 7);
     assert.equal(text.textArr[6].text.slice(-1), '…');
 
+    console.log(ayer.getContext().getTrace(false, true));
     if (isBrowser) {
       assert.equal(
         layer.getContext().getTrace(false, true),