fix: InsertAdjacentHTML only handled elements

stroiman · stroiman · commit a5276cf19f6c · 2025-04-09T09:32:31.000+02:00
Non-elements, e.g., text nodes were only handles when child of an
element in InsertAdjacentHTML.
diff --git a/dom/element_test.go b/dom/element_test.go
@@ -175,11 +175,11 @@ func TestElementInsertAdjacentHTMLBeforeBegin(t *testing.T) {
 	el := doc.GetElementById("2")
 	gomega.Expect(el.InsertAdjacentHTML(
 		"beforebegin",
-		"<div>1st new child</div><div>2nd new child</div>",
+		"<div>1st new child</div>Text node<div>2nd new child</div>",
 	)).To(Succeed())
 	gomega.Expect(doc.Body()).To(HaveOuterHTML(`<body>
   <div id="1">El 1</div>
-  <div>1st new child</div><div>2nd new child</div><div id="2">El 2
+  <div>1st new child</div>Text node<div>2nd new child</div><div id="2">El 2
     <div>El 2-a</div>
     <div>El 2-b</div>
   </div>
diff --git a/html/dom_parser.go b/html/dom_parser.go
@@ -43,8 +43,7 @@ func ParseFragment(
 	result := ownerDocument.CreateDocumentFragment()
 	if err == nil {
 		for _, child := range nodes {
-			element := createElementFromNode(ownerDocument, result, child)
-			result.AppendChild(element)
+			iterate(ownerDocument, result, child)
 		}
 	}
 	return result, err
@@ -87,7 +86,7 @@ func parseIntoDocument(doc dom.Document, r io.Reader) error {
 	if err != nil {
 		return err
 	}
-	iterate(doc, doc, node)
+	iterateChildren(doc, doc, node)
 	return nil
 }
 
@@ -128,23 +127,27 @@ func createElementFromNode(
 	}
 	newNode = newElm
 	newNode = rules.AppendChild(parent, newElm)
-	iterate(d, newNode, source)
+	iterateChildren(d, newNode, source)
 	return newElm
 }
 
-func iterate(d dom.Document, dest dom.Node, source *html.Node) {
+func iterateChildren(d dom.Document, dest dom.Node, source *html.Node) {
 	for child := range source.ChildNodes() {
-		switch child.Type {
-		case html.ElementNode:
-			createElementFromNode(d, dest, child)
-		case html.TextNode:
-			dest.AppendChild(d.CreateText(child.Data))
-		case html.DoctypeNode:
-			dest.AppendChild(d.CreateDocumentType(child.Data))
-		case html.CommentNode:
-			dest.AppendChild(d.CreateComment(child.Data))
-		default:
-			panic(fmt.Sprintf("Node not yet supported: %v", child.Type))
-		}
+		iterate(d, dest, child)
+	}
+}
+
+func iterate(d dom.Document, dest dom.Node, child *html.Node) {
+	switch child.Type {
+	case html.ElementNode:
+		createElementFromNode(d, dest, child)
+	case html.TextNode:
+		dest.AppendChild(d.CreateText(child.Data))
+	case html.DoctypeNode:
+		dest.AppendChild(d.CreateDocumentType(child.Data))
+	case html.CommentNode:
+		dest.AppendChild(d.CreateComment(child.Data))
+	default:
+		panic(fmt.Sprintf("Node not yet supported: %v", child.Type))
 	}
 }
