🎨 Vditor 支持 ToC 添加悬浮菜单及 bug 修复 Vanessa219/vditor#217

88250 · Mar 11, 2020 · 732240b · 732240b
1 parent fc65337
commit 732240b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
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/render/html_renderer.go b/render/html_renderer.go
@@ -120,15 +120,15 @@ func (r *HtmlRenderer) renderToC(node *ast.Node, entering bool) ast.WalkStatus {
 	if 1 > length {
 		return ast.WalkStop
 	}
-	r.WriteString("<div class=\"toc-div\">")
+	r.WriteString("<div class=\"vditor-toc\">")
 	for _, heading := range headings {
 		level := strconv.Itoa(heading.HeadingLevel)
 		spaces := (heading.HeadingLevel - 1) * 2
 		r.WriteString(strings.Repeat("&emsp;", spaces))
 		r.WriteString("<span class=\"toc-h" + level + "\">")
 		r.WriteString("<a class=\"toc-a\" href=\"#" + r.headingID(heading) + "\">" + heading.Text() + "</a></span><br>")
 	}
-	r.WriteString("</div>\n\n")
+	r.WriteString("</div>")
 	return ast.WalkStop
 }
 

diff --git a/render/vditor_renderer.go b/render/vditor_renderer.go
@@ -171,18 +171,20 @@ func (r *VditorRenderer) renderBackslash(node *ast.Node, entering bool) ast.Walk
 func (r *VditorRenderer) renderToC(node *ast.Node, entering bool) ast.WalkStatus {
 	headings := r.headings()
 	length := len(headings)
-	if 1 > length {
-		return ast.WalkStop
-	}
 	r.WriteString("<div class=\"vditor-toc\" data-block=\"0\" data-type=\"toc-block\" contenteditable=\"false\">")
-	for _, heading := range headings {
-		spaces := (heading.HeadingLevel - 1) * 2
-		r.WriteString(strings.Repeat("&emsp;", spaces))
-		r.WriteString("<span data-type=\"toc-h\">")
-		r.WriteString(heading.Text() + "</span><br>")
+	if 0 < length {
+		for _, heading := range headings {
+			spaces := (heading.HeadingLevel - 1) * 2
+			r.WriteString(strings.Repeat("&emsp;", spaces))
+			r.WriteString("<span data-type=\"toc-h\">")
+			r.WriteString(heading.Text() + "</span><br>")
+		}
+	} else {
+		r.WriteString("[toc]<br>")
 	}
-	r.WriteString("</div><p data-block=\"0\">")
+	r.WriteString("</div>")
 	caretInDest := bytes.Contains(node.Tokens, []byte(parse.Caret))
+	r.WriteString("<p data-block=\"0\">")
 	if caretInDest {
 		r.WriteString(parse.Caret)
 	}

diff --git a/test/toc_test.go b/test/toc_test.go
@@ -18,7 +18,7 @@ import (
 
 var tocTests = []parseTest{
 
-	{"0", "[toc]\n\n# 1\n\n## 1.1\n\n# 2\n", "<div class=\"toc-div\"><span class=\"toc-h1\"><a class=\"toc-a\" href=\"#1\">1</a></span><br>&emsp;&emsp;<span class=\"toc-h2\"><a class=\"toc-a\" href=\"#1-1\">1.1</a></span><br><span class=\"toc-h1\"><a class=\"toc-a\" href=\"#2\">2</a></span><br></div>\n\n<h1 id=\"1\">1</h1>\n<h2 id=\"1-1\">1.1</h2>\n<h1 id=\"2\">2</h1>\n"},
+	{"0", "[toc]\n\n# 1\n\n## 1.1\n\n# 2\n", "<div class=\"vditor-toc\"><span class=\"toc-h1\"><a class=\"toc-a\" href=\"#1\">1</a></span><br>&emsp;&emsp;<span class=\"toc-h2\"><a class=\"toc-a\" href=\"#1-1\">1.1</a></span><br><span class=\"toc-h1\"><a class=\"toc-a\" href=\"#2\">2</a></span><br></div>\n<h1 id=\"1\">1</h1>\n<h2 id=\"1-1\">1.1</h2>\n<h1 id=\"2\">2</h1>\n"},
 }
 
 func TestToC(t *testing.T) {