Merge pull request #366 from MohamedRejeb/1.x

Fix list items loaded from markdown jump to the left when starting editing
MohamedRejeb · Sep 29, 2024 · cf399d3 · cf399d3
2 parents e71ab2d + a54e25a
commit cf399d3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 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
@@ -2591,12 +2591,16 @@ public class RichTextState internal constructor(
     ) {
         var isParagraphUpdated = false
 
-        richParagraphList.forEachIndexed { index, richParagraph ->
-            val paragraphType = richParagraph.type
-            if (index + 1 > maxLines || paragraphType !is OrderedList) return@forEachIndexed
+        textLayoutResult?.let { textLayoutResult ->
+            richParagraphList.forEachIndexed { index, richParagraph ->
+                val paragraphType = richParagraph.type
+                if (index + 1 > maxLines || paragraphType !is OrderedList)
+                    return@forEachIndexed
 
-            if (!paragraphType.startRichSpan.textRange.collapsed) {
-                textLayoutResult?.let { textLayoutResult ->
+                if (
+                    paragraphType.startText.isNotEmpty() &&
+                    paragraphType.startRichSpan.textRange.max < textLayoutResult.layoutInput.text.text.length
+                ) {
                     val start =
                         textLayoutResult.getHorizontalPosition(
                             offset = paragraphType.startRichSpan.textRange.min,
@@ -3000,8 +3004,7 @@ public class RichTextState internal constructor(
                 withStyle(richParagraph.paragraphStyle.merge(richParagraph.type.getStyle(config))) {
                     append(richParagraph.type.startText)
                     val richParagraphStartTextLength = richParagraph.type.startText.length
-                    richParagraph.type.startRichSpan.textRange =
-                        TextRange(index, index + richParagraphStartTextLength)
+                    richParagraph.type.startRichSpan.textRange = TextRange(index, index + richParagraphStartTextLength)
                     index += richParagraphStartTextLength
                     withStyle(RichSpanStyle.DefaultSpanStyle) {
                         index = append(

diff --git a/...r-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/type/OrderedList.kt b/...r-compose/src/commonMain/kotlin/com/mohamedrejeb/richeditor/paragraph/type/OrderedList.kt
@@ -2,6 +2,7 @@ package com.mohamedrejeb.richeditor.paragraph.type
 
 import androidx.compose.ui.text.ParagraphStyle
 import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.style.TextIndent
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
@@ -21,7 +22,7 @@ internal class OrderedList(
     var number = number
         set(value) {
             field = value
-            startRichSpan = getNewStartRichSpan()
+            startRichSpan = getNewStartRichSpan(startRichSpan.textRange)
         }
 
     var startTextSpanStyle = startTextSpanStyle
@@ -62,12 +63,19 @@ internal class OrderedList(
         getNewStartRichSpan()
 
     @OptIn(ExperimentalRichTextApi::class)
-    private fun getNewStartRichSpan() =
-        RichSpan(
+    private fun getNewStartRichSpan(textRange: TextRange = TextRange(0)): RichSpan {
+        val text = "$number. "
+
+        return RichSpan(
             paragraph = RichParagraph(type = this),
-            text = "$number. ",
-            spanStyle = startTextSpanStyle
+            text = text,
+            spanStyle = startTextSpanStyle,
+            textRange = TextRange(
+                textRange.min,
+                textRange.min + text.length
+            )
         )
+    }
 
     override fun getNextParagraphType(): ParagraphType =
         OrderedList(

diff --git a/...ain/kotlin/com/mohamedrejeb/richeditor/sample/common/markdowneditor/RichTextToMarkdown.kt b/...ain/kotlin/com/mohamedrejeb/richeditor/sample/common/markdowneditor/RichTextToMarkdown.kt
@@ -17,7 +17,7 @@ fun RichTextToMarkdown(
     richTextState: RichTextState,
     modifier: Modifier = Modifier,
 ) {
-    val html by remember(richTextState.annotatedString) {
+    val markdown by remember(richTextState.annotatedString) {
         mutableStateOf(richTextState.toMarkdown())
     }
 
@@ -85,7 +85,7 @@ fun RichTextToMarkdown(
             ) {
                 item {
                     Text(
-                        text = html,
+                        text = markdown,
                         modifier = Modifier
                             .fillMaxWidth()
                             .weight(1f)