Add support for <ol start='n'> in Rust and Android (#66)

Author: jmartinesp

crates/wysiwyg/src/dom/dom_list_methods.rs

@@ -95,7 +95,7 @@ where
             }
         }
 
-        let list = ContainerNode::new_list(list_type, list_items);
+        let list = ContainerNode::new_list(list_type, list_items, None);
         self.insert_at(first_handle, DomNode::Container(list));
 
         if first_handle.has_parent() {

crates/wysiwyg/src/dom/nodes/container_node.rs

@@ -121,11 +121,15 @@ where
         }
     }
 
-    pub fn new_list(list_type: ListType, children: Vec<DomNode<S>>) -> Self {
+    pub fn new_list(
+        list_type: ListType,
+        children: Vec<DomNode<S>>,
+        attrs: Option<Vec<(S, S)>>,
+    ) -> Self {
         Self {
             name: list_type.tag().into(),
             kind: ContainerNodeKind::List(list_type),
-            attrs: None,
+            attrs,
             children,
             handle: DomHandle::new_unset(),
         }

crates/wysiwyg/src/dom/nodes/dom_node.rs

@@ -75,7 +75,7 @@ where
         list_type: ListType,
         children: Vec<DomNode<S>>,
     ) -> DomNode<S> {
-        DomNode::Container(ContainerNode::new_list(list_type, children))
+        DomNode::Container(ContainerNode::new_list(list_type, children, None))
     }
 
     pub fn new_list_item(children: Vec<DomNode<S>>) -> DomNode<S> {

crates/wysiwyg/src/dom/parser/parse.rs

@@ -162,7 +162,14 @@ mod sys {
                 }
                 "ol" | "ul" => {
                     self.current_path.push(DomNodeKind::List);
-                    node.append_child(Self::new_list(tag));
+                    if tag == "ol" {
+                        let custom_start = child
+                            .get_attr("start")
+                            .and_then(|start| start.parse::<usize>().ok());
+                        node.append_child(Self::new_ordered_list(custom_start));
+                    } else {
+                        node.append_child(Self::new_unordered_list());
+                    }
                     self.convert_children(
                         padom,
                         child,
@@ -328,14 +335,29 @@ mod sys {
             }
         }
 
-        /// Create a list node
-        fn new_list<S>(tag: &str) -> DomNode<S>
+        /// Create an unordered list node
+        fn new_unordered_list<S>() -> DomNode<S>
         where
             S: UnicodeString,
         {
             DomNode::Container(ContainerNode::new_list(
-                ListType::from(S::from(tag)),
+                ListType::Unordered,
                 Vec::new(),
+                None,
+            ))
+        }
+
+        /// Create an ordered list node
+        fn new_ordered_list<S>(custom_start: Option<usize>) -> DomNode<S>
+        where
+            S: UnicodeString,
+        {
+            DomNode::Container(ContainerNode::new_list(
+                ListType::Ordered,
+                Vec::new(),
+                custom_start.map(|start| {
+                    vec![("start".into(), start.to_string().into())]
+                }),
             ))
         }
 
@@ -1300,12 +1322,23 @@ mod js {
                     }
 
                     "OL" => {
+                        let custom_start = node
+                            .unchecked_ref::<Element>()
+                            .get_attribute("start");
                         self.current_path.push(DomNodeKind::List);
                         dom.append_child(DomNode::Container(
                             ContainerNode::new_list(
                                 ListType::Ordered,
                                 self.convert(node.child_nodes())?
                                     .take_children(),
+                                if let Some(custom_start) = custom_start {
+                                    Some(vec![(
+                                        "start".into(),
+                                        custom_start.into(),
+                                    )])
+                                } else {
+                                    None
+                                },
                             ),
                         ));
                         self.current_path.pop();
@@ -1318,6 +1351,7 @@ mod js {
                                 ListType::Unordered,
                                 self.convert(node.child_nodes())?
                                     .take_children(),
+                                None,
                             ),
                         ));
                         self.current_path.pop();

crates/wysiwyg/src/tests/test_set_content.rs

@@ -229,3 +229,10 @@ fn set_content_from_markdown_one_new_line() {
         .unwrap();
     assert_eq!(tx(&model), "<p>test</p><p>test|</p>");
 }
+
+#[test]
+fn set_content_from_markdown_ordered_list_with_start() {
+    let mut model = cm("|");
+    model.set_content_from_markdown(&utf16("3. First")).unwrap();
+    assert_eq!(tx(&model), "<ol start=\"3\"><li>First|</li></ol>");
+}

platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/MainActivity.kt

@@ -11,6 +11,7 @@ package io.element.android.wysiwyg.poc
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import io.element.android.wysiwyg.poc.databinding.DialogSetLinkBinding
@@ -19,8 +20,11 @@ import io.element.android.wysiwyg.poc.databinding.ActivityMainBinding
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
+
         super.onCreate(savedInstanceState)
         val binding = ActivityMainBinding.inflate(layoutInflater)
+
         setContentView(binding.root)
 
         binding.editor.requestFocus()

platforms/android/example-view/src/main/res/layout/activity_main.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context="io.element.android.wysiwyg.poc.MainActivity">
 
     <io.element.android.wysiwyg.poc.RichTextEditor

platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/HtmlToSpansParser.kt

@@ -63,6 +63,7 @@ internal class HtmlToSpansParser(
             "blockquote", "p", "br"
         )
         .addAttributes("a", "href", "data-mention-type", "contenteditable")
+        .addAttributes("ol", "start")
 
     /**
      * Convert the HTML string into a [Spanned] text.
@@ -216,7 +217,13 @@ internal class HtmlToSpansParser(
             "ol" -> {
                 val typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
                 val textSize = 16.dpToPx()
-                val order = (element.parent()?.select("li")?.indexOf(element) ?: 0) + 1
+                val indexInList = listParent.select("li").indexOf(element)
+                val customOrder = listParent.attr("start").toIntOrNull()
+                val order = if (customOrder != null) {
+                    customOrder + indexInList
+                } else {
+                    indexInList + 1 // Default to 1-based index
+                }
                 OrderedListSpan(typeface, textSize, order, gapWidth)
             }
             else -> return

platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/HtmlToSpansParserTest.kt

@@ -13,6 +13,7 @@ import io.element.android.wysiwyg.display.TextDisplay
 import io.element.android.wysiwyg.display.MentionDisplayHandler
 import io.element.android.wysiwyg.test.fakes.createFakeStyleConfig
 import io.element.android.wysiwyg.test.utils.dumpSpans
+import io.element.android.wysiwyg.view.spans.OrderedListSpan
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
 import org.hamcrest.Matchers.equalTo
@@ -76,6 +77,32 @@ class HtmlToSpansParserTest {
         )
     }
 
+    @Test
+    fun testOrderedListWithStartAttribute() {
+        val html = """
+            <ol start="3">
+                <li>ordered1</li>
+                <li>ordered2</li>
+            </ol>
+        """.trimIndent()
+        val spanned = convertHtml(html)
+
+        assertThat(
+            spanned.dumpSpans().joinToString(",\n"), equalTo(
+                """
+                    ordered1: io.element.android.wysiwyg.view.spans.OrderedListSpan (0-8) fl=#17,
+                    ordered2: io.element.android.wysiwyg.view.spans.OrderedListSpan (9-17) fl=#17
+                """.trimIndent()
+            )
+        )
+
+        val listItemSpans = spanned.getSpans(0, spanned.length, OrderedListSpan::class.java)
+        // The first item should have order 3
+        assert(listItemSpans.first().order == 3)
+        // The second item should continue the order
+        assert(listItemSpans.last().order == 4)
+    }
+
     @Test
     fun testListsWithPreviousText() {
         val html = """