Fix parsing text nodes following block elements

Fixes #663
basecamp · Aug 14, 2019 · d4edd23 · d4edd23
1 parent 692e2fd
commit d4edd23
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/trix/models/html_parser.coffee b/src/trix/models/html_parser.coffee
@@ -54,11 +54,18 @@ class Trix.HTMLParser extends Trix.BasicObject
   processNode: (node) ->
     switch node.nodeType
       when Node.TEXT_NODE
-        @processTextNode(node)
+        unless @isInsignificantTextNode(node)
+          @appendBlockForTextNode(node)
+          @processTextNode(node)
       when Node.ELEMENT_NODE
         @appendBlockForElement(node)
         @processElement(node)
 
+  appendBlockForTextNode: (node) ->
+    if @currentBlockElement and not elementContainsNode(@currentBlockElement, node)
+      @currentBlock = @appendEmptyBlock()
+      @currentBlockElement = null
+
   appendBlockForElement: (element) ->
     elementIsBlockElement = @isBlockElement(element)
     currentBlockContainsElement = elementContainsNode(@currentBlockElement, element)
@@ -87,13 +94,12 @@ class Trix.HTMLParser extends Trix.BasicObject
     null
 
   processTextNode: (node) ->
-    unless @isInsignificantTextNode(node)
-      string = node.data
-      unless elementCanDisplayPreformattedText(node.parentNode)
-        string = squishBreakableWhitespace(string)
-        if stringEndsWithWhitespace(node.previousSibling?.textContent)
-          string = leftTrimBreakableWhitespace(string)
-      @appendStringWithAttributes(string, @getTextAttributes(node.parentNode))
+    string = node.data
+    unless elementCanDisplayPreformattedText(node.parentNode)
+      string = squishBreakableWhitespace(string)
+      if stringEndsWithWhitespace(node.previousSibling?.textContent)
+        string = leftTrimBreakableWhitespace(string)
+    @appendStringWithAttributes(string, @getTextAttributes(node.parentNode))
 
   processElement: (element) ->
     if nodeIsAttachmentElement(element)

diff --git a/test/src/unit/html_parser_test.coffee b/test/src/unit/html_parser_test.coffee
@@ -111,6 +111,11 @@ testGroup "Trix.HTMLParser", ->
     expectedHTML = """<blockquote><!--block-->abc</blockquote><div><!--block--><strong>123</strong></div>"""
     assert.documentHTMLEqual Trix.HTMLParser.parse(html).getDocument(), expectedHTML
 
+  test "parses text nodes following block elements", ->
+    html = """<ul><li>a</li></ul>b<blockquote>c</blockquote>d"""
+    expectedHTML = """<ul><li><!--block-->a</li></ul><div><!--block-->b</div><blockquote><!--block-->c</blockquote><div><!--block-->d</div>"""
+    assert.documentHTMLEqual Trix.HTMLParser.parse(html).getDocument(), expectedHTML
+
   test "parses whitespace-only text nodes without a containing block element", ->
     html = """a <strong>b</strong> <em>c</em>"""
     expectedHTML = """<div><!--block-->a <strong>b</strong> <em>c</em></div>"""