🎨 Improve HTML clipping siyuan-note/siyuan#12973

88250 · Oct 30, 2024 · 71876fb · 71876fb
1 parent 3c5ecdd
commit 71876fb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/h2m.go b/h2m.go
@@ -276,7 +276,7 @@ func (lute *Lute) genASTByDOM(n *html.Node, tree *parse.Tree) {
 
 		if "" == strings.TrimSpace(util.DomText(n)) {
 			for { // 这里用 for 是为了简化实现
-				if util.DomExistChildByType(n, atom.Img, atom.Picture, atom.Annotation) {
+				if util.DomExistChildByType(n, atom.Img, atom.Picture, atom.Annotation, atom.Iframe, atom.Video, atom.Audio, atom.Source, atom.Canvas, atom.Svg, atom.Math) {
 					break
 				}
 
@@ -1232,11 +1232,11 @@ func (lute *Lute) genASTByDOM(n *html.Node, tree *parse.Tree) {
 		tree.Context.Tip.AppendChild(node)
 		tree.Context.Tip = node
 	case atom.Figure, atom.Picture:
-		node.Type = ast.NodeParagraph
 		if !tree.Context.Tip.IsContainerBlock() {
 			break
 		}
 
+		node.Type = ast.NodeParagraph
 		tree.Context.Tip.AppendChild(node)
 		tree.Context.Tip = node
 		defer tree.Context.ParentTip()

diff --git a/javascript/lute.min.js b/javascript/lute.min.js
diff --git a/javascript/lute.min.js.map b/javascript/lute.min.js.map
diff --git a/test/h2m_test.go b/test/h2m_test.go