Merge pull request #241 from MohamedRejeb/1.x

Fix bug with undo
MohamedRejeb · Apr 7, 2024 · 00e129c · 00e129c
2 parents 87178d4 + 8751766
commit 00e129c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/richeditor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/model/RichTextState.kt b/richeditor-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/model/RichTextState.kt
@@ -790,7 +790,7 @@ class RichTextState internal constructor(
      */
     private fun handleAddingCharacters() {
         val typedCharsCount = tempTextFieldValue.text.length - textFieldValue.text.length
-        var startTypeIndex = tempTextFieldValue.selection.min - typedCharsCount
+        var startTypeIndex = tempTextFieldValue.selection.max - typedCharsCount
         val typedText = tempTextFieldValue.text.substring(
             startIndex = startTypeIndex,
             endIndex = startTypeIndex + typedCharsCount,
@@ -817,7 +817,10 @@ class RichTextState internal constructor(
                 val newTypedText = beforeTypedText + paragraphStartText + typedText + afterTypedText
                 tempTextFieldValue = tempTextFieldValue.copy(
                     text = newTypedText,
-                    selection = TextRange(tempTextFieldValue.selection.min + indexDiff),
+                    selection = TextRange(
+                        (tempTextFieldValue.selection.min + indexDiff).coerceAtLeast(0),
+                        (tempTextFieldValue.selection.max + indexDiff).coerceAtMost(newTypedText.length),
+                    ),
                 )
             }