Reset list state once they are done

Discovered in the repeating pattern of the scroll example where it would end up being two newlines before the lists.
lampsitter · Sep 7, 2024 · d396190 · d396190
1 parent 0eea543
commit d396190
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/egui_commonmark/src/parsers/pulldown.rs b/egui_commonmark/src/parsers/pulldown.rs
@@ -684,6 +684,11 @@ impl CommonMarkViewerInternal {
                 self.line.should_end_newline = true;
 
                 self.list.end_level(ui, self.line.can_insert_end());
+
+                if !self.list.is_inside_a_list() {
+                    // Reset all the state and make it ready for the next list that occurs
+                    self.list = List::default();
+                }
             }
             pulldown_cmark::TagEnd::Item => {}
             pulldown_cmark::TagEnd::FootnoteDefinition => {

diff --git a/egui_commonmark_macros/src/generator.rs b/egui_commonmark_macros/src/generator.rs
@@ -714,6 +714,11 @@ impl CommonMarkViewerInternal {
             pulldown_cmark::TagEnd::List(_) => {
                 let s = self.list.end_level(self.line.can_insert_end());
 
+                if !self.list.is_inside_a_list() {
+                    // Reset all the state and make it ready for the next list that occurs
+                    self.list = List::default();
+                }
+
                 self.line.should_start_newline = true;
                 self.line.should_end_newline = true;
                 s