Merge pull request #226 from MohamedRejeb/1.x

Fix getBoundingBoxes returning emptyList when the last line is empty
MohamedRejeb · Mar 30, 2024 · ec09b91 · ec09b91
2 parents 59e9b43 + 80b0987
commit ec09b91
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/...or-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/utils/TextLayoutResultExt.kt b/...or-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/utils/TextLayoutResultExt.kt
@@ -31,13 +31,19 @@ fun TextLayoutResult.getBoundingBoxes(
     if (multiParagraph.lineCount == 0)
         return emptyList()
 
-    val lastLinePosition =
-        Offset(
-            x = multiParagraph.getLineRight(multiParagraph.lineCount - 1),
-            y = multiParagraph.getLineTop(multiParagraph.lineCount - 1)
-        )
+    var lastOffset = 0
+    var lastNonEmptyLineIndex = multiParagraph.lineCount - 1
+
+    while (lastOffset == 0 && lastNonEmptyLineIndex >= 0) {
+        val lastLinePosition =
+            Offset(
+                x = multiParagraph.getLineRight(lastNonEmptyLineIndex),
+                y = multiParagraph.getLineTop(lastNonEmptyLineIndex)
+            )
 
-    val lastOffset = multiParagraph.getOffsetForPosition(lastLinePosition)
+        lastOffset = multiParagraph.getOffsetForPosition(lastLinePosition)
+        lastNonEmptyLineIndex--
+    }
 
     if (startOffset >= lastOffset)
         return emptyList()