From e762c39b8a8cdff3e5e71540a6b078de00c75be9 Mon Sep 17 00:00:00 2001
From: Jonathan del Strother <jdelStrother@gmail.com>
Date: Tue, 21 Dec 2021 10:25:25 +0000
Subject: [PATCH] Improve parsing of HTML tables containing whitespace

---
 src/trix/models/html_parser.coffee    | 4 ++--
 test/src/unit/html_parser_test.coffee | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/trix/models/html_parser.coffee b/src/trix/models/html_parser.coffee
index 57b45db1d..15dd15380 100644
--- a/src/trix/models/html_parser.coffee
+++ b/src/trix/models/html_parser.coffee
@@ -130,10 +130,10 @@ class Trix.HTMLParser extends Trix.BasicObject
           @appendAttachmentWithAttributes(attributes, @getTextAttributes(element))
           @processedElements.push(element)
         when "tr"
-          unless element.parentNode.firstChild is element
+          unless element.parentNode.firstElementChild is element
             @appendStringWithAttributes("\n")
         when "td"
-          unless element.parentNode.firstChild is element
+          unless element.parentNode.firstElementChild is element
             @appendStringWithAttributes(" | ")
 
   # Document construction
diff --git a/test/src/unit/html_parser_test.coffee b/test/src/unit/html_parser_test.coffee
index c0b3501d0..6bc21bb1c 100644
--- a/test/src/unit/html_parser_test.coffee
+++ b/test/src/unit/html_parser_test.coffee
@@ -147,7 +147,7 @@ testGroup "Trix.HTMLParser", ->
     assert.documentHTMLEqual Trix.HTMLParser.parse(html).getDocument(), expectedHTML
 
   test "translates tables into plain text", ->
-    html = """<table><tr><td>a</td><td>b</td></tr><tr><td>1</td><td><p>2</p></td></tr><table>"""
+    html = """<table><tr>\r\n<td>a</td><td>b</td></tr><tr><td>1</td><td><p>2</p></td></tr><table>"""
     expectedHTML = """<div><!--block-->a | b<br>1 | 2</div>"""
     assert.documentHTMLEqual Trix.HTMLParser.parse(html).getDocument(), expectedHTML